recreated tag OOO_BUILD_3_2_98_1 which had these commits:

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

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

commit b1766315d62b509af5ee2da5760c4e8535a5f3f7
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Tue Sep 14 20:05:34 2010 +0200

    Kill the migration wizard for good.

    Extends default-no-startup-wizard.diff and desktop-disable-startup-registration.diff.

 desktop/source/app/app.cxx                         |   34 +-
 desktop/source/migration/makefile.mk               |    6 -
 desktop/source/migration/pages.cxx                 |  673 --------------------
 desktop/source/migration/pages.hxx                 |  214 -------
 desktop/source/migration/wizard.cxx                |  654 -------------------
 desktop/source/migration/wizard.hrc                |   99 ---
 desktop/source/migration/wizard.hxx                |  106 ---
 desktop/source/migration/wizard.src                |  424 ------------
 desktop/source/splash/firststart.cxx               |  156 -----
 desktop/source/splash/firststart.hxx               |   90 ---
 desktop/source/splash/makefile.mk                  |    5 +-
 desktop/source/splash/services_spl.cxx             |    5 -
 desktop/util/makefile.mk                           |    3 +-
 13 files changed, 5 insertions(+), 2464 deletions(-)

commit b88f97260d8aafa1d30d404ab57a30d061980664
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Tue Sep 14 19:21:36 2010 +0200

    kde4-buildfix-connectivity.diff: Fix KDE4 build.

 connectivity/source/drivers/kab/makefile.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 6415b3fe7292bfd0c75bc52bacfd0cb51aeec19c
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date:   Tue Sep 14 15:28:33 2010 +0200

    filled-tab-editeng.diff: Filled tab wasn't filled in shapes

    n#564454

 .../drawinglayer/primitive2d/textprimitive2d.hxx   |    8 +++-
 .../source/primitive2d/textprimitive2d.cxx         |   12 ++++-
 drawinglayer/source/processor2d/vclprocessor2d.cxx |   41 ++++++++++++++++---
 editeng/inc/editeng/editeng.hxx                    |    8 ++++
 editeng/inc/editeng/outliner.hxx                   |   15 +++++++
 editeng/source/editeng/editeng.cxx                 |    8 ++++
 editeng/source/editeng/impedit3.cxx                |   19 +++++++++
 editeng/source/outliner/outleeng.cxx               |    9 ++++
 editeng/source/outliner/outleeng.hxx               |    8 ++++
 editeng/source/outliner/outliner.cxx               |   15 +++++++-
 svx/source/svdraw/svdotextdecomposition.cxx        |    4 +-
 11 files changed, 134 insertions(+), 13 deletions(-)

commit 150b71f82c682889427a3df2accee6cc44d85ccb
Author: Tor Lillqvist <tlillqvist@novell.com>
Date:   Tue Sep 14 14:42:40 2010 +0200

    win32-dont-attempt-restart.diff: Don't attempt to restart OOo after crash

    n#524250

    Don't attempt to restart soffice.bin immediately if it crashes.  At
    such a restart, if the document recovery dialog is cancelled, an
    empty Writer document is opened even if the user was editing some
    other kind of document. Some customers are annoyed by this. And the
    automatic restart doesn't work on Linux anyway, so for consistency
    it doesn't hurt if we force it not to work on Windows, either.

 desktop/win32/source/officeloader/officeloader.cxx |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

commit c6eb9605babcd5621b77a3c12a977fed3a84c742
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Tue Sep 14 11:50:57 2010 +0200

    toolbar-decorations-svx-undo-redo.diff: Update "Undo" and "Redo" widgets.

 svx/source/tbxctrls/lboxctrl.cxx |    5 +----
 svx/source/tbxctrls/lboxctrl.src |   13 +++----------
 2 files changed, 4 insertions(+), 14 deletions(-)

commit 41e00d403cbcea258168bf1a7650db28fd15c6a9
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Tue Sep 14 11:49:46 2010 +0200

    toolbar-decorations-svx-tables-columns.diff: "New table" widget rework.

    And a small update of the "Columns" widget.

 svx/source/tbxctrls/layctrl.cxx |  488 +++++++++++++++++---------------------
 1 files changed, 218 insertions(+), 270 deletions(-)

commit 46ea2f6cb38536aa1b1a259af2145a581e19f6e8
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Tue Sep 14 11:47:49 2010 +0200

    toolbar-decorations-svx.diff: Improved toolbar popups.

 svx/source/tbxctrls/linectrl.cxx |    4 ++--
 svx/source/tbxctrls/tbcontrl.cxx |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

commit eac35923bff62f414c5a48bb951f826fc9598eb7
Author: Thorsten Behrens <tbehrens@novell.com>
Date:   Tue Sep 14 12:57:42 2010 +0200

    win32-force-version-fix.diff: force WINVER when using non-std win api

 connectivity/source/drivers/ado/ADriver.cxx        |    2 ++
 .../deployment/gui/dp_gui_extensioncmdqueue.cxx    |    2 ++
 desktop/win32/source/setup/setup.cpp               |    1 +
 fpicker/source/win32/filepicker/FileOpenDlg.cxx    |    2 ++
 4 files changed, 7 insertions(+), 0 deletions(-)

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

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

    i#356101

 .../schema/org/openoffice/Office/Writer.xcs        |   24 ++++++++++----------
 1 files changed, 12 insertions(+), 12 deletions(-)

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

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

 .../schema/org/openoffice/Office/Writer.xcs        |   12 +++++++++
 sfx2/inc/sfx2/sfxsids.hrc                          |    1 +
 sfx2/sdi/sfx.sdi                                   |   27 ++++++++++++++++++++
 svx/source/dialog/ruler.hrc                        |    3 +-
 svx/source/dialog/ruler.src                        |   12 +++++++++
 svx/source/dialog/sdstring.src                     |    2 +
 svx/source/dialog/svxruler.cxx                     |   11 ++++++-
 7 files changed, 65 insertions(+), 3 deletions(-)

commit 258524d43e52170947e94d2af5cd36ba02f31416
Author: Amelia Wang <amwang@novell.com>
Date:   Mon Sep 13 14:37:50 2010 +0200

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

 svx/inc/dlgutil.hxx           |    1 +
 svx/source/dialog/dlgutil.cxx |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 0 deletions(-)

commit 72832ea6fb8fa69b3cfbbcadab8f49a803448b4e
Merge: 1445d9d7 b47d587
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Wed Sep 8 11:34:08 2010 +0200

    Merge commit 'ooo/OOO330_m7'

commit 1445d9d7744618b41e0b09eef274613cc0cfd57b
Merge: 09877be faf3732
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Tue Sep 7 09:33:02 2010 +0200

    Merge commit 'ooo/OOO330_m6'

commit b47d58784ee1d6592f721e9fa0a66a4d801e95cc (tag: refs/tags/ooo/OOO330_m7)
Merge: 1c5054b 5fba505
Author: Kurt Zenker <kz@openoffice.org>
Date:   Fri Sep 3 14:39:55 2010 +0200

    CWS-TOOLING: integrate CWS fs33a

commit 1c5054b57b89575e686b6f59da89abdd24012cd4
Merge: 1843c8d 8ace426
Author: Kurt Zenker <kz@openoffice.org>
Date:   Tue Aug 31 15:51:23 2010 +0200

    CWS-TOOLING: integrate CWS fwk154

commit 1843c8d96d714f34d713a8ca1a3a1848f9c9310d
Merge: be6516c 5be137f
Author: Kurt Zenker <kz@openoffice.org>
Date:   Tue Aug 31 15:43:02 2010 +0200

    CWS-TOOLING: integrate CWS fwk153

commit be6516cfa383d391a5c1620076c72f7d5dfbd15e
Merge: faf3732 be3b926
Author: Kurt Zenker <kz@openoffice.org>
Date:   Tue Aug 31 15:26:29 2010 +0200

    CWS-TOOLING: integrate CWS sb130

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

    masterfix OOO330: #i10000# solve merge problem / WaE

 desktop/source/app/app.cxx |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

commit be3b92624ef45dbeab7c96393199a3eeaff144da
Author: sb <sb@openoffice.org>
Date:   Thu Aug 26 17:11:05 2010 +0200

    sb130: #i113096# previous configmgr::Components::removeExtensionXcuFile changes were still not good

 configmgr/source/components.cxx    |   24 +++++++++++++-----------
 configmgr/source/modifications.cxx |   21 +++++++++++++++++++++
 configmgr/source/modifications.hxx |    2 ++
 3 files changed, 36 insertions(+), 11 deletions(-)

commit d85fe96f67e46d1b65257509c09b8453cd9b8510
Author: sb <sb@openoffice.org>
Date:   Thu Aug 26 13:28:53 2010 +0200

    sb130: #i113096# UniversalContentBroker::changesOccurred is now also called for removed items

 ucb/source/core/ucb.cxx |  127 +++++++++++++++++++++++++++-------------------
 ucb/source/core/ucb.hxx |    6 --
 2 files changed, 74 insertions(+), 59 deletions(-)

commit f6b87d8f5b9ad9cc5a49e35ff0c567a3b8083bc3
Author: sb <sb@openoffice.org>
Date:   Thu Aug 26 13:26:56 2010 +0200

    sb130: #i113096# previous change contained an error in configmgr::Components::removeExtensionXcuFile

 configmgr/source/components.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 864045890b84b8307b673b39bad1540d102a6414
Merge: 505336a dffbec9
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date:   Thu Aug 26 13:07:19 2010 +0200

    CWS-TOOLING: integrate CWS fwk152

commit 5fba505261c17ecd9bd2c877cff47fd941045f25
Merge: cde29b4 45ba31b
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 505336af510bead37a4777f230c2d004a3e9b176
Merge: cb033b9 4aa0a02
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date:   Wed Aug 25 14:19:19 2010 +0200

    CWS-TOOLING: integrate CWS sw33bf08

commit cde29b4edf7669ed8f48bc6e81f5513cf09780a8
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date:   Wed Aug 25 13:29:38 2010 +0200

    fs33a: when all panels claim to be invisible, make the first one visible

 sfx2/source/dialog/taskpane.cxx |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit cb033b9acb08fb718d7eaffa2b093b395b971cf9
Merge: 45ba31b 68c3203
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date:   Wed Aug 25 12:49:35 2010 +0200

    CWS-TOOLING: integrate CWS mib18

commit 8ace426a170164f6e90792de26213ea0eaab7efb
Merge: e087040 836a0fa
Author: Dirk Voelzke <dv@openoffice.org>
Date:   Wed Aug 25 10:35:59 2010 +0200

    fwk154: merged heads

commit 836a0fa49c8198c185a14a3b3690621294644c80
Author: Dirk Voelzke <dv@openoffice.org>
Date:   Wed Aug 25 08:25:36 2010 +0200

    fwk154#i114083# fixed some file properies for the Oracle Open Office executables

 desktop/util/verinfo.rc                         |    8 ++++----
 desktop/win32/source/applauncher/ooo/verinfo.rc |    4 ++--
 desktop/win32/source/applauncher/verinfo.rc     |    8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

commit 46cc97b7825b74b9d6f718cb4e7645ce1278a05a
Author: Juergen Schmidt <jsc@openoffice.org>
Date:   Tue Aug 24 17:53:12 2010 +0200

    fwk154: i114090: adapt listener code to reflect changes in config mgr, notification of change events
    (transplanted from 7c0cad639e0b6d74f4be88f5877270f1a8b9fa53)

 ucb/source/core/ucb.cxx |   26 ++++----------------------
 1 files changed, 4 insertions(+), 22 deletions(-)

commit 9f2a658025c92f5d9dac1d717e0517fba8589d69
Merge: 8325f6b 45ba31b
Author: sb <sb@openoffice.org>
Date:   Wed Aug 25 14:21:49 2010 +0200

    sb130: merged in OOO330_m5

commit 8325f6b22551883c99c5b11cff50d454ad394a60
Author: sb <sb@openoffice.org>
Date:   Wed Aug 25 14:08:27 2010 +0200

    sb130: #i113096# fixed TODO in configmgr::Broadcaster::send (to ease debugging)

 configmgr/source/broadcaster.cxx |   63 +++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 21 deletions(-)

commit e087040c0d686ca1f03b95a432567a700d420bfe
Author: Juergen Schmidt <jsc@openoffice.org>
Date:   Tue Aug 24 17:53:12 2010 +0200

    fwk154: i114090: adapt listener code to reflect changes in config mgr, notification of change events

 ucb/source/core/ucb.cxx |   26 ++++----------------------
 1 files changed, 4 insertions(+), 22 deletions(-)

commit f4e7b133d8836e97f4a58e360405238866535cb9
Author: Carsten Driesner <cd@openoffice.org>
Date:   Mon Aug 23 13:43:42 2010 +0200

    fwk154: #i114014# Use correct compare statement

 uui/source/iahndl-authentication.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 7e963509b1786bcabac7560e5d962359d56418a7
Author: Carsten Driesner <cd@openoffice.org>
Date:   Mon Aug 23 12:46:11 2010 +0200

    fwk154: #i114014# Fix problem with check box 'Remember Password' in login dialog

 uui/source/iahndl-authentication.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 5be137f8b856bc67fd6fb99a11eaee3faf1400a4
Merge: 2914220 a3652f2
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Wed Aug 18 16:48:00 2010 +0200

    fwk153: merge

commit 29142204d1d7a495c7477c9f4cc842150a636aee
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Wed Aug 18 16:43:38 2010 +0200

    fwk153: #i113674# replace backing component if there is one

 framework/inc/classes/framelistanalyzer.hxx |   25 +++++++++----------------
 framework/prj/d.lst                         |    1 +
 framework/util/makefile.mk                  |    2 +-
 sfx2/source/view/viewfrm.cxx                |   21 ++++++++++++++++++++-
 4 files changed, 31 insertions(+), 18 deletions(-)

commit 45ba31b194bc51b16d8f0892e432b2b77fce144d (tag: refs/tags/ooo/OOO330_m5)
Merge: ce2c621 ad4d380
Author: Kurt Zenker <kz@openoffice.org>
Date:   Wed Aug 18 13:23:34 2010 +0200

    CWS-TOOLING: integrate CWS ooo33gsl05

commit ce2c62170340cfe0870f58b3b557c33f9441f2bd
Merge: d939031 a6f18d1
Author: Kurt Zenker <kz@openoffice.org>
Date:   Wed Aug 18 12:43:13 2010 +0200

    CWS-TOOLING: integrate CWS mav56

commit d939031546d7472e09a1a096d78e1e3dbbb94e42
Merge: 6e0e29c 16a891e
Author: Kurt Zenker <kz@openoffice.org>
Date:   Wed Aug 18 12:39:06 2010 +0200

    CWS-TOOLING: integrate CWS fwk151

commit 6e0e29c23afae5d6715405b89a0d498b89cd9d5e
Merge: 05d4c10 0517fd2
Author: Kurt Zenker <kz@openoffice.org>
Date:   Wed Aug 18 12:00:05 2010 +0200

    CWS-TOOLING: integrate CWS jl154

commit a3652f203372976692c4bd02e51d0b86448ec51b
Merge: cee18c6 27e0667
Author: Carsten Driesner <cd@openoffice.org>
Date:   Wed Aug 18 11:00:57 2010 +0200

    fwk153: Merge changes

commit cee18c6b582e045958a70cee8222a83598f4c437
Author: Carsten Driesner <cd@openoffice.org>
Date:   Wed Aug 18 10:52:09 2010 +0200

    fwk153: #i110127# Provide one instance of module accelerator manager in module ui configuration manager implementation.

 .../moduleuiconfigurationmanager.hxx               |    1 +
 .../accelerators/acceleratorconfiguration.cxx      |    5 +-
 .../moduleuiconfigurationmanager.cxx               |   78 +++++++++++---------
 3 files changed, 47 insertions(+), 37 deletions(-)

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

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

 editeng/source/editeng/impedit.hxx  |    3 +
 editeng/source/editeng/impedit4.cxx |  369 +++++++++++++++++++++++++++++------
 2 files changed, 312 insertions(+), 60 deletions(-)

commit 27e066791da4927b97824eef67cca7be9c4a0f91
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Tue Aug 17 10:13:38 2010 +0200

    fwk153: #i113914# set the new storage for duplicate libraries also

 sfx2/source/doc/objstor.cxx |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

commit 68c320362696d9d9f9cb7d6ea9ad5dbc864e64c7
Author: Daniel Rentz <dr@openoffice.org>
Date:   Fri Aug 13 17:59:32 2010 +0200

    mib18: wae

 basic/source/classes/sb.cxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 5660ff9f62ff81029d74ede7784446604e7c18c0
Author: Daniel Rentz <dr@openoffice.org>
Date:   Fri Aug 13 17:51:00 2010 +0200

    mib18: wae

 basic/source/runtime/step0.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit ad4d380dd22ccf85b0d0b4a6276ce27a2a9fed41
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date:   Fri Aug 13 15:57:34 2010 +0200

    ooo33gsl05: #i113810# fix on behalf of aw

 svx/source/svdraw/svdmrkv.cxx |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit aaef5c3019e8fa0b2cf6a5d57e6842a9a2138d12
Merge: bc81a57 ae170eb
Author: Daniel Rentz <dr@openoffice.org>
Date:   Fri Aug 13 15:03:20 2010 +0200

    mib18: merge

commit ae170eb18ad3f57a6f5e1b6ab3ad5459a8ae70f0
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Fri Aug 13 14:48:18 2010 +0200

    mib18: #163278# handle the internal VBA types correctly

 basic/source/classes/sbunoobj.cxx |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

commit bc81a57e8f35a06f6b607fb575d5d4c54d8a3929
Merge: 43ebc93 a768f39
Author: Daniel Rentz <dr@openoffice.org>
Date:   Fri Aug 13 13:43:38 2010 +0200

    mib18: merge

commit 284f9a97eb9bc3c5835ec409bba8e8e646d3387b
Merge: a768f39 7883aa8
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Fri Aug 13 13:38:18 2010 +0200

    mib18: merging

commit 7883aa8d17c9bae21b87a8d29a3c241e82dda8d2
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Fri Aug 13 13:28:45 2010 +0200

    mib18: #163225# support long strings in basic

 basic/inc/basic/sbxvar.hxx        |   12 +++--
 basic/source/classes/sbunoobj.cxx |    2 +-
 basic/source/sbx/sbxbool.cxx      |   18 +++---
 basic/source/sbx/sbxbyte.cxx      |   10 ++--
 basic/source/sbx/sbxchar.cxx      |   15 +++---
 basic/source/sbx/sbxconv.hxx      |   16 +++---
 basic/source/sbx/sbxcurr.cxx      |   26 +++++-----
 basic/source/sbx/sbxdate.cxx      |   12 +++--
 basic/source/sbx/sbxdbl.cxx       |   10 ++--
 basic/source/sbx/sbxdec.cxx       |   20 ++++----
 basic/source/sbx/sbxdec.hxx       |    4 +-
 basic/source/sbx/sbxint.cxx       |   38 ++++++-------
 basic/source/sbx/sbxlng.cxx       |   10 ++--
 basic/source/sbx/sbxres.cxx       |    2 +-
 basic/source/sbx/sbxres.hxx       |    2 +-
 basic/source/sbx/sbxscan.cxx      |   37 +++++++------
 basic/source/sbx/sbxsng.cxx       |   10 ++--
 basic/source/sbx/sbxstr.cxx       |   50 ++++++++---------
 basic/source/sbx/sbxuint.cxx      |   10 ++--
 basic/source/sbx/sbxulng.cxx      |   10 ++--
 basic/source/sbx/sbxvalue.cxx     |  105 ++++++++++++++++++++-----------------
 basic/source/sbx/sbxvar.cxx       |   40 +++++++-------
 22 files changed, 235 insertions(+), 224 deletions(-)

commit a768f3921b60caae5af40b305540a47aaedad275
Author: Michael Brauer <mib@openoffice.org>
Date:   Fri Aug 13 12:52:17 2010 +0200

    mib18: #163285#: Set correct error code in Collection.item and Collection.remove

 basic/source/classes/sb.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit a026803287e286be2ee4d4b0ab90fd30874a21bb
Merge: 0cc2927 05d4c10
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 43ebc93ff5555b07895fdd9171ab12c310ebba87
Merge: 4aea598 05d4c10
Author: Daniel Rentz <dr@openoffice.org>
Date:   Fri Aug 13 11:29:46 2010 +0200

    mib18: rebase to OOO330m4

commit 4aea598fb6ddfcfc883101be59ce5e3185d186e0
Author: Andreas Bregas <ab@openoffice.org>
Date:   Fri Aug 13 08:01:31 2010 +0200

    mib18: #163254# Set right name and parent for copied object class members

 basic/source/classes/sb.cxx  |    4 ++++
 basic/source/comp/sbcomp.cxx |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

commit 0517fd2d63228abe568e1fd9d564e30ed648d8b9
Merge: 23779a7 645d925
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date:   Fri Aug 13 07:28:35 2010 +0200

    jl154: Local merge

commit 8d6235484043a008c49394555faf6b393bbb2617
Merge: 17a07b3 05d4c10
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date:   Thu Aug 12 16:23:40 2010 +0200

    merge with OOO330m4

commit 893a7cbe2b494d34603e642c8d4ac6a06cb82349
Author: Michael Stahl <mst@openoffice.org>
Date:   Thu Aug 12 16:13:11 2010 +0200

    sw33bf08: #i108078#: ::sfx2::createBaseURI(): decode content of expand URI

 sfx2/source/doc/DocumentMetadataAccess.cxx |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

commit 567d3a2e14870f56155aa22823f3fd536dda6c71
Author: Michael Stahl <mst@openoffice.org>
Date:   Thu Aug 12 15:05:09 2010 +0200

    sw33bf08: #i108078#: ::sfx2::createBaseURI():
     manually expand vnd.sun.star.expand: URIs before calling makeAbsolute().

 sfx2/source/doc/DocumentMetadataAccess.cxx |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

commit 5433c06f77017f4594937ce51aaa9e9579fddc8f
Author: sb <sb@openoffice.org>
Date:   Thu Aug 12 10:22:02 2010 +0200

    sb130: #i113096# introduced com.sun.star.configuration.XUpdate.removeExtensionXcuFile

 configmgr/source/README                            |    1 +
 configmgr/source/access.cxx                        |   23 +++-
 configmgr/source/additions.hxx                     |   43 ++++++
 configmgr/source/components.cxx                    |  136 ++++++++++++++++---
 configmgr/source/components.hxx                    |   15 ++-
 configmgr/source/data.cxx                          |   44 +++++++
 configmgr/source/data.hxx                          |   23 +++-
 configmgr/source/update.cxx                        |   17 +++
 configmgr/source/xcdparser.cxx                     |    2 +-
 configmgr/source/xcuparser.cxx                     |   30 +++--
 configmgr/source/xcuparser.hxx                     |    6 +-
 .../registry/configuration/dp_configuration.cxx    |   26 +++-
 12 files changed, 308 insertions(+), 58 deletions(-)

commit dffbec9fe51bd0d6bfc885c1061f5d62312e78a1
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Thu Aug 12 10:00:50 2010 +0200

    fwk152: #i10000# fix warning

 desktop/source/app/appfirststart.cxx |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit 753d301aaa33b87d5ce4eb607d8802bbe09b8e13
Author: Andreas Bregas <ab@openoffice.org>
Date:   Thu Aug 12 08:40:35 2010 +0200

    mib18: #163254# Fixed instantiation of class modules for object members

 basic/source/classes/sb.cxx |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

commit 4cd6f4efe3ae774d9e8fca45e4a398eed5117aa9
Merge: 2419889 c778391
Author: Andreas Bregas <ab@openoffice.org>
Date:   Wed Aug 11 14:25:35 2010 +0200

    mib18: Merge

commit 2419889e37a924cef564e363e4931a26cb15e48f
Author: Andreas Bregas <ab@openoffice.org>
Date:   Wed Aug 11 14:18:10 2010 +0200

    mib18: #163237# Changed error handling in StepSET

 basic/source/runtime/step0.cxx |  229 ++++++++++++++++++++--------------------
 1 files changed, 114 insertions(+), 115 deletions(-)

commit c7783913a83b91b5ad8af3585ed8015eeff0afcb
Author: Daniel Rentz <dr@openoffice.org>
Date:   Wed Aug 11 11:11:45 2010 +0200

    mib18: unx compiler warnings

 basic/source/comp/exprgen.cxx |    4 ++--
 basic/source/comp/makefile.mk |   33 ++++++++++-----------------------
 2 files changed, 12 insertions(+), 25 deletions(-)

commit bfa03a95f4b47a4763537ee4fcc9340138134573
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Wed Aug 11 09:10:07 2010 +0200

    mib18: #163215# handle the closed dialog correctly

 vbahelper/source/msforms/vbauserform.cxx |   47 +++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 17 deletions(-)

commit 645d92535faaac02c1524abc1893dc1207acd1f5
Merge: 17a07b3 23779a7
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date:   Wed Aug 11 08:57:13 2010 +0200

    jl154: Local merge

commit 6f1d21b2d2d239cd6253e7b8b36b2adf6571bfac
Merge: d888d60 02fd7e0
Author: Andreas Bregas <ab@openoffice.org>
Date:   Wed Aug 11 08:28:57 2010 +0200

    mib18: Merge

commit d888d6060dbe2077fa571f33f53419098f00917c
Author: Andreas Bregas <ab@openoffice.org>
Date:   Wed Aug 11 08:24:45 2010 +0200

    mib18: #163121# Fixed back chain handling for new declare implementation

 basic/source/comp/dim.cxx |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit 02fd7e0a01b3c2e59a819d9dc21f402cb693c6a3
Author: Michael E. Bohn <mbn@openoffice.org>
Date:   Tue Aug 10 18:14:58 2010 +0200

    mib18: #163259# implementation of global symbol Excel

 oovbaapi/ooo/vba/excel/XGlobals.idl |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

commit 505e80d4570a778f1654cafcb0ba56dc4a27c000
Merge: 4966169 ae27c05
Author: Michael E. Bohn <mbn@openoffice.org>
Date:   Tue Aug 10 16:57:47 2010 +0200

    heads merged

commit 4966169f06ab743d8cf714e92282a80db54f3b5a
Author: Michael E. Bohn <mbn@openoffice.org>
Date:   Tue Aug 10 16:55:52 2010 +0200

    mib18: #163120# adding the entrypoint for symbol Debug

 oovbaapi/ooo/vba/excel/XGlobals.idl |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 0cc2927a54d1c34e766e4c591a23fad5335a6893
Merge: e1145c7 17a07b3
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 a6f18d15186ba525739f3cd50ae50f1b3be2ac9d
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Tue Aug 10 11:05:20 2010 +0200

    mav56: #163253# tread invalid path segments correctly

 ucb/source/ucp/package/makefile.mk |    1 +
 ucb/source/ucp/package/pkguri.cxx  |   36 ++++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 16 deletions(-)

commit ae27c058ca364ca50cc27057e2c63b7f5b84c39d
Author: Daniel Rentz <dr@openoffice.org>
Date:   Tue Aug 10 10:27:30 2010 +0200

    mib18: #163246# add VBA symbol Worksheet.ProtectScenarios

 oovbaapi/ooo/vba/excel/XWorksheet.idl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit 8d3a12bd55459ba99e802457a4112f290cd28ac1
Author: Andreas Bregas <ab@openoffice.org>
Date:   Mon Aug 9 15:50:34 2010 +0200

    mib18: #163059# Ignore introspection based COM object members

 basic/source/classes/sbunoobj.cxx |   14 ++++++++++++--
 basic/source/inc/sbunoobj.hxx     |    1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

commit 42e3cc5745faad62d49ddae49581114ea81b46af
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Mon Aug 9 10:47:38 2010 +0200

    fwk152: #i108004# check the URLs correctly

 framework/source/loadenv/loadenv.cxx |    3 +-
 sfx2/inc/sfx2/docfile.hxx            |    1 -
 sfx2/source/doc/docfile.cxx          |   47 ----------------------------------
 sfx2/source/doc/doctemplates.cxx     |    2 +-
 sfx2/source/doc/objmisc.cxx          |    2 +-
 sfx2/source/doc/objstor.cxx          |    2 +-
 sfx2/source/doc/sfxbasemodel.cxx     |    3 +-
 7 files changed, 7 insertions(+), 53 deletions(-)

commit e50f8b059ea9f4e96e64a931caeb909cf4628bff
Author: Andreas Bregas <ab@openoffice.org>
Date:   Fri Aug 6 11:14:17 2010 +0200

    mib18: #163175# Implement DoEvents empty

 basic/source/runtime/methods1.cxx |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

commit 9134fb31919cd977801d2813e60bc3396c8910ec
Author: Andreas Bregas <ab@openoffice.org>
Date:   Fri Aug 6 09:35:51 2010 +0200

    mib18: #163121# Declare Rework

 basic/source/comp/codegen.cxx           |    4 ++
 basic/source/comp/dim.cxx               |   61 +++++++++++++++++++++++++++-
 basic/source/comp/exprgen.cxx           |   69 ++++++++-----------------------
 basic/source/comp/exprtree.cxx          |   10 ----
 basic/source/inc/expr.hxx               |    3 -
 basic/source/inc/symtbl.hxx             |    3 +-
 scripting/source/basprov/basmodnode.cxx |   14 +++++-
 scripting/source/basprov/basprov.cxx    |    2 +-
 8 files changed, 96 insertions(+), 70 deletions(-)

commit e0ad6117f46c86d22777247ef90ad10b30e6f442
Author: Mikhail Voytenko <mav@openoffice.org>
Date:   Thu Aug 5 11:53:41 2010 +0200

    fwk152: #i112452# let restart functionality restart quickstarter as well

 desktop/inc/app.hxx                                |    3 +
 desktop/source/app/app.cxx                         |    7 ++
 desktop/source/app/appfirststart.cxx               |  104 ++++++++++++++------
 desktop/win32/source/officeloader/officeloader.cxx |    1 +
 officecfg/registry/schema/org/openoffice/Setup.xcs |    9 ++-
 5 files changed, 94 insertions(+), 30 deletions(-)

commit d542107ff02c7cec79307f3e32ec79617a7e03e2
Author: Andreas Bregas <ab@openoffice.org>
Date:   Thu Aug 5 11:52:07 2010 +0200

    mib18: #163025# Changed RunInit handling for class modules to get right order

 basic/inc/basic/sbmod.hxx         |    4 +-
 basic/source/classes/sb.cxx       |   93 ++++++++++++++++++++++++++++++++++++-
 basic/source/comp/codegen.cxx     |    8 ++-
 basic/source/comp/dim.cxx         |    3 +
 basic/source/inc/parser.hxx       |    5 +-
 basic/source/inc/sbintern.hxx     |    6 ++
 basic/source/runtime/methods1.cxx |    2 -
 7 files changed, 112 insertions(+), 9 deletions(-)

commit c65fa07ac8376999ef4fb293c9749abfbf4b689f
Author: Daniel Rentz <dr@openoffice.org>
Date:   Wed Aug 4 18:13:02 2010 +0200

    mib18: #162938# add VBA symbol Worksheet.AutoFilterMode

 oovbaapi/ooo/vba/excel/XWorksheet.idl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit 16a891edfe85a583dfd6c22363e24cb32a1ef795
Author: Carsten Driesner <cd@openoffice.org>
Date:   Wed Aug 4 13:56:16 2010 +0200

    fwk151: #i110127# Better formatting

 .../accelerators/acceleratorconfiguration.cxx      |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

commit 263df111b29b5c3915f2e0ab26980315fc1915fd
Author: Daniel Rentz <dr@openoffice.org>
Date:   Wed Aug 4 09:56:54 2010 +0200

    mib18: #162937# extract all integer and floating values from an 'Any' for Boolean parameters

 vbahelper/inc/vbahelper/vbahelper.hxx    |    7 +++++++
 vbahelper/source/vbahelper/vbahelper.cxx |   24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)

commit 23779a786395825ac8a5733b3803b560667522dd
Merge: 4c2f072 45fdc25
Author: Joachim Lingner <jl@openoffice.org>
Date:   Mon Aug 2 15:39:29 2010 +0200

    jl154 merging with OOO330m2

commit 02d554112d9c0174e21b7ea7e4aea15fe564afa9
Author: Michael Stahl <mst@openoffice.org>
Date:   Thu Jul 29 14:57:46 2010 +0200

    sw33bf08: #i113461#: SvxAutoCorrect::AutoCorrect(): apply patch by dtardon:
    do not freeze after erasing non-breaking space inserted by French AutoCorrection

 editeng/source/misc/svxacorr.cxx |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

commit 4c2f072bffe60d64d124882d52492b1f76759271
Merge: d3a5cd9 3d785d8
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date:   Thu Jul 29 13:55:23 2010 +0200

    jl154: Local merge

commit 3d785d8443fcdb531570d827186b1161640350f4
Author: Joachim Lingner <jl@openoffice.org>
Date:   Wed Jul 28 16:27:07 2010 +0200

    jl154 #i113463# some comments and rollback even when runtime exception is thrown

 .../deployment/manager/dp_extensionmanager.cxx     |    8 +++++++
 .../deployment/registry/package/dp_package.cxx     |   22 +++++--------------
 2 files changed, 14 insertions(+), 16 deletions(-)

commit 9951e7b7804b3643b9bf7e837e5cd0f09373a8fc
Author: Carsten Driesner <cd@openoffice.org>
Date:   Wed Jul 28 13:54:38 2010 +0200

    fwk152: #i113249# Fix broken HTML clipboard

 editeng/source/editeng/eehtml.cxx |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

commit 827100404f29853108a0a1fb8c329c2bb0410de4
Author: sb <sb@openoffice.org>
Date:   Wed Jul 28 13:01:55 2010 +0200

    fwk152: #i113454# accept broken .xcs files containing empty <oor:component-scheme>

 configmgr/source/xcsparser.cxx |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

commit 528c08bd8d648cf1c2f9f4e38642146d3ee69dd0
Author: Joachim Lingner <jl@openoffice.org>
Date:   Wed Jul 28 12:19:34 2010 +0200

    jl154 #i113463# processPackage_ in dp_configuration.cxx threw an IOException when revoking xcs files

 .../registry/configuration/dp_configuration.cxx    |   62 ++++++++------------
 1 files changed, 25 insertions(+), 37 deletions(-)

commit 556bd4d205fa74157f378d0a8baf57dacd08bfaa
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

 configmgr/source/rootaccess.cxx                    |    5 ++-
 .../accelerators/acceleratorconfiguration.cxx      |   21 +++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

commit df6cd526ceedb45436c0393696ec39a0a59e0fc6
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

 configmgr/source/rootaccess.cxx                    |    5 ++-
 .../accelerators/acceleratorconfiguration.cxx      |   21 +++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

commit f6a6db31e407119be5820361cc815f2cd380c6be
Author: Joachim Lingner <jl@openoffice.org>
Date:   Tue Jul 27 14:38:42 2010 +0200

    jl154 #i113463# unopkg sync fails on solaris, when there was one extension removed

 desktop/source/deployment/registry/dp_registry.cxx |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit d3a5cd9a9d49e332a3eb10a296b1dc908d5571a8
Author: Dirk Voelzke <dv@openoffice.org>
Date:   Fri Jul 23 09:25:32 2010 +0200

    jl154:#i133370# Remove 'disable' from popup menu for shared extensions

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

commit 01016b92b2e1c8136ad1f14e6163746c8562c081
Author: Joachim Lingner <jl@openoffice.org>
Date:   Thu Jul 22 14:10:02 2010 +0200

    jl154 #i162868# unopkg sync now removes the folder  when it does no contain a folder

 desktop/source/app/app.cxx                  |   42 +++++++++------------------
 desktop/source/app/userinstall.cxx          |    6 +---
 desktop/source/app/userinstall.hxx          |    2 -
 desktop/source/pkgchk/unopkg/unopkg_app.cxx |    5 ++-
 4 files changed, 19 insertions(+), 36 deletions(-)

commit 41e84bd96a082ea50217ce5956db7936f1f9d024
Merge: 4798dbf 78b22b2
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date:   Thu Jul 22 10:44:04 2010 +0200

    jl154: Local branch merge

commit 78b22b28d6d257eb1ce844f0d6082179dc3cd809
Author: Joachim Lingner <jl@openoffice.org>
Date:   Wed Jul 21 13:29:14 2010 +0200

    jl154 #i162868# unopkg sync removes share/prereg/bundled, changing registerExtensions

 desktop/source/pkgchk/unopkg/unopkg_app.cxx  |   21 +++++
 desktop/source/pkgchk/unopkg/unopkg_misc.cxx |  105 ++++++++++++++++++++++++++
 desktop/source/pkgchk/unopkg/unopkg_shared.h |    6 ++
 3 files changed, 132 insertions(+), 0 deletions(-)

commit 126beccbacfefd5ec47eb66a4a214c82649d056b
Author: Joachim Lingner <jl@openoffice.org>
Date:   Tue Jul 20 14:54:39 2010 +0200

    jl154 #i113285# fixing deadlock when starting OOo by the testtool

 desktop/source/app/app.cxx |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 4798dbf7ec2e0aeec525200302f6566e9c62dab0
Merge: c04bc96 ac74bf3
Author: Joachim Lingner <jl@openoffice.org>
Date:   Fri Jul 16 15:45:18 2010 +0200

    jl154 merging with OOO300_m1

commit c04bc96760bcb53af09c810a8f3251af4e24d174
Author: Joachim Lingner <jl@openoffice.org>
Date:   Thu Jul 15 11:11:50 2010 +0200

    jl154 #162868# undoing: removing registration data folder if the last extension was removed, which was instroduced with eaf4b98ce57a

 desktop/source/deployment/manager/dp_manager.cxx |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

commit 5eb244a5af091bcf3e887eb6f2cac669724a65e9
Author: Joachim Lingner <jl@openoffice.org>
Date:   Thu Jul 15 15:38:43 2010 +0200

    jl154 #162868# fix warnings caused by 990df1d5ff27

 desktop/source/app/app.cxx |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

commit 11a2edf653a11f4eba4cb1f94f90dc3ce1efa617
Author: Joachim Lingner <jl@openoffice.org>
Date:   Wed Jul 14 15:17:57 2010 +0200

    jl154 #162868# removing registration data folder if the last extension was removed

 desktop/source/deployment/manager/dp_manager.cxx |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

commit 503c30df49250eee4c34b82d3388b2a8e20816a3
Author: Carsten Driesner <cd@openoffice.org>
Date:   Wed Jul 14 14:09:08 2010 +0200

    jl154: #162868# Added sync code to improve startup time with bundled extensions

 desktop/source/app/app.cxx         |  220 ++++++++++++++++++++++++++++++++++++
 desktop/source/app/userinstall.cxx |    6 +-
 desktop/source/app/userinstall.hxx |    2 +
 3 files changed, 227 insertions(+), 1 deletions(-)

commit 8f3373241dad0ca73602043cd28156a4d6f2b039
Merge: 31eb0af 34ebae2
Author: Ingo Schmidt <is@openoffice.org>
Date:   Mon Jul 12 15:58:30 2010 +0200

    merge

commit 34ebae2afba0a7d0ae01432a23f14077633a1cf8
Author: Joachim Lingner <jl@openoffice.org>
Date:   Mon Jul 12 14:04:55 2010 +0200

    jl154 #162868# OOo Improvement dialog will now show at the second start

 .../openoffice/Office/OOoImprovement/Settings.xcs  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 31eb0af3b1bbd5a885a487958642b110b3699e07
Merge: b58863e 78243f6
Author: Ingo Schmidt <is@openoffice.org>
Date:   Mon Jul 12 11:10:49 2010 +0200

    merge

commit 78243f60f3094a3c03a2a70d3c8caa354d4bfb5f
Author: Joachim Lingner <jl@openoffice.org>
Date:   Mon Jul 12 10:26:26 2010 +0200

    jl154 #162868# additional private sub-command for unopkg for use in setup

 desktop/source/pkgchk/unopkg/unopkg_app.cxx |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

commit b58863e8ddc923fa737d064b873b8099a24a8c51
Author: Carsten Driesner <cd@openoffice.org>
Date:   Wed Jul 7 13:51:44 2010 +0200

    jl154: #i112449# Fix flicker on restart. Backing window won't get created if restart is required

 desktop/source/app/app.cxx |  266 ++++++++++++++++++++++----------------------
 1 files changed, 133 insertions(+), 133 deletions(-)

commit e1145c70eb055c594b25bda5a662e65ae750f78f
Merge: 83c6697 b171344
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 fe7bdecd4ea546c98207ee1e8e2a0eb401f8d356
Author: Joachim Lingner <jl@openoffice.org>
Date:   Mon Jul 5 15:46:50 2010 +0200

    jl154 #i112934# replace old license headers introduced by CWS jl152

 .../source/deployment/manager/dp_properties.cxx    |    2 +-
 .../source/deployment/manager/dp_properties.hxx    |    5 +----
 .../configuration/dp_configurationbackenddb.cxx    |    5 +----
 .../configuration/dp_configurationbackenddb.hxx    |    5 +----
 .../registry/executable/dp_executablebackenddb.cxx |    5 +----
 .../registry/executable/dp_executablebackenddb.hxx |    5 +----
 .../deployment/registry/help/dp_helpbackenddb.cxx  |    5 +----
 .../deployment/registry/help/dp_helpbackenddb.hxx  |    5 +----
 .../registry/script/dp_scriptbackenddb.cxx         |    5 +----
 .../registry/script/dp_scriptbackenddb.hxx         |    5 +----
 desktop/source/migration/services/cexportsoo3.cxx  |    5 +----
 .../migration/services/oo3extensionmigration.cxx   |    7 ++-----
 .../migration/services/oo3extensionmigration.hxx   |    7 ++-----
 13 files changed, 15 insertions(+), 51 deletions(-)

commit 69ce56e3b6b9167c23893953f978fe1b26a432ec
Merge: 3a9f321 bf0cf88
Author: Joachim Lingner <jl@openoffice.org>
Date:   Fri Jul 2 15:07:01 2010 +0200

    jl154 merging heads

commit bf0cf886073fbd6ee87104d90fb1d1ffd5b35a97
Author: Joachim Lingner <jl@openoffice.org>
Date:   Fri Jul 2 14:21:42 2010 +0200

    jl154 #i112883# prevent extension synchronization at OOo startup

 desktop/source/deployment/misc/dp_misc.cxx |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

commit 3a9f321158f3f06e728c20664532ba60dea096a1
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

 desktop/source/app/app.cxx |  109 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 82 insertions(+), 27 deletions(-)

commit b08fd7366c62a91f21ae4e19859bc696be13c152
Merge: b589c0d 871f924
Author: Joachim Lingner <jl@openoffice.org>
Date:   Wed Jun 30 17:12:59 2010 +0200

    jl154 merge with DEV300_m84

commit b171344789c6eb81bbaf96002b981b5e919d9a05
Merge: a53bfcb 303dee0
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 303dee093f9c39c809d5629a7b7f5fc45e4e086d
Merge: 9c0446d a53bfcb
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 9c0446d131784e9a351dc30f15dcab7ba37e4b3d
Merge: f91e396 d63595b
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 f91e396e38e97c16c7e4228cbc2fc8a053e66fe8
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date:   Tue Apr 27 12:34:19 2010 +0200

    fs33a: #111181# ImplSign: proper check whether the doc can be signed (only bail out if the document is no new)

 sfx2/source/doc/objserv.cxx |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

4 files changed, 227 insertions, 227 deletions

diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 125de9b29b6b..2692a0e9d839 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,59 +96,59 @@
 #include <osl/process.h>
 #include <rtl/bootstrap.hxx>
 
-#define TB_LEFT          1
-#define TB_RIGHT         2
-#define TB_CENTER        3
-#define TB_UNDO          4
-#define TB_REDO          5
-#define TB_FONT1         6
-#define TB_FONT2         7
-#define TB_ITALIC        8
-#define TB_BOLD          9
-#define TB_UNDERLINE    10
-#define TB_BLACK        11
-#define TB_GREEN        12
-#define TB_OPEN         13
-#define TB_SAVE         14
-#define TB_SBL          15
-#define TB_SBSA         16
-#define TB_LR           17
-#define TB_DRAW         18
-#define TB_DEFTAB       19
-#define TB_OPEN2        20
-#define TB_SAVE2        21
-#define TB_STDSEL       33
-#define TB_MOVE         34
-#define TB_PARATTR1     35
-#define TB_ROTATE       38
-#define TB_RED          43
-#define TB_FLAT         46
-#define TB_BINOBJ1      47
-#define TB_BINOBJ3      49
-#define TB_BINOBJ4      50
-#define TB_BINOBJ1b     51
-#define TB_BINOBJ2b     52
-#define TB_ATTRIBS      54
-#define TB_IDLE         55
-#define TB_BLOCK        56
-#define TB_CLONEBIN     57
-#define TB_INSERT       58
-#define TB_PKERN        59
-#define TB_KERN         60
-#define TB_SUPER        61
-#define TB_SUB          62
-#define TB_PRINT        63
-#define TB_FONT         64
-#define TB_COLORS       65
-#define TB_WLM          66
-#define TB_OUTL         67
-#define TB_INSFLD       68
-#define TB_UPDFLD       69
+#define TB_LEFT			 1
+#define TB_RIGHT		 2
+#define TB_CENTER		 3
+#define TB_UNDO			 4
+#define TB_REDO			 5
+#define TB_FONT1		 6
+#define TB_FONT2		 7
+#define TB_ITALIC		 8
+#define TB_BOLD			 9
+#define TB_UNDERLINE	10
+#define TB_BLACK		11
+#define TB_GREEN		12
+#define TB_OPEN			13
+#define TB_SAVE			14
+#define TB_SBL			15
+#define TB_SBSA			16
+#define TB_LR			17
+#define TB_DRAW			18
+#define TB_DEFTAB		19
+#define TB_OPEN2		20
+#define TB_SAVE2		21
+#define TB_STDSEL		33
+#define TB_MOVE			34
+#define TB_PARATTR1		35
+#define TB_ROTATE		38
+#define TB_RED			43
+#define TB_FLAT			46
+#define TB_BINOBJ1		47
+#define TB_BINOBJ3		49
+#define TB_BINOBJ4		50
+#define TB_BINOBJ1b		51
+#define TB_BINOBJ2b		52
+#define TB_ATTRIBS		54
+#define TB_IDLE			55
+#define TB_BLOCK		56
+#define TB_CLONEBIN		57
+#define TB_INSERT		58
+#define TB_PKERN		59
+#define TB_KERN			60
+#define TB_SUPER		61
+#define TB_SUB			62
+#define TB_PRINT		63
+#define TB_FONT			64
+#define TB_COLORS		65
+#define TB_WLM			66
+#define TB_OUTL			67
+#define TB_INSFLD		68
+#define TB_UPDFLD		69
 #define TB_ONLINESPELL  70
-#define TB_REDLINES     71
-#define TB_AUTOCORRECT  72
-#define TB_POLY         73
-#define TB_HYPH         74
+#define TB_REDLINES		71
+#define TB_AUTOCORRECT	72
+#define TB_POLY			73
+#define TB_HYPH			74
 
 // VARS...
 short nRotation = 0;
@@ -196,9 +196,9 @@ class MyEditEngine : public EditEngine
 {
 public:
     MyEditEngine( SfxItemPool* pPool ) : EditEngine( pPool ) { ; }
-    virtual String  CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor );
-    virtual void    FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
-    virtual void    FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
+    virtual String	CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor );
+    virtual void	FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
+    virtual void	FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
 };
 
 XubString __EXPORT MyEditEngine::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
@@ -233,7 +233,7 @@ XubString __EXPORT MyEditEngine::CalcFieldValue( const SvxFieldItem& rField, USH
 
 void __EXPORT MyEditEngine::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
 {
-    EditEngine::FieldClicked( rField, nPara, nPos );    // Falls URL
+    EditEngine::FieldClicked( rField, nPara, nPos );	// Falls URL
     const SvxFieldData* pField = rField.GetField();
     if ( !pField )
         return;
@@ -260,22 +260,22 @@ void __EXPORT MyEditEngine::FieldSelected( const SvxFieldItem& rField, USHORT nP
 class MyView : public WorkWindow
 {
 private:
-    EditEngine*     pEditEngine;
-    EditView*       pEditView;
+    EditEngine*		pEditEngine;
+    EditView*		pEditView;
 
 public:
                     MyView( Window* pParent, EditEngine* pEditEngine );
                     ~MyView();
 
-    virtual void    Paint( const Rectangle& );
-    virtual void    Resize();
-    virtual void    KeyInput( const KeyEvent& rKeyEvt );
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
-    BOOL            Drop( const DropEvent& rEvt );
-    BOOL            QueryDrop( DropEvent& rEvt );
+    virtual void	Paint( const Rectangle& );
+    virtual void	Resize();
+    virtual void	KeyInput( const KeyEvent& rKeyEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
+    BOOL    		Drop( const DropEvent& rEvt );
+    BOOL    		QueryDrop( DropEvent& rEvt );
 };
 
 MyView::MyView( Window* pParent, EditEngine* pEE ) : WorkWindow( pParent, WinBits( WB_STDWORK ) )
@@ -284,7 +284,7 @@ MyView::MyView( Window* pParent, EditEngine* pEE ) : WorkWindow( pParent, WinBit
     pEditView = new EditView( pEditEngine, this );
     pEditEngine->InsertView( pEditView );
     SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Another View..." ) ) );
-//  EnableDrop();
+//	EnableDrop();
     SetBackgroundBrush( Brush( Color( COL_LIGHTBLUE ) ) );
     Show();
 }
@@ -303,8 +303,8 @@ void __EXPORT MyView::Paint( const Rectangle& rRec )
 void __EXPORT MyView::Resize()
 {
     Size aPaperSz( GetOutputSize() );
-//  aPaperSz.Width() /= 2;
-//  aPaperSz.Height() /= 2;
+//	aPaperSz.Width() /= 2;
+//	aPaperSz.Height() /= 2;
     pEditView->SetOutputArea( Rectangle( Point( 0,0 ), aPaperSz ) );
     pEditView->SetVisArea( Rectangle( Point( 0,0 ), aPaperSz ) );
     Invalidate();
@@ -361,72 +361,72 @@ DECLARE_LIST( ViewList, MyView* );
 class EditViewWindow : public Window
 {
 private:
-    MyEditEngine*           pEditEngine;
-    EditView*               pEditView;
-    Pointer                 aStdPtr;
-    Pointer                 aURLPtr;
-    WorkWindow*             pTmpWindow;
-    ViewList                aViewList;
+    MyEditEngine*			pEditEngine;
+    EditView*				pEditView;
+    Pointer 				aStdPtr;
+    Pointer 				aURLPtr;
+    WorkWindow* 			pTmpWindow;
+    ViewList 				aViewList;
 
-    XubString               aTestStr;
+    XubString 				aTestStr;
 
 
 public:
                     EditViewWindow( Window* pParent );
                     ~EditViewWindow();
 
-    virtual void    Paint( const Rectangle& );
-    virtual void    Resize();
-    virtual void    KeyInput( const KeyEvent& rKeyEvt );
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
-    void            MarkOutputArea();
-    BOOL            Drop( const DropEvent& rEvt );
-    BOOL            QueryDrop( DropEvent& rEvt );
-
-    EditView*       GetEditView()       { return pEditView; }
+    virtual void	Paint( const Rectangle& );
+    virtual void	Resize();
+    virtual void	KeyInput( const KeyEvent& rKeyEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
+    void			MarkOutputArea();
+    BOOL    		Drop( const DropEvent& rEvt );
+    BOOL    		QueryDrop( DropEvent& rEvt );
+
+    EditView*		GetEditView() 		{ return pEditView; }
 };
 
 class EditMainWindow : public WorkWindow
 {
 private:
-    ToolBox                 aToolBox;
-    ScrollBar               aHScrollBar;
-    ScrollBar               aVScrollBar;
-    EditViewWindow          aViewWin;
-    Printer*                pPrinter;
+    ToolBox 				aToolBox;
+    ScrollBar				aHScrollBar;
+    ScrollBar				aVScrollBar;
+    EditViewWindow			aViewWin;
+    Printer*				pPrinter;
 
-    WorkWindow*             pTmpWindow;
+    WorkWindow* 			pTmpWindow;
 
-    EditTextObject*         pRTFObj;
-    EditTextObject*         pBinObj;
+    EditTextObject*			pRTFObj;
+    EditTextObject*			pBinObj;
 
-    FileDialog*             pFileDialogBox;
-    FileDialog*             pFileDialogBox2;
+    FileDialog*				pFileDialogBox;
+    FileDialog*				pFileDialogBox2;
 
 
 protected:
-    void            SetScrollBars();
-    void            SetScrollBarRanges();
-    void            CreatePolygon();
+    void			SetScrollBars();
+    void			SetScrollBarRanges();
+    void			CreatePolygon();
 
-    virtual void    GetFocus();
+    virtual void	GetFocus();
 
 public:
                     EditMainWindow();
                     ~EditMainWindow();
 
-    virtual void    Resize();
+    virtual void	Resize();
 
     DECL_LINK( TBSelect, ToolBox * );
-    void            UpdateToolBox();
+    void			UpdateToolBox();
 
     DECL_LINK( HScrollHdl, ScrollBar * );
     DECL_LINK( VScrollHdl, ScrollBar * );
     DECL_LINK( ShowStatus, EditStatus * );
-    void            SetTitle();
+    void			SetTitle();
 };
 
 
@@ -604,7 +604,7 @@ void EditMainWindow::UpdateToolBox()
     aToolBox.EnableItem( TB_MOVE, pEditEngine->GetParagraphCount() > 3 );
     aToolBox.CheckItem( TB_ONLINESPELL, nControl & EE_CNTRL_ONLINESPELLING ? TRUE : FALSE );
     aToolBox.CheckItem( TB_AUTOCORRECT, nControl & EE_CNTRL_AUTOCORRECT ? TRUE : FALSE );
-//  aToolBox.CheckItem( TB_HYPH, nControl & EE_CNTRL_HYPHENATE ? TRUE : FALSE );
+//	aToolBox.CheckItem( TB_HYPH, nControl & EE_CNTRL_HYPHENATE ? TRUE : FALSE );
     aToolBox.CheckItem( TB_REDLINES, nControl & EE_CNTRL_NOREDLINES ? FALSE : TRUE );
     aToolBox.CheckItem( TB_STDSEL, pEditView->GetSelectionMode() == EE_SELMODE_STD );
     aToolBox.CheckItem( TB_FLAT, pEditEngine->IsFlatMode() );
@@ -616,11 +616,11 @@ void EditMainWindow::UpdateToolBox()
 
     for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_ITEMS_END; nWhich++)
     {
-//      if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
-//          ;
-//      else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE )
-//          ;
-//      else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON )
+//		if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
+//			;
+//		else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE )
+//			;
+//		else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON )
         {
             const SfxPoolItem& rItem = aCurSet.Get( nWhich );
             switch ( nWhich )
@@ -723,20 +723,20 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
     SfxPoolItem* pNewItem = 0;
     switch ( nId )
     {
-        case TB_LEFT:   pNewItem = new SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST );
+        case TB_LEFT:	pNewItem = new SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST );
                         break;
-        case TB_RIGHT:  pNewItem = new SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST );
+        case TB_RIGHT:	pNewItem = new SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST );
                         break;
-        case TB_CENTER: pNewItem = new SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST );
+        case TB_CENTER:	pNewItem = new SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST );
                         break;
-        case TB_BLOCK:  pNewItem = new SvxAdjustItem( SVX_ADJUST_BLOCK, EE_PARA_JUST );
+        case TB_BLOCK:	pNewItem = new SvxAdjustItem( SVX_ADJUST_BLOCK, EE_PARA_JUST );
                         break;
-        case TB_HYPH:   pNewItem = new SfxBoolItem( EE_PARA_HYPHENATE, !bChecked );
+        case TB_HYPH: 	pNewItem = new SfxBoolItem( EE_PARA_HYPHENATE, !bChecked );
                         break;
-        case TB_UNDO:   pEditView->Undo();
+        case TB_UNDO:	pEditView->Undo();
                         pEditView->ShowCursor();
                         break;
-        case TB_REDO:   pEditView->Redo();
+        case TB_REDO:	pEditView->Redo();
                         pEditView->ShowCursor();
                         break;
         case TB_ONLINESPELL: {
@@ -766,14 +766,14 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
                             pEditView->GetEditEngine()->SetControlWord( nControl );
                             }
                             break;
-        case TB_STDSEL: if ( bChecked )
+        case TB_STDSEL:	if ( bChecked )
                             pEditView->SetSelectionMode( EE_SELMODE_TXTONLY );
                         else
                             pEditView->SetSelectionMode( EE_SELMODE_STD );
                         break;
-        case TB_FLAT:   pEditEngine->SetFlatMode( !pEditEngine->IsFlatMode() );
+        case TB_FLAT:	pEditEngine->SetFlatMode( !pEditEngine->IsFlatMode() );
                         break;
-        case TB_COLORS: {
+        case TB_COLORS:	{
                             ULONG nControl = pEditView->GetEditEngine()->GetControlWord();
                             if ( bChecked )
                                 nControl = nControl | EE_CNTRL_NOCOLORS;
@@ -781,10 +781,10 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
                                 nControl = nControl & ~EE_CNTRL_NOCOLORS;
                             pEditView->GetEditEngine()->SetControlWord( nControl );
                         }
-//                      aViewWin.Invalidate();
+//						aViewWin.Invalidate();
                         pEditView->GetEditEngine()->Draw( pEditView->GetWindow(), pEditView->GetOutputArea(), pEditView->GetVisArea().TopLeft() );
                         break;
-        case TB_OUTL:   {
+        case TB_OUTL:	{
                             ULONG nControl = pEditView->GetEditEngine()->GetControlWord();
                             if ( !bChecked )
                                 nControl = nControl | EE_CNTRL_OUTLINER;
@@ -793,16 +793,16 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
                             pEditView->GetEditEngine()->SetControlWord( nControl );
                         }
                         break;
-        case TB_POLY:   {
+        case TB_POLY:	{
                             if ( !bChecked )
                                 CreatePolygon();
                             else
                                 pEditView->GetEditEngine()->ClearPolygon();
                         }
                         break;
-        case TB_IDLE:   pEditEngine->EnableIdleFormatter( !pEditEngine->IsIdleFormatterEnabled() );
+        case TB_IDLE:	pEditEngine->EnableIdleFormatter( !pEditEngine->IsIdleFormatterEnabled() );
                         break;
-        case TB_INSFLD: {
+        case TB_INSFLD:	{
                         static BYTE nFld = 0;
                         if ( nFld > 2 )
                             nFld = 0;
@@ -819,13 +819,13 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
                         nFld++;
         }
                         break;
-        case TB_UPDFLD: pEditEngine->UpdateFields();
+        case TB_UPDFLD:	pEditEngine->UpdateFields();
                         break;
-        case TB_INSERT: pEditView->SetInsertMode( !pEditView->IsInsertMode() );
+        case TB_INSERT:	pEditView->SetInsertMode( !pEditView->IsInsertMode() );
                         break;
-        case TB_FONT1:  pNewItem = new SvxFontItem( FAMILY_ROMAN, String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO );
+        case TB_FONT1:	pNewItem = new SvxFontItem( FAMILY_ROMAN, String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO );
                         break;
-        case TB_FONT2:  pNewItem = new SvxFontItem( FAMILY_SWISS, String( RTL_CONSTASCII_USTRINGPARAM( "Helv" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO );
+        case TB_FONT2:	pNewItem = new SvxFontItem( FAMILY_SWISS, String( RTL_CONSTASCII_USTRINGPARAM( "Helv" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO );
                         break;
 /*
         case TB_FONT:
@@ -857,49 +857,49 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
         }
         break;
 */
-        case TB_BOLD:   if ( bChecked )
+        case TB_BOLD:	if ( bChecked )
                             pNewItem = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT);
                         else
                             pNewItem = new SvxWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT);
                         break;
-        case TB_ITALIC: if ( bChecked )
+        case TB_ITALIC:	if ( bChecked )
                             pNewItem = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC );
                         else
                             pNewItem = new SvxPostureItem( ITALIC_NORMAL, EE_CHAR_ITALIC );
                         break;
-        case TB_UNDERLINE:  if ( bChecked )
+        case TB_UNDERLINE:	if ( bChecked )
                                 pNewItem = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE );
                             else
                                 pNewItem = new SvxUnderlineItem( UNDERLINE_SINGLE, EE_CHAR_UNDERLINE );
                         break;
-        case TB_WLM:    pNewItem = new SvxWordLineModeItem( !bChecked, EE_CHAR_WLM );
+        case TB_WLM:	pNewItem = new SvxWordLineModeItem( !bChecked, EE_CHAR_WLM );
                         break;
-        case TB_PKERN:  pNewItem = new SvxAutoKernItem( !bChecked, EE_CHAR_PAIRKERNING );
+        case TB_PKERN:	pNewItem = new SvxAutoKernItem( !bChecked, EE_CHAR_PAIRKERNING );
                         break;
-        case TB_KERN:   if ( bChecked )
+        case TB_KERN:	if ( bChecked )
                                 pNewItem = new SvxKerningItem( 0, EE_CHAR_KERNING );
                             else
                                 pNewItem = new SvxKerningItem( 100, EE_CHAR_KERNING);
                         break;
-        case TB_SUPER:  if ( bChecked )
+        case TB_SUPER:	if ( bChecked )
                                 pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_OFF, EE_CHAR_ESCAPEMENT);
                             else
-//                              pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUPERSCRIPT, EE_CHAR_ESCAPEMENT);
+//								pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUPERSCRIPT, EE_CHAR_ESCAPEMENT);
                                 pNewItem = new SvxEscapementItem( 50, 100, EE_CHAR_ESCAPEMENT );
                         break;
-        case TB_SUB:    if ( bChecked )
+        case TB_SUB:	if ( bChecked )
                                 pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_OFF, EE_CHAR_ESCAPEMENT);
                             else
-//                              pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUBSCRIPT, EE_CHAR_ESCAPEMENT);
+//								pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUBSCRIPT, EE_CHAR_ESCAPEMENT);
                                 pNewItem = new SvxEscapementItem( -50, 100, EE_CHAR_ESCAPEMENT );
                         break;
-        case TB_GREEN:  pNewItem = new SvxColorItem( Color(COL_GREEN), EE_CHAR_COLOR);
+        case TB_GREEN:	pNewItem = new SvxColorItem( Color(COL_GREEN), EE_CHAR_COLOR);
                         break;
-        case TB_RED:    pNewItem = new SvxColorItem( Color(COL_RED), EE_CHAR_COLOR);
+        case TB_RED:	pNewItem = new SvxColorItem( Color(COL_RED), EE_CHAR_COLOR);
                         break;
-        case TB_BLACK:  pNewItem = new SvxColorItem( Color(COL_BLACK), EE_CHAR_COLOR);
+        case TB_BLACK:	pNewItem = new SvxColorItem( Color(COL_BLACK), EE_CHAR_COLOR);
                         break;
-        case TB_SBL:    pNewItem = new SvxLineSpacingItem( 0, EE_PARA_SBL );
+        case TB_SBL:	pNewItem = new SvxLineSpacingItem( 0, EE_PARA_SBL );
                         if ( bChecked )
                         {
                             ((SvxLineSpacingItem*)pNewItem)->SetInterLineSpace( 0 );
@@ -909,14 +909,14 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
                             ((SvxLineSpacingItem*)pNewItem)->SetPropLineSpace( 150 );
                         }
                         break;
-        case TB_SBSA:   pNewItem = new SvxULSpaceItem( EE_PARA_ULSPACE );
+        case TB_SBSA:	pNewItem = new SvxULSpaceItem( EE_PARA_ULSPACE );
                         if ( !bChecked )
                         {
                             ((SvxULSpaceItem*)pNewItem)->SetUpper( 400 );
                             ((SvxULSpaceItem*)pNewItem)->SetLower( 400 );
                         }
                         break;
-        case TB_LR:     pNewItem = new SvxLRSpaceItem( EE_PARA_LRSPACE );
+        case TB_LR:		pNewItem = new SvxLRSpaceItem( EE_PARA_LRSPACE );
                         if ( !bChecked )
                         {
                             ((SvxLRSpaceItem*)pNewItem)->SetTxtLeft( 1000 );
@@ -924,7 +924,7 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
                             ((SvxLRSpaceItem*)pNewItem)->SetRight( 500 );
                         }
                         break;
-        case TB_DEFTAB: if ( bChecked )
+        case TB_DEFTAB:	if ( bChecked )
                             pEditEngine->SetDefTab( 2000 );
                         else
                             pEditEngine->SetDefTab( 600 );
@@ -1034,10 +1034,10 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
             SvFileStream aStrm( aDirEntry.GetFull(), STREAM_READ );
             delete pBinObj;
             pBinObj = EditTextObject::Create( aStrm );
-//          EditTextObject* pTmpObj = pEditEngine->CreateTextObject( aStrm );
-//          pEditEngine->SetText( *pTmpObj );
-//          pEditView->ShowCursor();
-//          delete pTmpObj;
+//			EditTextObject* pTmpObj = pEditEngine->CreateTextObject( aStrm );
+//			pEditEngine->SetText( *pTmpObj );
+//			pEditView->ShowCursor();
+//			delete pTmpObj;
         }
         break;
         case TB_OPEN:
@@ -1101,9 +1101,9 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
                 Rectangle aR( Point( 2000, 4000 ), aSz );
                 pPrinter->DrawRect( aR );
                 // So folgt auf IIISi, 75DPI kein Ausdruck!
-//              pPrinter->SetClipRegion( Region( aR ) );
+//				pPrinter->SetClipRegion( Region( aR ) );
                 pEditEngine->Draw( pPrinter, Point( 2000, 4000 ), nRotation );
-//              pPrinter->SetClipRegion();
+//				pPrinter->SetClipRegion();
                 pPrinter->EndPage();
                 pPrinter->EndJob();
             }
@@ -1115,7 +1115,7 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
             if ( !pFileDialogBox2->Execute() )
                 return FALSE;
             DirEntry aDirEntry( pFileDialogBox2->GetPath() );
-//          DirEntry aDirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\xxx.rtf" ) ) );
+//			DirEntry aDirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\xxx.rtf" ) ) );
             SvFileStream aStrm( aDirEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC );
             Application::EnterWait();
             if ( nId == TB_SAVE )
@@ -1153,7 +1153,7 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
             XubString aDebStr( String( RTL_CONSTASCII_USTRINGPARAM( "Attribute in Selektion:" ) ) );
             aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\nVorlage:" ) );
             XubString aStyle;
-//          pEditView->GetStyleSheet( aStyle, eFam );
+//			pEditView->GetStyleSheet( aStyle, eFam );
             aDebStr += aStyle;
             for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_ITEMS_END; nWhich++)
             {
@@ -1410,9 +1410,9 @@ EditViewWindow::~EditViewWindow()
     // Beim Zerstoeren der Styles am Ende, EditEngine noch nicht kaputt,
     // wird der Handler gerufen, ich zerstore hier aber schon die View!
     pEditEngine->SetStatusEventHdl( Link() );
-//  SvxAutoCorrect* pAutoCorrekt = pEditEngine->GetAutoCorrect();
-//  pEditEngine->SetAutoCorrect( 0 );
-//  delete pAutoCorrekt;
+//	SvxAutoCorrect* pAutoCorrekt = pEditEngine->GetAutoCorrect();
+//	pEditEngine->SetAutoCorrect( 0 );
+//	delete pAutoCorrekt;
     delete pEditEngine;
 }
 
@@ -1420,8 +1420,8 @@ EditViewWindow::EditViewWindow( Window* pParent ) :
                 Window( pParent ), aURLPtr( POINTER_HAND )
 {
     SetBackgroundBrush( Brush( Color( COL_WHITE ) ) );
-    SetMapMode( MAP_100TH_MM );
-//  EnableDrop();
+    SetMapMode( MAP_100TH_MM );	
+//	EnableDrop();
 
     SfxItemPool* pPool = EditEngine::CreatePool();
     Font aFont = GetSettings().GetStyleSettings().GetAppFont();
@@ -1452,20 +1452,20 @@ EditViewWindow::EditViewWindow( Window* pParent ) :
     pEditEngine->SetControlWord( n );
 
     // Test: Autozentrierung
-//  ULONG n = pEditEngine->GetControlWord();
-//  n = n | EE_CNTRL_AUTOPAGESIZE;
-//  pEditEngine->SetControlWord( n );
+//	ULONG n = pEditEngine->GetControlWord();
+//	n = n | EE_CNTRL_AUTOPAGESIZE;
+//	pEditEngine->SetControlWord( n );
 
     // OneLineSpeling
 #ifdef WNT
-//  pEditEngine->CreateSpeller( DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ),
-//                              DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ) );
-//  pEditEngine->GetSpeller()->SetActualLanguage( LANGUAGE_GERMAN );
-//  pEditEngine->GetSpeller()->SetDefaultLanguage( LANGUAGE_GERMAN );
-//  pEditEngine->GetSpeller()->SetMinTrail( 2 );
+//	pEditEngine->CreateSpeller( DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ),
+//								DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ) );
+//	pEditEngine->GetSpeller()->SetActualLanguage( LANGUAGE_GERMAN );
+//	pEditEngine->GetSpeller()->SetDefaultLanguage( LANGUAGE_GERMAN );
+//	pEditEngine->GetSpeller()->SetMinTrail( 2 );
 
     // AutoCorrect wird nie zerstoert
-//  pEditEngine->SetAutoCorrect( new SvxAutoCorrect( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\prj\\office\\autotext\\autocorr.dat" ) ) ) );
+//	pEditEngine->SetAutoCorrect( new SvxAutoCorrect( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\prj\\office\\autotext\\autocorr.dat" ) ) ) );
 #endif
 }
 
@@ -1602,7 +1602,7 @@ void __EXPORT EditViewWindow::KeyInput( const KeyEvent& rKEvt )
             pEditEngine->SetGlobalCharStretching( nX, nY );
             ((EditMainWindow*)GetParent())->SetTitle();
         }
-        else    // ZeichenAttr
+        else	// ZeichenAttr
         {
             SfxItemSet aAttrs( pEditView->GetAttribs() );
             SfxItemSet aNewAttrs( pEditEngine->GetEmptyItemSet() );
@@ -1631,11 +1631,11 @@ void __EXPORT EditViewWindow::KeyInput( const KeyEvent& rKEvt )
     }
     else if ( ( nCode == KEY_P ) && rKEvt.GetKeyCode().IsMod2() )
     {
-//              ESelection aSel = pEditView->GetSelection();
-//              for ( ULONG n = aSel.nStartPara; n <= aSel.nEndPara; n++ )
-//              {
-//                  InfoBox( 0, pEditEngine->GetText( n ) ).Execute();
-//              }
+//				ESelection aSel = pEditView->GetSelection();
+//				for ( ULONG n = aSel.nStartPara; n <= aSel.nEndPara; n++ )
+//				{
+//					InfoBox( 0, pEditEngine->GetText( n ) ).Execute();
+//				}
         InfoBox( 0, pEditView->GetSelected() ).Execute();
 
     }
@@ -1719,20 +1719,20 @@ void __EXPORT EditViewWindow::MouseMove( const MouseEvent& rMEvt )
         else
             SetPointer( pEditView->GetPointer() );
 
-//      aPos -= pEditView->GetOutputArea().TopLeft();
-//      aPos += pEditView->GetVisArea().TopLeft();
-//      if ( pEditView->GetEditEngine()->IsTextPos( aPos, PixelToLogic( Size( 5, 0 ) ).Width() ) )
-//          SetPointer( pEditView->GetPointer() );
-//      else
-//          SetPointer( Pointer( POINTER_REFHAND ) );
+//		aPos -= pEditView->GetOutputArea().TopLeft();
+//		aPos += pEditView->GetVisArea().TopLeft();
+//		if ( pEditView->GetEditEngine()->IsTextPos( aPos, PixelToLogic( Size( 5, 0 ) ).Width() ) )
+//			SetPointer( pEditView->GetPointer() );
+//		else
+//			SetPointer( Pointer( POINTER_REFHAND ) );
 
     }
     else
         SetPointer( aStdPtr );
 
-//  static long x = 0;
-//  x++;
-//  DBG_ASSERT( x < 1000, String( RTL_CONSTASCII_USTRINGPARAM( "?" ) ) );
+//	static long x = 0;
+//	x++;
+//	DBG_ASSERT( x < 1000, String( RTL_CONSTASCII_USTRINGPARAM( "?" ) ) );
     pEditView->MouseMove( rMEvt );
 }
 
@@ -1780,14 +1780,14 @@ void __EXPORT EditApp::Main()
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  xSMgr = createApplicationServiceManager();
     ::comphelper::setProcessServiceFactory( xSMgr );
-
+    
     EditDLL aEditDll;
     SvxGlobalItemData aItemData;
     SvxFieldItem::GetClassManager().SV_CLASS_REGISTER( SvxDateField );
     SvxFieldItem::GetClassManager().SV_CLASS_REGISTER( SvxURLField );
-
+    
     Help::EnableQuickHelp();
-
+    
     EditMainWindow aWindow;
     Execute();
 }
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index baee57ad75dc..58c904d66f3a 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -168,7 +168,7 @@ private:
 bool Atom::operator==( const Atom& rAtom ) const
 {
     return ( maRecordHeader.nRecType == rAtom.maRecordHeader.nRecType ) &&
-            ( maRecordHeader.nRecVer == rAtom.maRecordHeader.nRecVer ) &&
+            ( maRecordHeader.nRecVer == rAtom.maRecordHeader.nRecVer ) &&	
            ( maRecordHeader.nRecInstance == rAtom.maRecordHeader.nRecInstance );
 }
 
@@ -581,7 +581,7 @@ public:
     virtual BOOL    Expand( SvLBoxEntry* pParent );
     virtual BOOL    Collapse( SvLBoxEntry* pParent );
 
-    SvLBoxEntry*    findAtom( Atom* pAtom );
+    SvLBoxEntry*	findAtom( Atom* pAtom );
 
     virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&);
     virtual void SetTabs();
@@ -589,7 +589,7 @@ public:
 private:
     void InsertAtom( const Atom* pAtom, SvLBoxEntry* pParent = 0 );
     const Atom* mpRootAtom;
-    ResMgr* mpResMgr;
+    ResMgr*	mpResMgr;
     Image maImgFolder;
     Image maImgAtom;
     Image maImgExpanded;
@@ -609,8 +609,8 @@ AtomContainerTreeListBox::AtomContainerTreeListBox( Window* pParent )
     maImgCollapsed = Image( ResId( RID_IMG_TREENODE_COLLAPSED, mpResMgr ) );
     maImgExpanded = Image( ResId( RID_IMG_TREENODE_EXPANDED, mpResMgr ) );
 
-//  SetDefaultExpandedEntryBmp( aExpanded );
-//  SetDefaultCollapsedEntryBmp(aCollapsed );
+//	SetDefaultExpandedEntryBmp( aExpanded );
+//	SetDefaultCollapsedEntryBmp(aCollapsed );
 
     maImgFolder = Image( ResId( IMG_SVT_FOLDER, mpResMgr ) );
     maImgAtom = Image( ResId( IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL, mpResMgr ) );
@@ -723,7 +723,7 @@ void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvLBoxEntry* pPare
         if( pAtom->isContainer() && pAtom->findFirstChildAtom() )
         {
             pEntry = InsertEntry( aText, maImgExpanded, maImgCollapsed, pParent );
-
+    
             /** returns the first child atom or NULL */
             const Atom* pChildAtom = pAtom->findFirstChildAtom();
 
@@ -837,11 +837,11 @@ public:
 private:
     void Sync( AtomContainerEntryPair* pPair, int nAction );
 
-    AtomContainerTreeListBox*   mpListBox[2];
-    MultiLineEdit*              mpEdit[2];
-    PPTDocumentPtr              mpDocument[2];
-    MenuBar*                    mpMenuBar;
-    PopupMenu*                  mpFileMenu;
+    AtomContainerTreeListBox*	mpListBox[2];
+    MultiLineEdit*				mpEdit[2];
+    PPTDocumentPtr				mpDocument[2];
+    MenuBar*					mpMenuBar;
+    PopupMenu*					mpFileMenu;
     bool mbSelectHdlGuard;
     DECL_LINK( implSelectHdl, AtomContainerTreeListBox* );
     DECL_LINK( implExpandingHdl, AtomContainerEntryPair* );
@@ -913,13 +913,13 @@ PPTDocumentPtr MSViewerWorkWindow::Load()
     ::sfx2::FileDialogHelper aDlg( ::sfx2::FILEOPEN_SIMPLE, 0 );
     String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.ppt" ) );
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
-//  INetURLObject aFile( SvtPathOptions().GetPalettePath() );
-//  aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
+//	INetURLObject aFile( SvtPathOptions().GetPalettePath() );
+//	aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
 
     PPTDocumentPtr pDocument;
     if ( aDlg.Execute() == ERRCODE_NONE )
     {
-        pDocument.reset( new PPTDocument( aDlg.GetPath() ) );
+        pDocument.reset( new PPTDocument( aDlg.GetPath() ) );	
     }
 
     return pDocument;
@@ -929,7 +929,7 @@ PPTDocumentPtr MSViewerWorkWindow::Load()
 
 MSViewerWorkWindow::MSViewerWorkWindow() :
     WorkWindow( 0, WB_APP | WB_STDWORK | WB_3DLOOK ),mbSelectHdlGuard(false)
-{
+{  
     Size aOutputSize( 400, 600 );
     SetOutputSizePixel( aOutputSize );
     SetText( String( RTL_CONSTASCII_USTRINGPARAM( "MSViewer" ) ) );
@@ -956,7 +956,7 @@ MSViewerWorkWindow::MSViewerWorkWindow() :
         mpListBox[nPane]->SetSelectHdl( LINK( this, MSViewerWorkWindow, implSelectHdl ) );
         mpListBox[nPane]->SetExpandingHdl( LINK( this, MSViewerWorkWindow, implExpandingHdl ) );
         mpListBox[nPane]->SetCollapsingHdl( LINK( this, MSViewerWorkWindow, implCollapsingHdl ) );
-
+        
         mpEdit[nPane] = new MultiLineEdit(this, WB_3DLOOK | WB_BORDER | WB_LEFT | WB_TOP | WB_READONLY | WB_HSCROLL | WB_VSCROLL );
         mpEdit[nPane]->SetReadOnly( TRUE );
         mpEdit[nPane]->SetReadOnly( TRUE );
@@ -1034,7 +1034,7 @@ void MSViewerWorkWindow::Sync( AtomContainerEntryPair* pPair, int nAction )
         if( pAtom && pAtom->getCompareAtom() )
         {
             SvLBoxEntry* pEntry = pDestinationListBox->findAtom( pAtom->getCompareAtom() );
-
+            
             if(pEntry )
             {
                 if( nAction == 0 )
@@ -1176,7 +1176,7 @@ void MSViewerWorkWindow::Resize()
         return -1;
     }
     comphelper::setProcessServiceFactory( xMSF );
-
+    
     InitVCL( xMSF );
 
     String aConfigURL;
diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index 92ac7a402851..9b0399434df9 100644
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -282,7 +282,7 @@ ElementConfigPtr ConfigHandler::importCaseConfig( const Reference< XAttributeLis
 {
     ElementConfigPtr pElementConfig( new CaseElementConfig( getAttribute( xAttribs, "value" ) ) );
     addElement( pElementConfig );
-    return pElementConfig;
+    return pElementConfig;	
 }
 
 void SAL_CALL ConfigHandler::endElement(const OUString& aName) throw( SAXException, RuntimeException )
@@ -316,7 +316,7 @@ void load_config( const OUString& rPath )
     try
     {
         // create stream
-        SvStream*   pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ );
+        SvStream*	pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ );
         Reference<XInputStream> xInputStream( new utl::OInputStreamWrapper( pIStm, sal_True ) );
 
         // prepare ParserInputSrouce
@@ -366,12 +366,12 @@ rtl::OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) cons
 
     switch( mnType )
     {
-    case ECT_BYTE:      aRet += dump_byte( rStream, nLength ); break;
-    case ECT_UINT:      aRet += dump_uint( rStream, nLength ); break;
-    case ECT_UNISTRING: aRet += dump_unistring( rStream, nLength ); break;
-    case ETC_FLOAT:     aRet += dump_float( rStream, nLength ); break;
+    case ECT_BYTE:		aRet += dump_byte( rStream, nLength ); break;
+    case ECT_UINT:		aRet += dump_uint( rStream, nLength ); break;
+    case ECT_UNISTRING:	aRet += dump_unistring( rStream, nLength ); break;
+    case ETC_FLOAT:		aRet += dump_float( rStream, nLength ); break;
     case ECT_HEXDUMP:
-    default:            aRet += dump_hex( rStream, nLength ); break;
+    default:			aRet += dump_hex( rStream, nLength ); break;
     }
 
     return aRet;
@@ -392,7 +392,7 @@ rtl::OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength )
         unsigned int i = c;
         i &= 0xff;
         sprintf( buffer, "%02x ", i );
-        aHex += OUString::createFromAscii( buffer );
+        aHex += OUString::createFromAscii( buffer ); 
 
         if( !isprint( c ) )
             c = '.';
@@ -508,12 +508,12 @@ rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLeng
         OUString aValue;
         switch( getType() )
         {
-        case ECT_BYTE:      aValue = dump_byte( rStream, nLength ); break;
-        case ECT_UINT:      aValue = dump_uint( rStream, nLength ); break;
-        case ECT_UNISTRING: aValue = dump_unistring( rStream, nLength ); break;
-        case ETC_FLOAT:     aValue = dump_float( rStream, nLength ); break;
+        case ECT_BYTE:		aValue = dump_byte( rStream, nLength ); break;
+        case ECT_UINT:		aValue = dump_uint( rStream, nLength ); break;
+        case ECT_UNISTRING:	aValue = dump_unistring( rStream, nLength ); break;
+        case ETC_FLOAT:		aValue = dump_float( rStream, nLength ); break;
         case ECT_HEXDUMP:
-        default:            aValue = dump_hex( rStream, nLength ); break;
+        default:			aValue = dump_hex( rStream, nLength ); break;
         }
 
         if( aValue.getLength() )
@@ -552,10 +552,10 @@ rtl::OUString SwitchElementConfig::format( SvStream& rStream, sal_Size& nLength
 
     switch( getType() )
     {
-    case ECT_BYTE:          aValue = dump_byte( rStream, nLength ); break;
-    case ECT_UINT:          aValue = dump_uint( rStream, nLength ); break;
-    case ETC_FLOAT:         aValue = dump_float( rStream, nLength ); break;
-    case ECT_UNISTRING:     aValue = dump_unistring( rStream, nLength ); break;
+    case ECT_BYTE:			aValue = dump_byte( rStream, nLength );	break;
+    case ECT_UINT:			aValue = dump_uint( rStream, nLength ); break;
+    case ETC_FLOAT:			aValue = dump_float( rStream, nLength ); break;
+    case ECT_UNISTRING:		aValue = dump_unistring( rStream, nLength ); break;
     }
 
     if( aValue.getLength()  )
diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx
index d3d4eeb937e8..c235abeee446 100644
--- a/svx/workben/msview/xmlconfig.hxx
+++ b/svx/workben/msview/xmlconfig.hxx
@@ -16,7 +16,7 @@ public:
     ElementConfig( const rtl::OUString& rName, ElementConfigType rType ) : maName( rName ), mnType( rType ) {}
     ElementConfig( const rtl::OUString& rName ) : maName( rName ) {}
     ElementConfig( ElementConfigType rType ) : mnType( rType ) {}
-
+    
     virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const;
 
     const rtl::OUString& getName() const { return maName; }