You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pe...@apache.org on 2026/08/29 14:46:28 UTC

(openoffice) branch trunk updated: Win10 msvc trunk (#498)

This is an automated email from the ASF dual-hosted git repository.

leginee pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 91144cd008 Win10 msvc trunk (#498)
91144cd008 is described below

commit 91144cd0085a7583d2099b982122deb2184ab956
Author: Peter <le...@users.noreply.github.com>
AuthorDate: Sat Aug 29 14:46:22 2026 +0000

    Win10 msvc trunk (#498)
    
    Build trunk on Windows with a modern MSVC
    
    configure.ac required VS2008, but the bundled dependencies had moved past
    what VC9 can compile -- boost 1.84 needs C++11, Python 3.11 needs VS2017 or
    newer -- so the configured compiler could not build the configured
    dependencies, and no combination of the two worked. Every other platform had
    already moved; Windows was the one left pinned.
    
    This branch accepts a VS2015-or-newer toolset and the Windows 10 SDK, then
    fixes what a modern compiler and SDK find: export lists, entry points, CRT
    and manifest handling, and source conformance across the tree. Every
    dependency builds, including Python, which trunk has never built on Windows
    at all. The CLI/.NET binding is ported from Managed C++ to C++/CLI and its
    bridgetest passes.
    
    configure, bootstrap and build.pl now run to completion, and
    instsetoo_native produces openoffice450.msi and openoffice450sdk.msi.
    
    coinMp has been updated to the latest Version.
    
    What this does not claim: the office has not been started, and
    testtools/source/bridgetest still fails getCaughtException() in the x86 C++
    bridge. Python is built without _ssl, _ctypes, _bz2, _lzma and _sqlite3, and
    Platform SDK v7.0 is still required alongside the Windows 10 SDK. No other
    platform's build is changed.
    
    Co-Authored-By: Claude Opus 5 <no...@anthropic.com>
    Claude-Session: https://claude.ai/code/session_01UWgzQY2r1XwFvgeLPFWPsi
---
 .gitattributes                                     |   13 +
 .gitignore                                         |    3 +
 ext_libraries/coinmp/coinmp-1.7.6-clang-1.8.patch  |   11 -
 ext_libraries/coinmp/coinmp-1.7.6-clang.patch      |   27 -
 ext_libraries/coinmp/coinmp-1.7.6-nopedantic.patch |  133 ---
 .../coinmp/coinmp-1.8.4-v10-sln-paths.patch        |   70 ++
 .../{coinmp-1.7.6.patch => coinmp-1.8.4.patch}     |  319 +++---
 ext_libraries/coinmp/makefile.mk                   |   47 +-
 ext_libraries/gtest/use-own-tuple.patch            |   16 +-
 ext_libraries/gtest/win/Library_gtest.mk           |    9 +-
 main/UnoControls/inc/basecontainercontrol.hxx      |   40 +-
 main/UnoControls/inc/basecontrol.hxx               |   98 +-
 main/UnoControls/inc/multiplexer.hxx               |   48 +-
 .../source/base/basecontainercontrol.cxx           |   40 +-
 main/UnoControls/source/base/basecontrol.cxx       |   94 +-
 main/UnoControls/source/base/multiplexer.cxx       |   48 +-
 main/UnoControls/source/base/registercontrols.cxx  |    2 +-
 .../controls/OConnectionPointContainerHelper.cxx   |   10 +-
 .../source/controls/OConnectionPointHelper.cxx     |   14 +-
 main/UnoControls/source/controls/framecontrol.cxx  |   31 +-
 main/UnoControls/source/controls/progressbar.cxx   |   22 +-
 .../source/controls/progressmonitor.cxx            |   46 +-
 .../source/controls/statusindicator.cxx            |   32 +-
 .../source/inc/OConnectionPointContainerHelper.hxx |   10 +-
 .../source/inc/OConnectionPointHelper.hxx          |   14 +-
 main/UnoControls/source/inc/framecontrol.hxx       |   32 +-
 main/UnoControls/source/inc/progressbar.hxx        |   22 +-
 main/UnoControls/source/inc/progressmonitor.hxx    |   46 +-
 main/UnoControls/source/inc/statusindicator.hxx    |   32 +-
 .../accessibility/extended/AccessibleBrowseBox.hxx |   21 +-
 .../extended/AccessibleBrowseBoxBase.hxx           |   92 +-
 .../extended/AccessibleBrowseBoxCheckBoxCell.hxx   |   18 +-
 .../extended/AccessibleBrowseBoxHeaderBar.hxx      |   92 +-
 .../extended/AccessibleBrowseBoxHeaderCell.hxx     |   10 +-
 .../extended/AccessibleBrowseBoxTable.hxx          |   58 +-
 .../extended/AccessibleBrowseBoxTableBase.hxx      |   59 +-
 .../extended/AccessibleBrowseBoxTableCell.hxx      |   56 +-
 .../extended/AccessibleGridControl.hxx             |   24 +-
 .../extended/AccessibleGridControlBase.hxx         |   86 +-
 .../extended/AccessibleGridControlHeader.hxx       |   58 +-
 .../extended/AccessibleGridControlHeaderCell.hxx   |   16 +-
 .../extended/AccessibleGridControlTable.hxx        |   86 +-
 .../extended/AccessibleGridControlTableBase.hxx    |   59 +-
 .../extended/AccessibleGridControlTableCell.hxx    |   55 +-
 .../extended/AccessibleToolPanelDeck.hxx           |   12 +-
 .../extended/AccessibleToolPanelDeckTabBar.hxx     |   10 +-
 .../extended/AccessibleToolPanelDeckTabBarItem.hxx |   32 +-
 .../extended/accessiblebrowseboxcell.hxx           |    2 +-
 .../extended/accessibleeditbrowseboxcell.hxx       |   30 +-
 .../extended/accessibleiconchoicectrl.hxx          |   39 +-
 .../extended/accessibleiconchoicectrlentry.hxx     |  107 +-
 .../accessibility/extended/accessiblelistbox.hxx   |   39 +-
 .../extended/accessiblelistboxentry.hxx            |  129 ++-
 .../accessibility/extended/accessibletabbar.hxx    |   44 +-
 .../extended/accessibletabbarpage.hxx              |   44 +-
 .../extended/accessibletabbarpagelist.hxx          |   58 +-
 .../extended/accessibletablistbox.hxx              |    9 +-
 .../extended/accessibletablistboxtable.hxx         |   20 +-
 .../accessibility/extended/listboxaccessible.hxx   |    2 +-
 .../extended/textwindowaccessibility.hxx           |  182 ++--
 .../standard/accessiblemenubasecomponent.hxx       |    6 +-
 .../standard/accessiblemenucomponent.hxx           |   48 +-
 .../standard/accessiblemenuitemcomponent.hxx       |   34 +-
 .../accessibility/standard/vclxaccessiblebox.hxx   |   41 +-
 .../standard/vclxaccessiblebutton.hxx              |   22 +-
 .../standard/vclxaccessiblecheckbox.hxx            |   20 +-
 .../standard/vclxaccessiblecombobox.hxx            |    6 +-
 .../standard/vclxaccessibledropdowncombobox.hxx    |    6 +-
 .../standard/vclxaccessibledropdownlistbox.hxx     |    6 +-
 .../accessibility/standard/vclxaccessibleedit.hxx  |   66 +-
 .../standard/vclxaccessiblefixedhyperlink.hxx      |    4 +-
 .../standard/vclxaccessiblefixedtext.hxx           |    4 +-
 .../accessibility/standard/vclxaccessiblelist.hxx  |   50 +-
 .../standard/vclxaccessiblelistbox.hxx             |    6 +-
 .../standard/vclxaccessiblelistitem.hxx            |   90 +-
 .../accessibility/standard/vclxaccessiblemenu.hxx  |   28 +-
 .../standard/vclxaccessiblemenubar.hxx             |   10 +-
 .../standard/vclxaccessiblemenuitem.hxx            |   56 +-
 .../standard/vclxaccessiblemenuseparator.hxx       |    6 +-
 .../standard/vclxaccessiblepopupmenu.hxx           |   10 +-
 .../standard/vclxaccessibleradiobutton.hxx         |   20 +-
 .../standard/vclxaccessiblescrollbar.hxx           |   22 +-
 .../standard/vclxaccessiblestatusbar.hxx           |   10 +-
 .../standard/vclxaccessiblestatusbaritem.hxx       |   58 +-
 .../standard/vclxaccessibletabcontrol.hxx          |   26 +-
 .../standard/vclxaccessibletabpage.hxx             |   58 +-
 .../standard/vclxaccessibletabpagewindow.hxx       |    6 +-
 .../standard/vclxaccessibletextcomponent.hxx       |   34 +-
 .../standard/vclxaccessibletextfield.hxx           |   21 +-
 .../standard/vclxaccessibletoolbox.hxx             |   24 +-
 .../standard/vclxaccessibletoolboxitem.hxx         |   74 +-
 .../source/extended/AccessibleBrowseBox.cxx        |    8 +-
 .../source/extended/AccessibleBrowseBoxBase.cxx    |   38 +-
 .../extended/AccessibleBrowseBoxCheckBoxCell.cxx   |   17 +-
 .../extended/AccessibleBrowseBoxHeaderBar.cxx      |   27 -
 .../extended/AccessibleBrowseBoxHeaderCell.cxx     |    5 -
 .../source/extended/AccessibleBrowseBoxTable.cxx   |   17 -
 .../extended/AccessibleBrowseBoxTableBase.cxx      |   18 -
 .../extended/AccessibleBrowseBoxTableCell.cxx      |   46 +-
 .../source/extended/AccessibleGridControl.cxx      |    9 +-
 .../source/extended/AccessibleGridControlBase.cxx  |   32 +-
 .../extended/AccessibleGridControlHeader.cxx       |   17 -
 .../extended/AccessibleGridControlHeaderCell.cxx   |    8 +-
 .../source/extended/AccessibleGridControlTable.cxx |   25 -
 .../extended/AccessibleGridControlTableBase.cxx    |   18 -
 .../extended/AccessibleGridControlTableCell.cxx    |   46 +-
 .../source/extended/AccessibleToolPanelDeck.cxx    |   12 +-
 .../extended/AccessibleToolPanelDeckTabBar.cxx     |   12 +-
 .../extended/AccessibleToolPanelDeckTabBarItem.cxx |   32 +-
 .../source/extended/accessiblebrowseboxcell.cxx    |    2 +-
 .../extended/accessibleeditbrowseboxcell.cxx       |   30 +-
 .../source/extended/accessibleiconchoicectrl.cxx   |   38 +-
 .../extended/accessibleiconchoicectrlentry.cxx     |  107 +-
 .../source/extended/accessiblelistbox.cxx          |   38 +-
 .../source/extended/accessiblelistboxentry.cxx     |  130 +--
 .../source/extended/accessibletabbar.cxx           |   44 +-
 .../source/extended/accessibletabbarpage.cxx       |   44 +-
 .../source/extended/accessibletabbarpagelist.cxx   |   58 +-
 .../source/extended/accessibletablistbox.cxx       |    4 +-
 .../source/extended/accessibletablistboxtable.cxx  |   17 +-
 .../source/extended/textwindowaccessibility.cxx    |   81 +-
 .../standard/accessiblemenubasecomponent.cxx       |    6 +-
 .../source/standard/accessiblemenucomponent.cxx    |   48 +-
 .../standard/accessiblemenuitemcomponent.cxx       |   34 +-
 .../source/standard/vclxaccessiblebox.cxx          |   14 +-
 .../source/standard/vclxaccessiblebutton.cxx       |   22 +-
 .../source/standard/vclxaccessiblecheckbox.cxx     |   20 +-
 .../source/standard/vclxaccessiblecombobox.cxx     |    2 -
 .../standard/vclxaccessibledropdowncombobox.cxx    |    2 -
 .../standard/vclxaccessibledropdownlistbox.cxx     |    2 -
 .../source/standard/vclxaccessibleedit.cxx         |   66 +-
 .../standard/vclxaccessiblefixedhyperlink.cxx      |    4 +-
 .../source/standard/vclxaccessiblefixedtext.cxx    |    4 +-
 .../source/standard/vclxaccessiblelist.cxx         |   30 +-
 .../source/standard/vclxaccessiblelistbox.cxx      |    2 -
 .../source/standard/vclxaccessiblelistitem.cxx     |   90 +-
 .../source/standard/vclxaccessiblemenu.cxx         |   28 +-
 .../source/standard/vclxaccessiblemenubar.cxx      |   10 +-
 .../source/standard/vclxaccessiblemenuitem.cxx     |   56 +-
 .../standard/vclxaccessiblemenuseparator.cxx       |    6 +-
 .../source/standard/vclxaccessiblepopupmenu.cxx    |   10 +-
 .../source/standard/vclxaccessibleradiobutton.cxx  |   20 +-
 .../source/standard/vclxaccessiblescrollbar.cxx    |   22 +-
 .../source/standard/vclxaccessiblestatusbar.cxx    |   10 +-
 .../standard/vclxaccessiblestatusbaritem.cxx       |   58 +-
 .../source/standard/vclxaccessibletabcontrol.cxx   |   26 +-
 .../source/standard/vclxaccessibletabpage.cxx      |   58 +-
 .../standard/vclxaccessibletabpagewindow.cxx       |    6 +-
 .../standard/vclxaccessibletextcomponent.cxx       |   34 +-
 .../source/standard/vclxaccessibletextfield.cxx    |    7 -
 .../source/standard/vclxaccessibletoolbox.cxx      |   32 +-
 .../source/standard/vclxaccessibletoolboxitem.cxx  |   76 +-
 main/animations/source/animcore/animcore.cxx       |  400 ++++----
 main/animations/source/animcore/factreg.hxx        |    2 +-
 .../source/animcore/targetpropertiescreator.cxx    |   24 +-
 main/autodoc/source/cosv/storage/ploc_dir.cxx      |    4 +-
 main/automation/source/server/XMLParser.cxx        |   64 +-
 main/automation/source/server/statemnt.cxx         |    8 +-
 main/avmedia/source/framework/soundhandler.cxx     |   20 +-
 main/avmedia/source/framework/soundhandler.hxx     |   24 +-
 main/avmedia/source/gstreamer/gstframegrabber.cxx  |    4 -
 main/avmedia/source/gstreamer/gstframegrabber.hxx  |    8 +-
 main/avmedia/source/gstreamer/gstmanager.cxx       |    4 -
 main/avmedia/source/gstreamer/gstmanager.hxx       |   12 +-
 main/avmedia/source/gstreamer/gstplayer.cxx        |   22 -
 main/avmedia/source/gstreamer/gstplayer.hxx        |   66 +-
 main/avmedia/source/gstreamer/gstwindow.cxx        |   27 -
 main/avmedia/source/gstreamer/gstwindow.hxx        |   81 +-
 main/avmedia/source/macavf/macavf_framegrabber.cxx |    4 -
 main/avmedia/source/macavf/macavf_framegrabber.hxx |    8 +-
 main/avmedia/source/macavf/macavf_manager.cxx      |    6 -
 main/avmedia/source/macavf/macavf_manager.hxx      |    8 +-
 main/avmedia/source/macavf/macavf_player.cxx       |   22 -
 main/avmedia/source/macavf/macavf_player.hxx       |   44 +-
 main/avmedia/source/macavf/macavf_window.cxx       |   27 -
 main/avmedia/source/macavf/macavf_window.hxx       |   54 +-
 main/avmedia/source/viewer/mediaevent_impl.cxx     |   11 -
 main/avmedia/source/viewer/mediaevent_impl.hxx     |   22 +-
 main/avmedia/source/win/framegrabber.cxx           |    4 -
 main/avmedia/source/win/framegrabber.hxx           |    8 +-
 main/avmedia/source/win/manager.cxx                |    4 -
 main/avmedia/source/win/manager.hxx                |    8 +-
 main/avmedia/source/win/player.cxx                 |   22 -
 main/avmedia/source/win/player.hxx                 |   44 +-
 main/avmedia/source/win/window.cxx                 |   27 -
 main/avmedia/source/win/window.hxx                 |   54 +-
 main/avmedia/source/xine/manager.cxx               |    4 -
 main/avmedia/source/xine/manager.hxx               |    8 +-
 main/avmedia/source/xine/player.cxx                |   22 -
 main/avmedia/source/xine/player.hxx                |   44 +-
 main/avmedia/source/xine/window.cxx                |   27 -
 main/avmedia/source/xine/window.hxx                |   54 +-
 .../accessibility/accessibledialogcontrolshape.cxx |   48 +-
 .../accessibility/accessibledialogwindow.cxx       |   58 +-
 main/basctl/source/basicide/basicrenderable.cxx    |    6 +-
 main/basctl/source/basicide/basicrenderable.hxx    |    9 +-
 main/basctl/source/basicide/basidectrlr.cxx        |    8 +-
 main/basctl/source/basicide/basidesh.cxx           |    8 +-
 main/basctl/source/basicide/basobj2.cxx            |    1 -
 main/basctl/source/basicide/basobj3.cxx            |    1 -
 main/basctl/source/basicide/doceventnotifier.cxx   |    8 +-
 main/basctl/source/basicide/moduldl2.cxx           |   10 +-
 main/basctl/source/basicide/scriptdocument.cxx     |    6 +-
 main/basctl/source/basicide/unomodel.cxx           |   12 +-
 main/basctl/source/basicide/unomodel.hxx           |   16 +-
 main/basctl/source/dlged/dlgedclip.cxx             |    8 +-
 main/basctl/source/dlged/dlgedlist.cxx             |   12 +-
 main/basctl/source/dlged/dlgedobj.cxx              |   12 +-
 .../source/inc/accessibledialogcontrolshape.hxx    |   48 +-
 main/basctl/source/inc/accessibledialogwindow.hxx  |   58 +-
 main/basctl/source/inc/basidectrlr.hxx             |    8 +-
 main/basctl/source/inc/basobj.hxx                  |   12 +-
 main/basctl/source/inc/dlgedclip.hxx               |    8 +-
 main/basctl/source/inc/dlgedlist.hxx               |   12 +-
 main/basctl/source/inc/dlgedobj.hxx                |   12 +-
 main/basctl/source/inc/scriptdocument.hxx          |    3 +-
 main/basegfx/inc/basegfx/tools/unopolypolygon.hxx  |   36 +-
 main/basegfx/source/tools/unopolypolygon.cxx       |   39 +-
 main/basic/inc/basic/modsizeexceeded.hxx           |    4 +-
 main/basic/inc/basic/sbobjmod.hxx                  |    2 +-
 main/basic/source/basmgr/basmgr.cxx                |  150 +--
 main/basic/source/basmgr/vbahelper.cxx             |    8 +-
 main/basic/source/classes/errobject.cxx            |   56 +-
 main/basic/source/classes/eventatt.cxx             |   14 +-
 main/basic/source/classes/propacc.cxx              |   30 +-
 main/basic/source/classes/sb.cxx                   |   12 +-
 main/basic/source/classes/sbunoobj.cxx             |   57 +-
 main/basic/source/classes/sbxmod.cxx               |   68 +-
 main/basic/source/inc/dlgcont.hxx                  |   17 +-
 main/basic/source/inc/errobject.hxx                |    3 +-
 main/basic/source/inc/namecont.hxx                 |  262 ++---
 main/basic/source/inc/propacc.hxx                  |   46 +-
 main/basic/source/inc/scriptcont.hxx               |   43 +-
 main/basic/source/runtime/comenumwrapper.cxx       |    4 -
 main/basic/source/runtime/comenumwrapper.hxx       |    4 +-
 main/basic/source/uno/dlgcont.cxx                  |   11 +-
 main/basic/source/uno/namecont.cxx                 |   88 +-
 main/basic/source/uno/scriptcont.cxx               |   19 +-
 main/binaryurp/source/bridge.cxx                   |   10 +-
 main/binaryurp/source/bridge.hxx                   |   18 +-
 main/binaryurp/source/bridgefactory.cxx            |   11 +-
 main/binaryurp/source/bridgefactory.hxx            |   22 +-
 .../source/cpp_uno/gcc3_os2_intel/except.cxx       |    2 +-
 .../source/cpp_uno/msvc_win32_intel/except.cxx     |   31 +-
 .../source/cpp_uno/msvc_win64_x86-64/abi.cxx       |   34 +-
 .../source/cpp_uno/msvc_win64_x86-64/except.cxx    |   24 +-
 main/bridges/test/java_uno/acquire/testacquire.cxx |   57 +-
 main/bridges/test/java_uno/any/transport.cxx       |    4 +-
 main/bridges/test/java_uno/equals/testequals.cxx   |   18 +-
 .../testnativethreadpoolclient.cxx                 |    9 +-
 .../testnativethreadpoolserver.cxx                 |    5 +-
 main/bridges/test/testcomp.cxx                     |  126 +--
 main/bridges/test/testcomp.h                       |   47 +-
 main/canvas/inc/canvas/base/bitmapcanvasbase.hxx   |    9 +-
 .../inc/canvas/base/bufferedgraphicdevicebase.hxx  |   21 +-
 .../canvas/inc/canvas/base/cachedprimitivebase.hxx |    8 +-
 main/canvas/inc/canvas/base/canvasbase.hxx         |   51 +-
 .../inc/canvas/base/canvascustomspritebase.hxx     |   24 +-
 main/canvas/inc/canvas/base/doublebitmapbase.hxx   |   18 +-
 main/canvas/inc/canvas/base/floatbitmapbase.hxx    |   18 +-
 main/canvas/inc/canvas/base/graphicdevicebase.hxx  |   66 +-
 main/canvas/inc/canvas/base/integerbitmapbase.hxx  |   10 +-
 main/canvas/inc/canvas/base/spritecanvasbase.hxx   |   13 +-
 main/canvas/inc/canvas/parametricpolypolygon.hxx   |   14 +-
 main/canvas/source/cairo/cairo_canvas.cxx          |    2 +-
 main/canvas/source/cairo/cairo_canvas.hxx          |    2 +-
 main/canvas/source/cairo/cairo_canvasbitmap.cxx    |    8 +-
 main/canvas/source/cairo/cairo_canvasbitmap.hxx    |   10 +-
 .../source/cairo/cairo_canvascustomsprite.cxx      |    6 +-
 .../source/cairo/cairo_canvascustomsprite.hxx      |    6 +-
 main/canvas/source/cairo/cairo_canvasfont.cxx      |   16 +-
 main/canvas/source/cairo/cairo_canvasfont.hxx      |   16 +-
 main/canvas/source/cairo/cairo_canvashelper.cxx    |   47 +-
 main/canvas/source/cairo/cairo_spritecanvas.cxx    |    8 +-
 main/canvas/source/cairo/cairo_spritecanvas.hxx    |    8 +-
 main/canvas/source/cairo/cairo_textlayout.cxx      |   40 +-
 main/canvas/source/cairo/cairo_textlayout.hxx      |   40 +-
 main/canvas/source/directx/dx_canvas.cxx           |    4 +-
 main/canvas/source/directx/dx_canvas.hxx           |    4 +-
 main/canvas/source/directx/dx_canvasbitmap.cxx     |    8 +-
 main/canvas/source/directx/dx_canvasbitmap.hxx     |   10 +-
 .../source/directx/dx_canvascustomsprite.cxx       |    6 +-
 .../source/directx/dx_canvascustomsprite.hxx       |    6 +-
 main/canvas/source/directx/dx_canvasfont.cxx       |   16 +-
 main/canvas/source/directx/dx_canvasfont.hxx       |   16 +-
 main/canvas/source/directx/dx_spritecanvas.cxx     |    8 +-
 main/canvas/source/directx/dx_spritecanvas.hxx     |    8 +-
 main/canvas/source/directx/dx_textlayout.cxx       |   40 +-
 main/canvas/source/directx/dx_textlayout.hxx       |   40 +-
 main/canvas/source/factory/cf_service.cxx          |   32 +-
 main/canvas/source/null/null_canvasbitmap.cxx      |    6 +-
 main/canvas/source/null/null_canvasbitmap.hxx      |    6 +-
 .../canvas/source/null/null_canvascustomsprite.cxx |    6 +-
 .../canvas/source/null/null_canvascustomsprite.hxx |    6 +-
 main/canvas/source/null/null_canvasfont.cxx        |   16 +-
 main/canvas/source/null/null_canvasfont.hxx        |   16 +-
 main/canvas/source/null/null_spritecanvas.cxx      |    8 +-
 main/canvas/source/null/null_spritecanvas.hxx      |    8 +-
 main/canvas/source/null/null_textlayout.cxx        |   40 +-
 main/canvas/source/null/null_textlayout.hxx        |   40 +-
 .../source/simplecanvas/simplecanvasimpl.cxx       |   44 +-
 main/canvas/source/tools/cachedprimitivebase.cxx   |    8 +-
 main/canvas/source/tools/canvastools.cxx           |   47 +-
 main/canvas/source/tools/parametricpolypolygon.cxx |   14 +-
 main/canvas/source/tools/spriteredrawmanager.cxx   |    1 +
 main/canvas/source/vcl/canvas.cxx                  |    2 +-
 main/canvas/source/vcl/canvas.hxx                  |    2 +-
 main/canvas/source/vcl/canvasbitmap.cxx            |    8 +-
 main/canvas/source/vcl/canvasbitmap.hxx            |   10 +-
 main/canvas/source/vcl/canvascustomsprite.cxx      |    6 +-
 main/canvas/source/vcl/canvascustomsprite.hxx      |    6 +-
 main/canvas/source/vcl/canvasfont.cxx              |   16 +-
 main/canvas/source/vcl/canvasfont.hxx              |   16 +-
 main/canvas/source/vcl/spritecanvas.cxx            |    8 +-
 main/canvas/source/vcl/spritecanvas.hxx            |    8 +-
 main/canvas/source/vcl/textlayout.cxx              |   40 +-
 main/canvas/source/vcl/textlayout.hxx              |   40 +-
 .../accessibility/AccStatisticsObject.cxx          |    2 -
 .../accessibility/AccStatisticsObject.hxx          |    4 +-
 .../controller/accessibility/AccessibleBase.cxx    |   30 +-
 .../accessibility/AccessibleChartElement.cxx       |   17 -
 .../accessibility/AccessibleChartElement.hxx       |   43 +-
 .../accessibility/AccessibleChartShape.cxx         |   18 -
 .../accessibility/AccessibleChartShape.hxx         |   46 +-
 .../accessibility/AccessibleChartView.cxx          |   10 -
 .../accessibility/AccessibleTextHelper.cxx         |   14 -
 .../controller/chartapiwrapper/AreaWrapper.cxx     |    9 -
 .../controller/chartapiwrapper/AreaWrapper.hxx     |   25 +-
 .../controller/chartapiwrapper/AxisWrapper.cxx     |   17 +-
 .../controller/chartapiwrapper/AxisWrapper.hxx     |   37 +-
 .../chartapiwrapper/ChartDataWrapper.cxx           |   34 +-
 .../chartapiwrapper/ChartDataWrapper.hxx           |   66 +-
 .../chartapiwrapper/ChartDocumentWrapper.cxx       |   93 +-
 .../chartapiwrapper/DataSeriesPointWrapper.cxx     |   42 +-
 .../chartapiwrapper/DataSeriesPointWrapper.hxx     |   28 +-
 .../controller/chartapiwrapper/DiagramWrapper.cxx  |  160 +--
 .../controller/chartapiwrapper/DiagramWrapper.hxx  |  135 +--
 .../controller/chartapiwrapper/GridWrapper.cxx     |    3 -
 .../controller/chartapiwrapper/GridWrapper.hxx     |    9 +-
 .../controller/chartapiwrapper/LegendWrapper.cxx   |   17 +-
 .../controller/chartapiwrapper/LegendWrapper.hxx   |   25 +-
 .../chartapiwrapper/MinMaxLineWrapper.cxx          |   22 -
 .../chartapiwrapper/MinMaxLineWrapper.hxx          |   47 +-
 .../controller/chartapiwrapper/TitleWrapper.cxx    |   30 +-
 .../controller/chartapiwrapper/TitleWrapper.hxx    |   42 +-
 .../chartapiwrapper/UpDownBarWrapper.cxx           |   22 -
 .../chartapiwrapper/UpDownBarWrapper.hxx           |   47 +-
 .../chartapiwrapper/WallFloorWrapper.cxx           |    3 -
 .../chartapiwrapper/WallFloorWrapper.hxx           |    9 +-
 .../chartapiwrapper/WrappedAddInProperty.cxx       |    8 -
 .../chartapiwrapper/WrappedAddInProperty.hxx       |   24 +-
 .../WrappedAutomaticPositionProperties.cxx         |   12 +-
 .../WrappedAxisAndGridExistenceProperties.cxx      |   36 +-
 .../WrappedCharacterHeightProperty.cxx             |    4 -
 .../WrappedCharacterHeightProperty.hxx             |   12 +-
 .../chartapiwrapper/WrappedGapwidthProperty.cxx    |    2 -
 .../chartapiwrapper/WrappedGapwidthProperty.hxx    |    6 +-
 .../WrappedNumberFormatProperty.cxx                |    6 -
 .../WrappedNumberFormatProperty.hxx                |   18 +-
 .../chartapiwrapper/WrappedScaleProperty.cxx       |    4 -
 .../chartapiwrapper/WrappedScaleProperty.hxx       |   12 +-
 .../chartapiwrapper/WrappedScaleTextProperties.cxx |   12 +-
 .../chartapiwrapper/WrappedSceneProperty.cxx       |    3 -
 .../chartapiwrapper/WrappedSceneProperty.hxx       |    9 +-
 .../WrappedSeriesOrDiagramProperty.hxx             |    3 -
 .../chartapiwrapper/WrappedSplineProperties.cxx    |    3 -
 .../chartapiwrapper/WrappedStockProperties.cxx     |   16 +-
 .../chartapiwrapper/WrappedSymbolProperties.cxx    |   16 +-
 .../WrappedTextRotationProperty.cxx                |    1 -
 .../WrappedTextRotationProperty.hxx                |    3 +-
 .../dialogs/ChartTypeDialogController.cxx          |    4 +-
 .../dialogs/ChartTypeDialogController.hxx          |    4 +-
 .../source/controller/dialogs/DialogModel.cxx      |   19 +-
 .../controller/dialogs/RangeSelectionListener.cxx  |    3 -
 .../controller/dialogs/dlg_ChartType_UNO.cxx       |   10 +-
 .../controller/dialogs/dlg_CreationWizard_UNO.cxx  |   28 +-
 .../source/controller/inc/AccessibleBase.hxx       |   87 +-
 .../source/controller/inc/AccessibleChartView.hxx  |   27 +-
 .../source/controller/inc/AccessibleTextHelper.hxx |   36 +-
 .../source/controller/inc/AxisItemConverter.hxx    |    6 +-
 .../inc/CharacterPropertyItemConverter.hxx         |    6 +-
 .../source/controller/inc/ChartDocumentWrapper.hxx |   93 +-
 .../controller/inc/DataPointItemConverter.hxx      |    6 +-
 .../controller/inc/ErrorBarItemConverter.hxx       |    6 +-
 .../inc/GraphicPropertyItemConverter.hxx           |    6 +-
 .../chart2/source/controller/inc/ItemConverter.hxx |    6 +-
 .../source/controller/inc/LegendItemConverter.hxx  |    6 +-
 .../controller/inc/RangeSelectionListener.hxx      |    9 +-
 .../inc/RegressionCurveItemConverter.hxx           |    6 +-
 .../inc/RegressionEquationItemConverter.hxx        |    6 +-
 .../controller/inc/SeriesOptionsItemConverter.hxx  |    6 +-
 .../controller/inc/StatisticsItemConverter.hxx     |    6 +-
 .../source/controller/inc/TitleItemConverter.hxx   |    6 +-
 .../source/controller/inc/dlg_ChartType_UNO.hxx    |   10 +-
 .../controller/inc/dlg_CreationWizard_UNO.hxx      |   34 +-
 .../itemsetwrapper/AxisItemConverter.cxx           |    2 -
 .../CharacterPropertyItemConverter.cxx             |    2 -
 .../itemsetwrapper/DataPointItemConverter.cxx      |    2 -
 .../itemsetwrapper/ErrorBarItemConverter.cxx       |    2 -
 .../GraphicPropertyItemConverter.cxx               |    2 -
 .../controller/itemsetwrapper/ItemConverter.cxx    |    2 -
 .../itemsetwrapper/LegendItemConverter.cxx         |    2 -
 .../RegressionCurveItemConverter.cxx               |    2 -
 .../RegressionEquationItemConverter.cxx            |    2 -
 .../itemsetwrapper/SeriesOptionsItemConverter.cxx  |    2 -
 .../itemsetwrapper/StatisticsItemConverter.cxx     |    2 -
 .../itemsetwrapper/TitleItemConverter.cxx          |    2 -
 .../source/controller/main/ChartController.cxx     |   32 +-
 .../source/controller/main/ChartController.hxx     |  138 +--
 .../controller/main/ChartController_Window.cxx     |   23 +-
 .../source/controller/main/ChartFrameloader.cxx    |    3 +-
 .../source/controller/main/ChartFrameloader.hxx    |    5 +-
 .../source/controller/main/CommandDispatch.cxx     |    5 -
 .../source/controller/main/CommandDispatch.hxx     |   15 +-
 .../controller/main/ControllerCommandDispatch.cxx  |    4 -
 .../controller/main/ControllerCommandDispatch.hxx  |   12 +-
 .../source/controller/main/DrawCommandDispatch.cxx |    1 -
 .../source/controller/main/DrawCommandDispatch.hxx |    3 +-
 .../source/controller/main/ElementSelector.cxx     |    7 +-
 .../source/controller/main/ElementSelector.hxx     |    8 +-
 .../controller/main/FeatureCommandDispatchBase.cxx |    1 -
 .../controller/main/FeatureCommandDispatchBase.hxx |    3 +-
 .../source/controller/main/ObjectHierarchy.cxx     |    1 +
 .../source/controller/main/ShapeController.cxx     |    1 -
 .../source/controller/main/ShapeController.hxx     |    3 +-
 .../controller/main/ShapeToolbarController.cxx     |   26 +-
 .../controller/main/ShapeToolbarController.hxx     |   26 +-
 .../controller/main/StatusBarCommandDispatch.cxx   |    4 -
 .../controller/main/StatusBarCommandDispatch.hxx   |   12 +-
 main/chart2/source/controller/main/UndoActions.cxx |   12 +-
 main/chart2/source/controller/main/UndoActions.hxx |   12 +-
 .../source/controller/main/UndoCommandDispatch.cxx |    2 -
 .../source/controller/main/UndoCommandDispatch.hxx |    6 +-
 main/chart2/source/inc/CachedDataSequence.hxx      |   32 +-
 main/chart2/source/inc/CloneHelper.hxx             |    4 +
 main/chart2/source/inc/ConfigColorScheme.hxx       |    3 +-
 main/chart2/source/inc/ContainerHelper.hxx         |    1 +
 main/chart2/source/inc/DataSource.hxx              |    6 +-
 main/chart2/source/inc/ErrorBar.hxx                |   34 +-
 .../inc/ExponentialRegressionCurveCalculator.hxx   |   11 +-
 main/chart2/source/inc/InternalDataProvider.hxx    |  124 +--
 main/chart2/source/inc/LabeledDataSequence.hxx     |   21 +-
 main/chart2/source/inc/LifeTime.hxx                |   11 +-
 .../source/inc/LinearRegressionCurveCalculator.hxx |   11 +-
 .../inc/LogarithmicRegressionCurveCalculator.hxx   |   11 +-
 .../inc/MeanValueRegressionCurveCalculator.hxx     |   11 +-
 main/chart2/source/inc/ModifyListenerHelper.hxx    |   12 +-
 main/chart2/source/inc/NameContainer.hxx           |   24 +-
 main/chart2/source/inc/OPropertySet.hxx            |   60 +-
 .../inc/PotentialRegressionCurveCalculator.hxx     |   11 +-
 main/chart2/source/inc/RangeHighlighter.hxx        |   15 +-
 .../source/inc/RegressionCurveCalculator.hxx       |   20 +-
 main/chart2/source/inc/Scaling.hxx                 |   32 +-
 main/chart2/source/inc/ServiceMacros.hxx           |   11 +-
 main/chart2/source/inc/UncachedDataSequence.hxx    |   62 +-
 main/chart2/source/inc/WeakListenerAdapter.hxx     |    7 +-
 main/chart2/source/inc/WrappedDefaultProperty.hxx  |   13 +-
 .../source/inc/WrappedDirectStateProperty.hxx      |    4 +-
 main/chart2/source/inc/WrappedIgnoreProperty.hxx   |   15 +-
 main/chart2/source/inc/WrappedProperty.hxx         |   15 +-
 main/chart2/source/inc/WrappedPropertySet.hxx      |   38 +-
 main/chart2/source/model/filter/XMLFilter.cxx      |    6 -
 .../source/model/inc/BaseCoordinateSystem.hxx      |   48 +-
 .../source/model/inc/CartesianCoordinateSystem.hxx |    9 +-
 main/chart2/source/model/inc/ChartTypeManager.hxx  |   11 +-
 main/chart2/source/model/inc/DataSeries.hxx        |   54 +-
 main/chart2/source/model/inc/DataSeriesTree.hxx    |   14 +-
 main/chart2/source/model/inc/Diagram.hxx           |   72 +-
 .../source/model/inc/PolarCoordinateSystem.hxx     |    9 +-
 main/chart2/source/model/inc/StockBar.hxx          |   21 +-
 main/chart2/source/model/inc/XMLFilter.hxx         |   21 +-
 main/chart2/source/model/main/Axis.cxx             |   14 -
 main/chart2/source/model/main/Axis.hxx             |   42 +-
 .../source/model/main/BaseCoordinateSystem.cxx     |   20 -
 .../model/main/CartesianCoordinateSystem.cxx       |    3 -
 main/chart2/source/model/main/ChartModel.cxx       |   83 +-
 main/chart2/source/model/main/ChartModel.hxx       |  268 ++---
 .../source/model/main/ChartModel_Persistence.cxx   |   46 -
 main/chart2/source/model/main/DataPoint.cxx        |   11 -
 main/chart2/source/model/main/DataPoint.hxx        |   31 +-
 main/chart2/source/model/main/DataSeries.cxx       |   20 -
 main/chart2/source/model/main/Diagram.cxx          |   30 -
 main/chart2/source/model/main/FormattedString.cxx  |    9 -
 main/chart2/source/model/main/FormattedString.hxx  |   27 +-
 main/chart2/source/model/main/GridProperties.cxx   |    7 -
 main/chart2/source/model/main/GridProperties.hxx   |   21 +-
 main/chart2/source/model/main/LayoutContainer.cxx  |   12 -
 main/chart2/source/model/main/LayoutContainer.hxx  |   24 +-
 main/chart2/source/model/main/Legend.cxx           |    7 -
 main/chart2/source/model/main/Legend.hxx           |   21 +-
 main/chart2/source/model/main/PageBackground.cxx   |    7 -
 main/chart2/source/model/main/PageBackground.hxx   |   21 +-
 .../source/model/main/PolarCoordinateSystem.cxx    |    3 -
 main/chart2/source/model/main/StockBar.cxx         |    7 -
 main/chart2/source/model/main/Title.cxx            |    9 -
 main/chart2/source/model/main/Title.hxx            |   27 +-
 main/chart2/source/model/main/UndoManager.cxx      |   48 +-
 main/chart2/source/model/main/UndoManager.hxx      |   48 +-
 main/chart2/source/model/main/Wall.cxx             |    7 -
 main/chart2/source/model/main/Wall.hxx             |   21 +-
 .../chart2/source/model/template/AreaChartType.cxx |    2 -
 .../chart2/source/model/template/AreaChartType.hxx |    6 +-
 .../model/template/AreaChartTypeTemplate.cxx       |    5 -
 .../model/template/AreaChartTypeTemplate.hxx       |   15 +-
 main/chart2/source/model/template/BarChartType.cxx |    2 -
 main/chart2/source/model/template/BarChartType.hxx |    6 +-
 .../source/model/template/BarChartTypeTemplate.cxx |    6 -
 .../source/model/template/BarChartTypeTemplate.hxx |   18 +-
 .../source/model/template/BubbleChartType.cxx      |    8 -
 .../source/model/template/BubbleChartType.hxx      |   22 +-
 .../model/template/BubbleChartTypeTemplate.cxx     |    7 -
 .../model/template/BubbleChartTypeTemplate.hxx     |   21 +-
 .../model/template/BubbleDataInterpreter.cxx       |    3 -
 .../model/template/BubbleDataInterpreter.hxx       |    9 +-
 .../source/model/template/CandleStickChartType.cxx |    8 -
 .../source/model/template/CandleStickChartType.hxx |   24 +-
 main/chart2/source/model/template/ChartType.cxx    |   18 -
 main/chart2/source/model/template/ChartType.hxx    |   49 +-
 .../source/model/template/ChartTypeManager.cxx     |    5 -
 .../source/model/template/ChartTypeTemplate.cxx    |   10 -
 .../source/model/template/ChartTypeTemplate.hxx    |   30 +-
 .../source/model/template/ColumnChartType.cxx      |    4 -
 .../source/model/template/ColumnChartType.hxx      |   12 +-
 .../model/template/ColumnLineChartTypeTemplate.cxx |    6 -
 .../model/template/ColumnLineChartTypeTemplate.hxx |   18 +-
 .../model/template/ColumnLineDataInterpreter.cxx   |    1 -
 .../model/template/ColumnLineDataInterpreter.hxx   |    3 +-
 .../source/model/template/DataInterpreter.cxx      |    4 -
 .../source/model/template/DataInterpreter.hxx      |   12 +-
 .../source/model/template/FilledNetChartType.cxx   |    2 -
 .../source/model/template/FilledNetChartType.hxx   |    6 +-
 .../chart2/source/model/template/LineChartType.cxx |    4 -
 .../chart2/source/model/template/LineChartType.hxx |   12 +-
 .../model/template/LineChartTypeTemplate.cxx       |    5 -
 .../model/template/LineChartTypeTemplate.hxx       |   15 +-
 main/chart2/source/model/template/NetChartType.cxx |    6 -
 main/chart2/source/model/template/NetChartType.hxx |   16 +-
 .../source/model/template/NetChartTypeTemplate.cxx |    3 -
 .../source/model/template/NetChartTypeTemplate.hxx |    9 +-
 main/chart2/source/model/template/PieChartType.cxx |    6 -
 main/chart2/source/model/template/PieChartType.hxx |   16 +-
 .../source/model/template/PieChartTypeTemplate.cxx |    6 -
 .../source/model/template/PieChartTypeTemplate.hxx |   18 +-
 .../source/model/template/ScatterChartType.cxx     |    8 -
 .../source/model/template/ScatterChartType.hxx     |   22 +-
 .../model/template/ScatterChartTypeTemplate.cxx    |    7 -
 .../model/template/ScatterChartTypeTemplate.hxx    |   21 +-
 .../model/template/StockChartTypeTemplate.cxx      |    7 -
 .../model/template/StockChartTypeTemplate.hxx      |   21 +-
 .../source/model/template/StockDataInterpreter.cxx |    3 -
 .../source/model/template/StockDataInterpreter.hxx |    9 +-
 .../source/model/template/XYDataInterpreter.cxx    |    3 -
 .../source/model/template/XYDataInterpreter.hxx    |    9 +-
 main/chart2/source/tools/CachedDataSequence.cxx    |   13 +-
 main/chart2/source/tools/ConfigColorScheme.cxx     |    1 -
 main/chart2/source/tools/DataSource.cxx            |    2 -
 main/chart2/source/tools/DataSourceHelper.cxx      |    4 +
 main/chart2/source/tools/DiagramHelper.cxx         |    1 +
 main/chart2/source/tools/ErrorBar.cxx              |   12 -
 .../tools/ExponentialRegressionCurveCalculator.cxx |    5 -
 main/chart2/source/tools/ImplOPropertySet.cxx      |    1 +
 main/chart2/source/tools/InternalData.cxx          |    4 +
 main/chart2/source/tools/InternalDataProvider.cxx  |   58 +-
 main/chart2/source/tools/LabeledDataSequence.cxx   |    7 -
 main/chart2/source/tools/LifeTime.cxx              |    5 +-
 .../tools/LinearRegressionCurveCalculator.cxx      |    5 -
 .../tools/LogarithmicRegressionCurveCalculator.cxx |    5 -
 .../tools/MeanValueRegressionCurveCalculator.cxx   |    5 -
 .../chart2/source/tools/ModifyListenerCallBack.cxx |    8 +-
 main/chart2/source/tools/ModifyListenerHelper.cxx  |    4 -
 main/chart2/source/tools/NameContainer.cxx         |   12 -
 main/chart2/source/tools/OPropertySet.cxx          |   31 -
 .../tools/PotentialRegressionCurveCalculator.cxx   |    5 -
 main/chart2/source/tools/PropertyHelper.cxx        |    4 +
 main/chart2/source/tools/RangeHighlighter.cxx      |    5 -
 .../source/tools/RegressionCurveCalculator.cxx     |    5 -
 main/chart2/source/tools/RegressionCurveModel.cxx  |   15 -
 main/chart2/source/tools/RegressionCurveModel.hxx  |   45 +-
 main/chart2/source/tools/RegressionEquation.cxx    |    9 -
 main/chart2/source/tools/RegressionEquation.hxx    |   27 +-
 main/chart2/source/tools/Scaling.cxx               |   12 -
 main/chart2/source/tools/UncachedDataSequence.cxx  |   26 -
 main/chart2/source/tools/WeakListenerAdapter.cxx   |    2 -
 .../chart2/source/tools/WrappedDefaultProperty.cxx |    7 -
 .../source/tools/WrappedDirectStateProperty.cxx    |    2 -
 main/chart2/source/tools/WrappedIgnoreProperty.cxx |    5 -
 main/chart2/source/tools/WrappedProperty.cxx       |    5 -
 main/chart2/source/tools/WrappedPropertySet.cxx    |   19 -
 main/chart2/source/view/axes/DateScaling.cxx       |    6 -
 main/chart2/source/view/axes/DateScaling.hxx       |   16 +-
 main/chart2/source/view/axes/VAxisBase.cxx         |    1 -
 main/chart2/source/view/axes/VAxisBase.hxx         |    3 +-
 main/chart2/source/view/axes/VAxisOrGridBase.cxx   |    1 -
 main/chart2/source/view/axes/VAxisOrGridBase.hxx   |    3 +-
 .../view/axes/VCartesianCoordinateSystem.cxx       |    1 -
 main/chart2/source/view/axes/VCoordinateSystem.cxx |    1 -
 main/chart2/source/view/axes/VPolarRadiusAxis.cxx  |    2 -
 main/chart2/source/view/axes/VPolarRadiusAxis.hxx  |    5 +-
 .../source/view/charttypes/VSeriesPlotter.cxx      |    1 -
 .../source/view/inc/Linear3DTransformation.hxx     |   10 +-
 main/chart2/source/view/inc/PlotterBase.hxx        |    2 +-
 main/chart2/source/view/inc/VCoordinateSystem.hxx  |    3 +-
 .../source/view/inc/VPolarTransformation.hxx       |   10 +-
 main/chart2/source/view/inc/VSeriesPlotter.hxx     |    3 +-
 main/chart2/source/view/main/ChartView.cxx         |   25 +-
 main/chart2/source/view/main/ChartView.hxx         |   55 +-
 .../source/view/main/Linear3DTransformation.cxx    |    4 -
 main/chart2/source/view/main/PlotterBase.cxx       |    1 -
 .../source/view/main/VPolarTransformation.cxx      |    4 -
 main/chart2/workbench/addin/sampleaddin.cxx        |   36 +-
 main/chart2/workbench/addin/sampleaddin.hxx        |   86 +-
 main/cli_ure/source/climaker/climaker_app.cxx      |  113 +-
 main/cli_ure/source/climaker/climaker_emit.cxx     | 1078 ++++++++++----------
 main/cli_ure/source/climaker/climaker_share.h      |  197 ++--
 main/cli_ure/source/climaker/makefile.mk           |    4 +
 main/cli_ure/source/native/makefile.mk             |    9 +-
 main/cli_ure/source/native/native_bootstrap.cxx    |   48 +-
 main/cli_ure/source/native/native_share.h          |   19 +-
 main/cli_ure/source/uno_bridge/cli_base.h          |  128 +--
 main/cli_ure/source/uno_bridge/cli_bridge.cxx      |   19 +-
 main/cli_ure/source/uno_bridge/cli_bridge.h        |   22 +-
 main/cli_ure/source/uno_bridge/cli_data.cxx        |  771 +++++++-------
 main/cli_ure/source/uno_bridge/cli_environment.cxx |   66 +-
 main/cli_ure/source/uno_bridge/cli_environment.h   |   30 +-
 main/cli_ure/source/uno_bridge/cli_proxy.cxx       |  388 +++----
 main/cli_ure/source/uno_bridge/cli_proxy.h         |  106 +-
 main/cli_ure/source/uno_bridge/cli_uno.cxx         |   44 +-
 main/cli_ure/source/uno_bridge/makefile.mk         |    9 +-
 main/cli_ure/util/makefile.pmk                     |    7 +
 main/codemaker/inc/codemaker/exceptiontree.hxx     |    3 +-
 main/codemaker/inc/codemaker/options.hxx           |   11 +-
 .../source/bonobowrappermaker/corbamaker.cxx       |    2 -
 .../source/bonobowrappermaker/corbaoptions.cxx     |    1 -
 .../source/bonobowrappermaker/corbaoptions.hxx     |    3 +-
 .../source/bonobowrappermaker/corbatype.cxx        |   10 -
 .../source/bonobowrappermaker/corbatype.hxx        |   26 +-
 main/codemaker/source/codemaker/exceptiontree.cxx  |    1 -
 main/codemaker/source/codemaker/options.cxx        |    3 -
 main/codemaker/source/cppumaker/cppumaker.cxx      |    2 -
 main/codemaker/source/cppumaker/cppuoptions.cxx    |    1 -
 main/codemaker/source/cppumaker/cppuoptions.hxx    |    3 +-
 main/codemaker/source/cppumaker/cpputype.cxx       |   70 +-
 main/codemaker/source/cppumaker/cpputype.hxx       |   64 +-
 main/codemaker/source/cunomaker/cunomaker.cxx      |    1 -
 main/codemaker/source/cunomaker/cunooptions.cxx    |    1 -
 main/codemaker/source/cunomaker/cunooptions.hxx    |    3 +-
 main/codemaker/source/cunomaker/cunotype.cxx       |   24 -
 main/codemaker/source/cunomaker/cunotype.hxx       |   54 +-
 main/codemaker/source/idlmaker/idlmaker.cxx        |    1 -
 main/codemaker/source/idlmaker/idloptions.cxx      |    1 -
 main/codemaker/source/idlmaker/idloptions.hxx      |    3 +-
 main/codemaker/source/idlmaker/idltype.cxx         |   12 -
 main/codemaker/source/idlmaker/idltype.hxx         |   28 +-
 main/codemaker/source/javamaker/javamaker.cxx      |    2 -
 main/codemaker/source/javamaker/javaoptions.cxx    |    1 -
 main/codemaker/source/javamaker/javaoptions.hxx    |    3 +-
 .../inc/comphelper/ChainablePropertySet.hxx        |   81 +-
 .../inc/comphelper/ChainablePropertySetInfo.hxx    |    9 +-
 .../inc/comphelper/MasterPropertySet.hxx           |   81 +-
 .../inc/comphelper/MasterPropertySetInfo.hxx       |    9 +-
 .../inc/comphelper/SelectionMultiplex.hxx          |    8 +-
 main/comphelper/inc/comphelper/SettingsHelper.hxx  |   14 +-
 .../inc/comphelper/accessiblecomponenthelper.hxx   |   32 +-
 .../inc/comphelper/accessiblecontexthelper.hxx     |   32 +-
 .../inc/comphelper/accessiblekeybindinghelper.hxx  |    8 +-
 .../inc/comphelper/accessibleselectionhelper.hxx   |   39 +-
 .../inc/comphelper/accessibletexthelper.hxx        |   40 +-
 .../inc/comphelper/accessiblewrapper.hxx           |   50 +-
 main/comphelper/inc/comphelper/accimplaccess.hxx   |    2 +-
 main/comphelper/inc/comphelper/attributelist.hxx   |   18 +-
 main/comphelper/inc/comphelper/composedprops.hxx   |   22 +-
 .../inc/comphelper/containermultiplexer.hxx        |   16 +-
 .../inc/comphelper/docpasswordrequest.hxx          |   12 +-
 main/comphelper/inc/comphelper/enumhelper.hxx      |   19 +-
 .../comphelper/inc/comphelper/eventattachermgr.hxx |    6 +-
 main/comphelper/inc/comphelper/evtlistenerhlp.hxx  |    2 +-
 main/comphelper/inc/comphelper/extract.hxx         |    2 -
 main/comphelper/inc/comphelper/ihwrapnofilter.hxx  |   17 +-
 main/comphelper/inc/comphelper/implbase_var.hxx    |   21 +-
 main/comphelper/inc/comphelper/interaction.hxx     |   12 +-
 .../inc/comphelper/listenernotification.hxx        |   18 +-
 main/comphelper/inc/comphelper/locale.hxx          |    9 +-
 main/comphelper/inc/comphelper/mediadescriptor.hxx |    4 +-
 .../inc/comphelper/numberedcollection.hxx          |   15 +-
 main/comphelper/inc/comphelper/ofopxmlhelper.hxx   |   31 +-
 .../inc/comphelper/oslfile2streamwrap.hxx          |   16 +-
 .../inc/comphelper/otransactedfilestream.hxx       |   48 +-
 main/comphelper/inc/comphelper/processfactory.hxx  |    4 +-
 main/comphelper/inc/comphelper/propagg.hxx         |   35 +-
 .../inc/comphelper/propertycontainer.hxx           |   11 +-
 .../inc/comphelper/propertycontainerhelper.hxx     |    6 +-
 .../inc/comphelper/propertysethelper.hxx           |   42 +-
 main/comphelper/inc/comphelper/propertysetinfo.hxx |    6 +-
 .../inc/comphelper/propertystatecontainer.hxx      |   12 +-
 main/comphelper/inc/comphelper/propmultiplex.hxx   |    8 +-
 main/comphelper/inc/comphelper/propstate.hxx       |   12 +-
 .../comphelper/inc/comphelper/proxyaggregation.hxx |   16 +-
 main/comphelper/inc/comphelper/seekableinput.hxx   |   16 +-
 main/comphelper/inc/comphelper/seqstream.hxx       |   30 +-
 main/comphelper/inc/comphelper/servicedecl.hxx     |    8 +-
 main/comphelper/inc/comphelper/servicehelper.hxx   |    6 +-
 .../inc/comphelper/serviceinfohelper.hxx           |    6 +-
 main/comphelper/inc/comphelper/storagehelper.hxx   |   46 +-
 main/comphelper/inc/comphelper/types.hxx           |    2 +-
 main/comphelper/inc/comphelper/uno3.hxx            |   32 +-
 main/comphelper/inc/comphelper/weak.hxx            |    6 +-
 .../inc/comphelper/weakeventlistener.hxx           |    4 +-
 .../source/compare/AnyCompareFactory.cxx           |   25 +-
 .../container/IndexedPropertyValuesContainer.cxx   |   48 +-
 .../container/NamedPropertyValuesContainer.cxx     |   52 +-
 .../source/container/containermultiplexer.cxx      |   16 +-
 main/comphelper/source/container/enumerablemap.cxx |   76 +-
 main/comphelper/source/container/enumhelper.cxx    |   11 +-
 main/comphelper/source/container/namecontainer.cxx |   40 +-
 .../source/eventattachermgr/eventattachermgr.cxx   |   76 +-
 main/comphelper/source/misc/SelectionMultiplex.cxx |    6 +-
 .../source/misc/accessiblecomponenthelper.cxx      |   30 +-
 .../source/misc/accessiblecontexthelper.cxx        |   12 +-
 .../source/misc/accessiblekeybindinghelper.cxx     |    8 +-
 .../source/misc/accessibleselectionhelper.cxx      |   30 +-
 .../source/misc/accessibletexthelper.cxx           |   40 +-
 main/comphelper/source/misc/accessiblewrapper.cxx  |   50 +-
 main/comphelper/source/misc/accimplaccess.cxx      |    2 +-
 main/comphelper/source/misc/docpasswordrequest.cxx |   28 +-
 main/comphelper/source/misc/documentiologring.cxx  |   12 +-
 main/comphelper/source/misc/documentiologring.hxx  |   12 +-
 main/comphelper/source/misc/evtlistenerhlp.cxx     |    2 +-
 main/comphelper/source/misc/ihwrapnofilter.cxx     |    7 -
 main/comphelper/source/misc/instancelocker.cxx     |   12 -
 main/comphelper/source/misc/instancelocker.hxx     |   24 +-
 main/comphelper/source/misc/interaction.cxx        |    8 +-
 .../source/misc/legacysingletonfactory.cxx         |   20 +-
 .../source/misc/listenernotification.cxx           |    2 +-
 main/comphelper/source/misc/locale.cxx             |    3 -
 main/comphelper/source/misc/mediadescriptor.cxx    |    2 -
 main/comphelper/source/misc/numberedcollection.cxx |    7 -
 .../source/misc/officerestartmanager.cxx           |    9 +-
 .../source/misc/officerestartmanager.hxx           |   12 +-
 main/comphelper/source/misc/proxyaggregation.cxx   |   18 +-
 main/comphelper/source/misc/servicedecl.cxx        |   20 +-
 main/comphelper/source/misc/serviceinfohelper.cxx  |    6 +-
 main/comphelper/source/misc/storagehelper.cxx      |   15 -
 main/comphelper/source/misc/types.cxx              |    2 +-
 main/comphelper/source/misc/weak.cxx               |    6 +-
 .../officeinstallationdirectories.cxx              |    7 -
 .../officeinstallationdirectories.hxx              |   21 +-
 .../source/processfactory/processfactory.cxx       |    4 +-
 .../source/property/ChainablePropertySet.cxx       |   21 -
 .../source/property/ChainablePropertySetInfo.cxx   |    3 -
 .../source/property/MasterPropertySet.cxx          |   21 -
 .../source/property/MasterPropertySetInfo.cxx      |    3 -
 main/comphelper/source/property/composedprops.cxx  |   34 +-
 .../source/property/genericpropertyset.cxx         |   37 +-
 main/comphelper/source/property/opropertybag.cxx   |   45 +-
 main/comphelper/source/property/opropertybag.hxx   |   51 +-
 main/comphelper/source/property/propagg.cxx        |   32 +-
 .../source/property/propertycontainer.cxx          |    8 +-
 .../source/property/propertycontainerhelper.cxx    |    4 +-
 .../source/property/propertysethelper.cxx          |   38 +-
 .../comphelper/source/property/propertysetinfo.cxx |   10 +-
 .../source/property/propertystatecontainer.cxx     |   16 +-
 main/comphelper/source/property/propmultiplex.cxx  |    6 +-
 main/comphelper/source/property/propstate.cxx      |   18 +-
 main/comphelper/source/streaming/memorystream.cxx  |   56 +-
 .../source/streaming/oslfile2streamwrap.cxx        |   15 +-
 .../source/streaming/otransactedfilestream.cxx     |   32 +-
 main/comphelper/source/streaming/seekableinput.cxx |   25 -
 .../source/streaming/seqinputstreamserv.cxx        |   48 +-
 .../source/streaming/seqoutputstreamserv.cxx       |   28 +-
 main/comphelper/source/streaming/seqstream.cxx     |   20 +-
 main/comphelper/source/xml/attributelist.cxx       |   12 +-
 main/comphelper/source/xml/ofopxmlhelper.cxx       |   13 -
 main/configmgr/qa/unit/test.cxx                    |    8 +-
 main/configmgr/source/access.cxx                   |   96 +-
 main/configmgr/source/access.hxx                   |  216 +---
 main/configmgr/source/childaccess.cxx              |    4 -
 main/configmgr/source/childaccess.hxx              |   14 +-
 main/configmgr/source/components.cxx               |    4 -
 main/configmgr/source/configurationprovider.cxx    |   60 +-
 main/configmgr/source/configurationregistry.cxx    |  267 ++---
 main/configmgr/source/parsemanager.cxx             |    4 +-
 main/configmgr/source/parsemanager.hxx             |    5 +-
 main/configmgr/source/rootaccess.cxx               |    7 +-
 main/configmgr/source/rootaccess.hxx               |   20 +-
 main/configmgr/source/services.cxx                 |    1 -
 main/configmgr/source/update.cxx                   |   16 +-
 main/configure.ac                                  |  506 ++++++++-
 main/connectivity/inc/connectivity/BlobHelper.hxx  |   10 +-
 main/connectivity/inc/connectivity/CommonTools.hxx |   14 +-
 .../inc/connectivity/ConnectionWrapper.hxx         |    6 +-
 main/connectivity/inc/connectivity/PColumn.hxx     |    2 +-
 .../inc/connectivity/ParameterCont.hxx             |    2 +-
 .../inc/connectivity/TColumnsHelper.hxx            |    2 +-
 .../inc/connectivity/TIndexColumns.hxx             |    2 +-
 main/connectivity/inc/connectivity/TIndexes.hxx    |    2 +-
 main/connectivity/inc/connectivity/TKeyColumns.hxx |    2 +-
 main/connectivity/inc/connectivity/TKeys.hxx       |    2 +-
 .../connectivity/inc/connectivity/TTableHelper.hxx |    6 +-
 main/connectivity/inc/connectivity/conncleanup.hxx |   10 +-
 .../connectivity/inc/connectivity/dbconversion.hxx |   10 +-
 main/connectivity/inc/connectivity/dbexception.hxx |   30 +-
 main/connectivity/inc/connectivity/dbtools.hxx     |   23 +-
 main/connectivity/inc/connectivity/parameters.hxx  |    6 +-
 .../connectivity/inc/connectivity/paramwrapper.hxx |   16 +-
 .../inc/connectivity/sdbcx/VCatalog.hxx            |    8 +-
 .../inc/connectivity/sdbcx/VCollection.hxx         |   42 +-
 .../inc/connectivity/sdbcx/VColumn.hxx             |   12 +-
 .../inc/connectivity/sdbcx/VDescriptor.hxx         |    6 +-
 .../connectivity/inc/connectivity/sdbcx/VGroup.hxx |   20 +-
 .../connectivity/inc/connectivity/sdbcx/VIndex.hxx |   14 +-
 main/connectivity/inc/connectivity/sdbcx/VKey.hxx  |   14 +-
 .../connectivity/inc/connectivity/sdbcx/VTable.hxx |   24 +-
 main/connectivity/inc/connectivity/sdbcx/VUser.hxx |   22 +-
 main/connectivity/inc/connectivity/sdbcx/VView.hxx |   10 +-
 .../inc/connectivity/virtualdbtools.hxx            |    8 +-
 .../connectivity/source/commontools/BlobHelper.cxx |   10 +-
 .../source/commontools/ConnectionWrapper.cxx       |   12 +-
 .../source/commontools/DateConversion.cxx          |    4 +-
 .../commontools/FDatabaseMetaDataResultSet.cxx     |  110 +-
 .../FDatabaseMetaDataResultSetMetaData.cxx         |   42 +-
 .../source/commontools/ParamterSubstitution.cxx    |   18 +-
 .../source/commontools/TColumnsHelper.cxx          |    2 +-
 .../source/commontools/TConnection.cxx             |    2 +-
 .../source/commontools/TDatabaseMetaDataBase.cxx   |   60 +-
 .../source/commontools/TIndexColumns.cxx           |    2 +-
 main/connectivity/source/commontools/TIndexes.cxx  |    2 +-
 .../source/commontools/TKeyColumns.cxx             |    2 +-
 main/connectivity/source/commontools/TKeys.cxx     |    2 +-
 .../source/commontools/TPrivilegesResultSet.cxx    |    2 +-
 .../connectivity/source/commontools/TSortIndex.cxx |    4 +
 .../source/commontools/TTableHelper.cxx            |   15 +-
 .../source/commontools/conncleanup.cxx             |   10 +-
 .../source/commontools/dbexception.cxx             |   17 +-
 main/connectivity/source/commontools/dbtools.cxx   |   28 +-
 main/connectivity/source/commontools/dbtools2.cxx  |    4 +-
 .../connectivity/source/commontools/parameters.cxx |    8 +-
 .../source/commontools/paramwrapper.cxx            |   18 +-
 main/connectivity/source/cpool/ZConnectionPool.cxx |    6 +-
 main/connectivity/source/cpool/ZConnectionPool.hxx |    6 +-
 .../source/cpool/ZConnectionWrapper.cxx            |   40 +-
 .../source/cpool/ZConnectionWrapper.hxx            |   38 +-
 main/connectivity/source/cpool/ZDriverWrapper.cxx  |   12 +-
 main/connectivity/source/cpool/ZDriverWrapper.hxx  |   12 +-
 main/connectivity/source/cpool/ZPoolCollection.cxx |   28 +-
 main/connectivity/source/cpool/ZPoolCollection.hxx |   28 +-
 .../source/cpool/ZPooledConnection.cxx             |    4 +-
 .../source/cpool/ZPooledConnection.hxx             |    4 +-
 .../source/drivers/adabas/BColumns.cxx             |    2 +-
 .../source/drivers/adabas/BConnection.cxx          |   10 +-
 .../source/drivers/adabas/BDatabaseMetaData.cxx    |    4 +-
 .../connectivity/source/drivers/adabas/BDriver.cxx |   33 +-
 .../connectivity/source/drivers/adabas/BGroups.cxx |    2 +-
 .../source/drivers/adabas/BIndexColumns.cxx        |    2 +-
 .../source/drivers/adabas/BIndexes.cxx             |    2 +-
 .../source/drivers/adabas/BResultSet.cxx           |   16 +-
 .../source/drivers/adabas/BResultSetMetaData.cxx   |    6 +-
 .../source/drivers/adabas/BStatement.cxx           |    2 +-
 main/connectivity/source/drivers/adabas/BTable.cxx |    6 +-
 .../connectivity/source/drivers/adabas/BTables.cxx |    4 +-
 main/connectivity/source/drivers/adabas/BUser.cxx  |   12 +-
 main/connectivity/source/drivers/adabas/BUsers.cxx |    2 +-
 main/connectivity/source/drivers/adabas/BViews.cxx |    2 +-
 .../source/drivers/ado/ACallableStatement.cxx      |   46 +-
 main/connectivity/source/drivers/ado/AColumn.cxx   |    4 +-
 main/connectivity/source/drivers/ado/AColumns.cxx  |    2 +-
 .../source/drivers/ado/AConnection.cxx             |   48 +-
 .../source/drivers/ado/ADatabaseMetaData.cxx       |  270 ++---
 .../source/drivers/ado/ADatabaseMetaDataImpl.cxx   |   16 +-
 .../drivers/ado/ADatabaseMetaDataResultSet.cxx     |  107 +-
 .../ado/ADatabaseMetaDataResultSetMetaData.cxx     |   26 +-
 main/connectivity/source/drivers/ado/ADriver.cxx   |   27 +-
 main/connectivity/source/drivers/ado/AGroup.cxx    |   12 +-
 main/connectivity/source/drivers/ado/AGroups.cxx   |    2 +-
 main/connectivity/source/drivers/ado/AIndex.cxx    |    4 +-
 main/connectivity/source/drivers/ado/AIndexes.cxx  |    2 +-
 main/connectivity/source/drivers/ado/AKey.cxx      |    4 +-
 main/connectivity/source/drivers/ado/AKeys.cxx     |    2 +-
 .../source/drivers/ado/APreparedStatement.cxx      |   70 +-
 .../connectivity/source/drivers/ado/AResultSet.cxx |  172 ++--
 .../source/drivers/ado/AResultSetMetaData.cxx      |   42 +-
 .../connectivity/source/drivers/ado/AStatement.cxx |   79 +-
 main/connectivity/source/drivers/ado/ATable.cxx    |   12 +-
 main/connectivity/source/drivers/ado/ATables.cxx   |    2 +-
 main/connectivity/source/drivers/ado/AUser.cxx     |   14 +-
 main/connectivity/source/drivers/ado/AUsers.cxx    |    2 +-
 main/connectivity/source/drivers/ado/AView.cxx     |    2 +-
 main/connectivity/source/drivers/ado/AViews.cxx    |    2 +-
 main/connectivity/source/drivers/ado/adoimp.cxx    |    2 +-
 .../source/drivers/calc/CConnection.cxx            |    7 +-
 .../source/drivers/calc/CDatabaseMetaData.cxx      |   15 +-
 main/connectivity/source/drivers/calc/CDriver.cxx  |   11 +-
 .../source/drivers/calc/CResultSet.cxx             |   26 +-
 main/connectivity/source/drivers/calc/CTable.cxx   |    6 +-
 .../connectivity/source/drivers/dbase/DColumns.cxx |    2 +-
 .../source/drivers/dbase/DConnection.cxx           |    8 +-
 .../source/drivers/dbase/DDatabaseMetaData.cxx     |   22 +-
 main/connectivity/source/drivers/dbase/DDriver.cxx |   12 +-
 main/connectivity/source/drivers/dbase/DIndex.cxx  |    2 +-
 .../source/drivers/dbase/DIndexColumns.cxx         |    2 +-
 .../connectivity/source/drivers/dbase/DIndexes.cxx |    2 +-
 .../source/drivers/dbase/DResultSet.cxx            |   26 +-
 main/connectivity/source/drivers/dbase/DTable.cxx  |   14 +-
 main/connectivity/source/drivers/dbase/DTables.cxx |    4 +-
 .../source/drivers/evoab2/NCatalog.cxx             |    2 +-
 .../source/drivers/evoab2/NCatalog.hxx             |    2 +-
 .../source/drivers/evoab2/NColumns.cxx             |    2 +-
 .../source/drivers/evoab2/NColumns.hxx             |    2 +-
 .../source/drivers/evoab2/NConnection.cxx          |   44 +-
 .../source/drivers/evoab2/NConnection.hxx          |   44 +-
 .../source/drivers/evoab2/NDatabaseMetaData.cxx    |  242 ++---
 .../source/drivers/evoab2/NDatabaseMetaData.hxx    |  246 ++---
 .../connectivity/source/drivers/evoab2/NDriver.cxx |   21 +-
 .../connectivity/source/drivers/evoab2/NDriver.hxx |   22 +-
 .../source/drivers/evoab2/NPreparedStatement.cxx   |   68 +-
 .../source/drivers/evoab2/NPreparedStatement.hxx   |   68 +-
 .../source/drivers/evoab2/NResultSet.cxx           |  100 +-
 .../source/drivers/evoab2/NResultSet.hxx           |   94 +-
 .../source/drivers/evoab2/NResultSetMetaData.cxx   |   44 +-
 .../source/drivers/evoab2/NResultSetMetaData.hxx   |   44 +-
 .../source/drivers/evoab2/NStatement.cxx           |   24 +-
 .../source/drivers/evoab2/NStatement.hxx           |   26 +-
 .../connectivity/source/drivers/evoab2/NTables.cxx |    2 +-
 .../connectivity/source/drivers/evoab2/NTables.hxx |    2 +-
 main/connectivity/source/drivers/file/FCatalog.cxx |    4 +-
 main/connectivity/source/drivers/file/FColumns.cxx |    2 +-
 .../source/drivers/file/FConnection.cxx            |   46 +-
 .../source/drivers/file/FDatabaseMetaData.cxx      |  244 ++---
 main/connectivity/source/drivers/file/FDriver.cxx  |   23 +-
 .../source/drivers/file/FPreparedStatement.cxx     |   64 +-
 .../source/drivers/file/FResultSet.cxx             |  150 +--
 .../source/drivers/file/FResultSetMetaData.cxx     |   44 +-
 .../source/drivers/file/FStatement.cxx             |   32 +-
 main/connectivity/source/drivers/file/FTable.cxx   |    4 +-
 main/connectivity/source/drivers/file/FTables.cxx  |    4 +-
 main/connectivity/source/drivers/file/fcomp.cxx    |   14 +-
 .../source/drivers/flat/EConnection.cxx            |   10 +-
 .../source/drivers/flat/EDatabaseMetaData.cxx      |    4 +-
 main/connectivity/source/drivers/flat/EDriver.cxx  |   11 +-
 .../source/drivers/flat/EResultSet.cxx             |   24 +-
 main/connectivity/source/drivers/flat/ETable.cxx   |    6 +-
 .../source/drivers/hsqldb/HCatalog.cxx             |    4 +-
 .../source/drivers/hsqldb/HColumns.cxx             |    2 +-
 .../source/drivers/hsqldb/HConnection.cxx          |   14 +-
 .../connectivity/source/drivers/hsqldb/HDriver.cxx |   38 +-
 .../source/drivers/hsqldb/HStorage.hxx             |   32 +-
 main/connectivity/source/drivers/hsqldb/HTable.cxx |   10 +-
 .../connectivity/source/drivers/hsqldb/HTables.cxx |    2 +-
 .../source/drivers/hsqldb/HTerminateListener.cxx   |    3 -
 .../source/drivers/hsqldb/HTerminateListener.hxx   |    9 +-
 main/connectivity/source/drivers/hsqldb/HUser.cxx  |   12 +-
 main/connectivity/source/drivers/hsqldb/HUsers.cxx |    2 +-
 main/connectivity/source/drivers/hsqldb/HView.cxx  |    2 +-
 main/connectivity/source/drivers/hsqldb/HViews.cxx |    2 +-
 main/connectivity/source/drivers/jdbc/Array.cxx    |   12 +-
 main/connectivity/source/drivers/jdbc/Blob.cxx     |   10 +-
 .../source/drivers/jdbc/CallableStatement.cxx      |   48 +-
 main/connectivity/source/drivers/jdbc/Clob.cxx     |   10 +-
 .../source/drivers/jdbc/DatabaseMetaData.cxx       |  268 ++---
 .../source/drivers/jdbc/InputStream.cxx            |   10 +-
 .../source/drivers/jdbc/JConnection.cxx            |   42 +-
 main/connectivity/source/drivers/jdbc/JDriver.cxx  |   22 +-
 .../source/drivers/jdbc/JStatement.cxx             |   74 +-
 .../source/drivers/jdbc/PreparedStatement.cxx      |   66 +-
 main/connectivity/source/drivers/jdbc/Reader.cxx   |   10 +-
 main/connectivity/source/drivers/jdbc/Ref.cxx      |    2 +-
 .../connectivity/source/drivers/jdbc/ResultSet.cxx |  156 ++-
 .../source/drivers/jdbc/ResultSetMetaData.cxx      |   42 +-
 main/connectivity/source/drivers/jdbc/tools.cxx    |    2 +-
 .../source/drivers/macab/MacabCatalog.cxx          |    2 +-
 .../source/drivers/macab/MacabCatalog.hxx          |    2 +-
 .../source/drivers/macab/MacabColumns.cxx          |    2 +-
 .../source/drivers/macab/MacabColumns.hxx          |    2 +-
 .../source/drivers/macab/MacabConnection.cxx       |   44 +-
 .../source/drivers/macab/MacabConnection.hxx       |   46 +-
 .../source/drivers/macab/MacabDatabaseMetaData.cxx |  298 +++---
 .../source/drivers/macab/MacabDatabaseMetaData.hxx |  298 +++---
 .../source/drivers/macab/MacabDriver.cxx           |   27 +-
 .../source/drivers/macab/MacabDriver.hxx           |   28 +-
 .../drivers/macab/MacabPreparedStatement.cxx       |   68 +-
 .../drivers/macab/MacabPreparedStatement.hxx       |   68 +-
 .../source/drivers/macab/MacabResultSet.cxx        |  156 ++-
 .../source/drivers/macab/MacabResultSet.hxx        |  160 ++-
 .../drivers/macab/MacabResultSetMetaData.cxx       |   44 +-
 .../drivers/macab/MacabResultSetMetaData.hxx       |   44 +-
 .../source/drivers/macab/MacabStatement.cxx        |   40 +-
 .../source/drivers/macab/MacabStatement.hxx        |   40 +-
 .../source/drivers/macab/MacabTables.cxx           |    2 +-
 .../source/drivers/macab/MacabTables.hxx           |    2 +-
 .../source/drivers/macab/macabcondition.cxx        |   14 +-
 .../source/drivers/macab/macabcondition.hxx        |   14 +-
 .../connectivity/source/drivers/mysql/YCatalog.cxx |    4 +-
 .../connectivity/source/drivers/mysql/YColumns.cxx |    2 +-
 main/connectivity/source/drivers/mysql/YDriver.cxx |   26 +-
 main/connectivity/source/drivers/mysql/YTable.cxx  |    4 +-
 main/connectivity/source/drivers/mysql/YTables.cxx |    2 +-
 main/connectivity/source/drivers/mysql/YUser.cxx   |   12 +-
 main/connectivity/source/drivers/mysql/YUsers.cxx  |    2 +-
 main/connectivity/source/drivers/mysql/YViews.cxx  |    2 +-
 .../source/drivers/odbc/ORealDriver.cxx            |    2 +-
 .../source/drivers/odbc/ORealDriver.hxx            |    3 +-
 .../source/drivers/odbcbase/OConnection.cxx        |   46 +-
 .../source/drivers/odbcbase/ODatabaseMetaData.cxx  |  268 ++---
 .../odbcbase/ODatabaseMetaDataResultSet.cxx        |  137 ++-
 .../source/drivers/odbcbase/ODriver.cxx            |   19 +-
 .../source/drivers/odbcbase/OPreparedStatement.cxx |   75 +-
 .../source/drivers/odbcbase/OResultSet.cxx         |  164 ++-
 .../source/drivers/odbcbase/OResultSetMetaData.cxx |   49 +-
 .../source/drivers/odbcbase/OStatement.cxx         |   55 +-
 .../source/drivers/odbcbase/OTools.cxx             |   21 +-
 .../source/inc/FDatabaseMetaDataResultSet.hxx      |  108 +-
 .../inc/FDatabaseMetaDataResultSetMetaData.hxx     |   42 +-
 .../source/inc/ParameterSubstitution.hxx           |   18 +-
 main/connectivity/source/inc/TConnection.hxx       |    2 +-
 .../source/inc/TDatabaseMetaDataBase.hxx           |   64 +-
 .../source/inc/TPrivilegesResultSet.hxx            |    2 +-
 main/connectivity/source/inc/adabas/BColumns.hxx   |    2 +-
 .../connectivity/source/inc/adabas/BConnection.hxx |   10 +-
 .../source/inc/adabas/BDatabaseMetaData.hxx        |    4 +-
 main/connectivity/source/inc/adabas/BDriver.hxx    |   28 +-
 main/connectivity/source/inc/adabas/BGroups.hxx    |    2 +-
 .../source/inc/adabas/BIndexColumns.hxx            |    2 +-
 main/connectivity/source/inc/adabas/BIndexes.hxx   |    2 +-
 main/connectivity/source/inc/adabas/BResultSet.hxx |   16 +-
 .../source/inc/adabas/BResultSetMetaData.hxx       |    6 +-
 main/connectivity/source/inc/adabas/BStatement.hxx |    2 +-
 main/connectivity/source/inc/adabas/BTable.hxx     |    6 +-
 main/connectivity/source/inc/adabas/BTables.hxx    |    4 +-
 main/connectivity/source/inc/adabas/BUser.hxx      |   12 +-
 main/connectivity/source/inc/adabas/BUsers.hxx     |    2 +-
 main/connectivity/source/inc/adabas/BViews.hxx     |    2 +-
 .../source/inc/ado/ACallableStatement.hxx          |   46 +-
 main/connectivity/source/inc/ado/ACollection.hxx   |   20 +-
 main/connectivity/source/inc/ado/AColumn.hxx       |    5 +-
 main/connectivity/source/inc/ado/AColumns.hxx      |    2 +-
 main/connectivity/source/inc/ado/AConnection.hxx   |   50 +-
 .../source/inc/ado/ADatabaseMetaData.hxx           |  270 ++---
 .../source/inc/ado/ADatabaseMetaDataResultSet.hxx  |  118 ++-
 .../inc/ado/ADatabaseMetaDataResultSetMetaData.hxx |   42 +-
 main/connectivity/source/inc/ado/ADriver.hxx       |   26 +-
 main/connectivity/source/inc/ado/AGroup.hxx        |   12 +-
 main/connectivity/source/inc/ado/AGroups.hxx       |    2 +-
 main/connectivity/source/inc/ado/AIndex.hxx        |    4 +-
 main/connectivity/source/inc/ado/AIndexes.hxx      |    2 +-
 main/connectivity/source/inc/ado/AKey.hxx          |    4 +-
 main/connectivity/source/inc/ado/AKeys.hxx         |    2 +-
 .../source/inc/ado/APreparedStatement.hxx          |   71 +-
 main/connectivity/source/inc/ado/AResultSet.hxx    |  184 ++--
 .../source/inc/ado/AResultSetMetaData.hxx          |   42 +-
 main/connectivity/source/inc/ado/AStatement.hxx    |   86 +-
 main/connectivity/source/inc/ado/ATable.hxx        |   14 +-
 main/connectivity/source/inc/ado/ATables.hxx       |    4 +-
 main/connectivity/source/inc/ado/AUser.hxx         |   15 +-
 main/connectivity/source/inc/ado/AUsers.hxx        |    2 +-
 main/connectivity/source/inc/ado/AView.hxx         |    2 +-
 main/connectivity/source/inc/ado/AViews.hxx        |    4 +-
 main/connectivity/source/inc/ado/Awrapado.hxx      |   23 +
 main/connectivity/source/inc/ado/Awrapadox.hxx     |   23 +
 main/connectivity/source/inc/ado/WrapColumn.hxx    |   23 +
 main/connectivity/source/inc/ado/adoimp.hxx        |    4 +-
 main/connectivity/source/inc/calc/CConnection.hxx  |   11 +-
 .../source/inc/calc/CDatabaseMetaData.hxx          |   16 +-
 main/connectivity/source/inc/calc/CDriver.hxx      |   15 +-
 main/connectivity/source/inc/calc/CResultSet.hxx   |   20 +-
 main/connectivity/source/inc/calc/CTable.hxx       |    6 +-
 main/connectivity/source/inc/dbase/DColumns.hxx    |    2 +-
 main/connectivity/source/inc/dbase/DConnection.hxx |    8 +-
 .../source/inc/dbase/DDatabaseMetaData.hxx         |   26 +-
 .../inc/dbase/DDatabaseMetaDataResultSet.hxx       |   94 +-
 .../dbase/DDatabaseMetaDataResultSetMetaData.hxx   |   42 +-
 main/connectivity/source/inc/dbase/DDriver.hxx     |   12 +-
 main/connectivity/source/inc/dbase/DIndex.hxx      |    2 +-
 .../source/inc/dbase/DIndexColumns.hxx             |    2 +-
 main/connectivity/source/inc/dbase/DIndexes.hxx    |    2 +-
 main/connectivity/source/inc/dbase/DResultSet.hxx  |   20 +-
 main/connectivity/source/inc/dbase/DTable.hxx      |   14 +-
 main/connectivity/source/inc/dbase/DTables.hxx     |    4 +-
 main/connectivity/source/inc/file/FCatalog.hxx     |    4 +-
 main/connectivity/source/inc/file/FColumns.hxx     |    2 +-
 main/connectivity/source/inc/file/FConnection.hxx  |   48 +-
 .../source/inc/file/FDatabaseMetaData.hxx          |  244 ++---
 main/connectivity/source/inc/file/FDriver.hxx      |   24 +-
 .../source/inc/file/FPreparedStatement.hxx         |   64 +-
 main/connectivity/source/inc/file/FResultSet.hxx   |  150 +--
 .../source/inc/file/FResultSetMetaData.hxx         |   44 +-
 main/connectivity/source/inc/file/FStatement.hxx   |   32 +-
 main/connectivity/source/inc/file/FTable.hxx       |    4 +-
 main/connectivity/source/inc/file/FTables.hxx      |    4 +-
 main/connectivity/source/inc/file/fcomp.hxx        |   14 +-
 main/connectivity/source/inc/flat/EConnection.hxx  |   10 +-
 .../source/inc/flat/EDatabaseMetaData.hxx          |    4 +-
 main/connectivity/source/inc/flat/EDriver.hxx      |   12 +-
 main/connectivity/source/inc/flat/EResultSet.hxx   |   18 +-
 main/connectivity/source/inc/flat/ETable.hxx       |    6 +-
 main/connectivity/source/inc/hsqldb/HCatalog.hxx   |    4 +-
 main/connectivity/source/inc/hsqldb/HColumns.hxx   |    2 +-
 .../connectivity/source/inc/hsqldb/HConnection.hxx |   10 +-
 main/connectivity/source/inc/hsqldb/HDriver.hxx    |   32 +-
 main/connectivity/source/inc/hsqldb/HTable.hxx     |   10 +-
 main/connectivity/source/inc/hsqldb/HTables.hxx    |    2 +-
 main/connectivity/source/inc/hsqldb/HUser.hxx      |   12 +-
 main/connectivity/source/inc/hsqldb/HUsers.hxx     |    2 +-
 main/connectivity/source/inc/hsqldb/HView.hxx      |    2 +-
 main/connectivity/source/inc/hsqldb/HViews.hxx     |    2 +-
 .../source/inc/java/io/InputStream.hxx             |   10 +-
 main/connectivity/source/inc/java/io/Reader.hxx    |   10 +-
 main/connectivity/source/inc/java/sql/Array.hxx    |   12 +-
 main/connectivity/source/inc/java/sql/Blob.hxx     |   10 +-
 .../source/inc/java/sql/CallableStatement.hxx      |   48 +-
 main/connectivity/source/inc/java/sql/Clob.hxx     |   10 +-
 .../source/inc/java/sql/Connection.hxx             |   42 +-
 .../source/inc/java/sql/DatabaseMetaData.hxx       |  268 ++---
 main/connectivity/source/inc/java/sql/Driver.hxx   |   22 +-
 .../source/inc/java/sql/JStatement.hxx             |   78 +-
 .../source/inc/java/sql/PreparedStatement.hxx      |   66 +-
 main/connectivity/source/inc/java/sql/Ref.hxx      |    2 +-
 .../connectivity/source/inc/java/sql/ResultSet.hxx |  160 ++-
 .../source/inc/java/sql/ResultSetMetaData.hxx      |   42 +-
 main/connectivity/source/inc/java/tools.hxx        |    2 +-
 main/connectivity/source/inc/mysql/YCatalog.hxx    |    4 +-
 main/connectivity/source/inc/mysql/YColumns.hxx    |    2 +-
 main/connectivity/source/inc/mysql/YDriver.hxx     |   20 +-
 main/connectivity/source/inc/mysql/YTable.hxx      |    4 +-
 main/connectivity/source/inc/mysql/YTables.hxx     |    2 +-
 main/connectivity/source/inc/mysql/YUser.hxx       |   12 +-
 main/connectivity/source/inc/mysql/YUsers.hxx      |    2 +-
 main/connectivity/source/inc/mysql/YViews.hxx      |    2 +-
 main/connectivity/source/inc/odbc/OConnection.hxx  |   48 +-
 .../source/inc/odbc/ODatabaseMetaData.hxx          |  276 ++---
 .../source/inc/odbc/ODatabaseMetaDataResultSet.hxx |  147 ++-
 main/connectivity/source/inc/odbc/ODriver.hxx      |   20 +-
 .../source/inc/odbc/OPreparedStatement.hxx         |   77 +-
 main/connectivity/source/inc/odbc/OResultSet.hxx   |  162 ++-
 .../source/inc/odbc/OResultSetMetaData.hxx         |   51 +-
 main/connectivity/source/inc/odbc/OStatement.hxx   |   58 +-
 main/connectivity/source/inc/odbc/OTools.hxx       |   27 +-
 .../connectivity/source/manager/mdrivermanager.cxx |   45 +-
 .../connectivity/source/manager/mdrivermanager.hxx |   34 +-
 main/connectivity/source/parse/PColumn.cxx         |    2 +-
 main/connectivity/source/parse/sqliterator.cxx     |    1 +
 main/connectivity/source/sdbcx/VCatalog.cxx        |    8 +-
 main/connectivity/source/sdbcx/VCollection.cxx     |   40 +-
 main/connectivity/source/sdbcx/VColumn.cxx         |   18 +-
 main/connectivity/source/sdbcx/VDescriptor.cxx     |    6 +-
 main/connectivity/source/sdbcx/VGroup.cxx          |   20 +-
 main/connectivity/source/sdbcx/VIndex.cxx          |   20 +-
 main/connectivity/source/sdbcx/VIndexColumn.cxx    |    6 +-
 main/connectivity/source/sdbcx/VKey.cxx            |   20 +-
 main/connectivity/source/sdbcx/VKeyColumn.cxx      |    6 +-
 main/connectivity/source/sdbcx/VTable.cxx          |   30 +-
 main/connectivity/source/sdbcx/VUser.cxx           |   22 +-
 main/connectivity/source/sdbcx/VView.cxx           |   10 +-
 .../source/simpledbt/staticdbtools_s.cxx           |    5 +-
 .../source/simpledbt/staticdbtools_s.hxx           |    8 +-
 main/connectivity/workben/iniParser/main.cxx       |    2 +-
 main/connectivity/workben/skeleton/SResultSet.hxx  |  180 ++--
 main/cppu/inc/com/sun/star/uno/Reference.h         |   47 +-
 main/cppu/inc/com/sun/star/uno/Reference.hxx       |   40 +-
 main/cppu/inc/cppu/FreeReference.hxx               |   10 +-
 main/cppu/qa/test_any.cxx                          |    3 -
 main/cppu/qa/test_reference.cxx                    |    1 -
 main/cppuhelper/inc/cppuhelper/access_control.hxx  |   18 +-
 main/cppuhelper/inc/cppuhelper/bootstrap.hxx       |    7 +-
 main/cppuhelper/inc/cppuhelper/compbase.hxx        |   14 +-
 main/cppuhelper/inc/cppuhelper/compbase1.hxx       |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase10.hxx      |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase11.hxx      |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase12.hxx      |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase2.hxx       |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase3.hxx       |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase4.hxx       |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase5.hxx       |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase6.hxx       |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase7.hxx       |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase8.hxx       |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase9.hxx       |   20 +-
 main/cppuhelper/inc/cppuhelper/compbase_ex.hxx     |   39 +-
 main/cppuhelper/inc/cppuhelper/component.hxx       |   23 +-
 main/cppuhelper/inc/cppuhelper/exc_hlp.hxx         |    3 +-
 main/cppuhelper/inc/cppuhelper/factory.hxx         |    3 +-
 main/cppuhelper/inc/cppuhelper/implbase.hxx        |   20 +-
 main/cppuhelper/inc/cppuhelper/implbase1.hxx       |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase10.hxx      |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase11.hxx      |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase12.hxx      |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase2.hxx       |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase3.hxx       |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase4.hxx       |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase5.hxx       |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase6.hxx       |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase7.hxx       |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase8.hxx       |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase9.hxx       |   34 +-
 main/cppuhelper/inc/cppuhelper/implbase_ex.hxx     |   27 +-
 .../cppuhelper/inc/cppuhelper/implbase_ex_post.hxx |   48 +-
 .../cppuhelper/inc/cppuhelper/propertysetmixin.hxx |   67 +-
 main/cppuhelper/inc/cppuhelper/propshlp.hxx        |   60 +-
 main/cppuhelper/inc/cppuhelper/proptypehlp.h       |   30 +-
 main/cppuhelper/inc/cppuhelper/proptypehlp.hxx     |   11 -
 main/cppuhelper/inc/cppuhelper/servicefactory.hxx  |    5 +-
 main/cppuhelper/inc/cppuhelper/shlib.hxx           |    6 +-
 main/cppuhelper/inc/cppuhelper/weak.hxx            |   11 +-
 main/cppuhelper/inc/cppuhelper/weakagg.hxx         |   14 +-
 .../cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx |    1 -
 .../qa/propertysetmixin/comp_propertysetmixin.cxx  |   67 +-
 .../qa/propertysetmixin/test_propertysetmixin.cxx  |    4 -
 main/cppuhelper/qa/weak/test_weak.cxx              |    2 +-
 main/cppuhelper/source/access_control.cxx          |    7 -
 main/cppuhelper/source/bootstrap.cxx               |   11 +-
 main/cppuhelper/source/component.cxx               |   11 +-
 main/cppuhelper/source/component_context.cxx       |   62 +-
 main/cppuhelper/source/exc_thrower.cxx             |   14 +-
 main/cppuhelper/source/factory.cxx                 |  149 +--
 main/cppuhelper/source/implbase.cxx                |    9 -
 main/cppuhelper/source/implbase_ex.cxx             |   17 -
 main/cppuhelper/source/macro_expander.cxx          |   17 +-
 main/cppuhelper/source/propertysetmixin.cxx        |   48 +-
 main/cppuhelper/source/propshlp.cxx                |   43 +-
 main/cppuhelper/source/servicefactory.cxx          |    9 +-
 main/cppuhelper/source/shlib.cxx                   |    2 -
 main/cppuhelper/source/stdidlclass.cxx             |   45 +-
 main/cppuhelper/source/tdmgr.cxx                   |    4 +-
 main/cppuhelper/source/weak.cxx                    |   37 +-
 main/cppuhelper/test/cfg_test.cxx                  |   20 +-
 main/cppuhelper/test/loader/loader.test.cxx        |   58 +-
 main/cppuhelper/test/testcmp/TestComponent.cxx     |   19 +-
 main/cppuhelper/test/testcontainer.cxx             |    3 +-
 main/cppuhelper/test/testimplhelper.cxx            |   80 +-
 main/cppuhelper/test/testpropshlp.cxx              |   29 +-
 .../source/registercomponent/registercomponent.cxx |    3 +-
 main/cpputools/source/unoexe/unoexe.cxx            |   16 +-
 main/cui/source/customize/macropg.cxx              |    1 +
 main/cui/source/dialogs/colorpicker.cxx            |   36 +-
 main/cui/source/dialogs/thesdlg.cxx                |    1 -
 main/cui/source/dialogs/thesdlg_impl.hxx           |    2 +-
 main/cui/source/uno/services/services.cxx          |    4 +-
 main/dbaccess/inc/IController.hxx                  |    2 +-
 main/dbaccess/inc/dbaundomanager.hxx               |   44 +-
 main/dbaccess/inc/dbsubcomponentcontroller.hxx     |   22 +-
 main/dbaccess/inc/genericcontroller.hxx            |   80 +-
 main/dbaccess/source/core/api/BookmarkSet.cxx      |   26 +-
 main/dbaccess/source/core/api/BookmarkSet.hxx      |   26 +-
 main/dbaccess/source/core/api/CRowSetColumn.cxx    |    2 +-
 main/dbaccess/source/core/api/CRowSetColumn.hxx    |    2 +-
 .../dbaccess/source/core/api/CRowSetDataColumn.cxx |    8 +-
 .../dbaccess/source/core/api/CRowSetDataColumn.hxx |    8 +-
 main/dbaccess/source/core/api/CacheSet.cxx         |   84 +-
 main/dbaccess/source/core/api/CacheSet.hxx         |  104 +-
 .../dbaccess/source/core/api/FilteredContainer.cxx |    2 +-
 .../dbaccess/source/core/api/HelperCollections.hxx |    4 +-
 main/dbaccess/source/core/api/KeySet.cxx           |  100 +-
 main/dbaccess/source/core/api/KeySet.hxx           |  104 +-
 main/dbaccess/source/core/api/OptimisticSet.cxx    |    8 +-
 main/dbaccess/source/core/api/OptimisticSet.hxx    |    8 +-
 main/dbaccess/source/core/api/PrivateRow.cxx       |   40 +-
 main/dbaccess/source/core/api/PrivateRow.hxx       |   40 +-
 main/dbaccess/source/core/api/RowSet.cxx           |  218 ++--
 main/dbaccess/source/core/api/RowSet.hxx           |  222 ++--
 main/dbaccess/source/core/api/RowSetBase.cxx       |  108 +-
 main/dbaccess/source/core/api/RowSetBase.hxx       |  112 +-
 .../source/core/api/SingleSelectQueryComposer.cxx  |   56 +-
 main/dbaccess/source/core/api/StaticSet.cxx        |   60 +-
 main/dbaccess/source/core/api/StaticSet.hxx        |   60 +-
 main/dbaccess/source/core/api/TableDeco.cxx        |   33 +-
 main/dbaccess/source/core/api/View.cxx             |    6 +-
 main/dbaccess/source/core/api/WrappedResultSet.cxx |   26 +-
 main/dbaccess/source/core/api/WrappedResultSet.hxx |   26 +-
 .../dbaccess/source/core/api/callablestatement.cxx |   54 +-
 main/dbaccess/source/core/api/column.cxx           |   30 +-
 main/dbaccess/source/core/api/datacolumn.cxx       |   84 +-
 main/dbaccess/source/core/api/datacolumn.hxx       |   84 +-
 main/dbaccess/source/core/api/definitioncolumn.cxx |   31 +-
 .../dbaccess/source/core/api/preparedstatement.cxx |   70 +-
 main/dbaccess/source/core/api/query.cxx            |   12 +-
 main/dbaccess/source/core/api/query.hxx            |   13 +-
 main/dbaccess/source/core/api/querycomposer.cxx    |   40 +-
 main/dbaccess/source/core/api/querycontainer.cxx   |   28 +-
 main/dbaccess/source/core/api/querydescriptor.cxx  |   12 +-
 main/dbaccess/source/core/api/querydescriptor.hxx  |   12 +-
 main/dbaccess/source/core/api/resultcolumn.cxx     |    6 +-
 main/dbaccess/source/core/api/resultcolumn.hxx     |    6 +-
 main/dbaccess/source/core/api/resultset.cxx        |  164 +--
 main/dbaccess/source/core/api/resultset.hxx        |  166 ++-
 main/dbaccess/source/core/api/statement.cxx        |   52 +-
 main/dbaccess/source/core/api/table.cxx            |   15 +-
 main/dbaccess/source/core/api/tablecontainer.cxx   |    8 +-
 main/dbaccess/source/core/api/viewcontainer.cxx    |    8 +-
 .../source/core/dataaccess/ComponentDefinition.cxx |   18 +-
 .../source/core/dataaccess/ComponentDefinition.hxx |   14 +-
 .../source/core/dataaccess/ContentHelper.cxx       |   32 +-
 main/dbaccess/source/core/dataaccess/ModelImpl.cxx |   36 +-
 main/dbaccess/source/core/dataaccess/ModelImpl.hxx |    5 +-
 .../source/core/dataaccess/SharedConnection.cxx    |   26 +-
 .../source/core/dataaccess/SharedConnection.hxx    |   44 +-
 .../source/core/dataaccess/bookmarkcontainer.cxx   |   38 +-
 .../source/core/dataaccess/bookmarkcontainer.hxx   |   38 +-
 .../source/core/dataaccess/commandcontainer.cxx    |    4 +-
 .../source/core/dataaccess/commandcontainer.hxx    |    4 +-
 .../source/core/dataaccess/commanddefinition.cxx   |   10 +-
 .../source/core/dataaccess/commanddefinition.hxx   |   10 +-
 .../dbaccess/source/core/dataaccess/connection.cxx |   93 +-
 .../dbaccess/source/core/dataaccess/connection.hxx |   94 +-
 .../core/dataaccess/dataaccessdescriptor.cxx       |   40 +-
 .../source/core/dataaccess/databasecontext.cxx     |   69 +-
 .../source/core/dataaccess/databasecontext.hxx     |   56 +-
 .../source/core/dataaccess/databasedocument.cxx    |  156 ++-
 .../source/core/dataaccess/databasedocument.hxx    |  162 ++-
 .../core/dataaccess/databaseregistrations.cxx      |   36 +-
 .../dbaccess/source/core/dataaccess/datasource.cxx |   99 +-
 .../dbaccess/source/core/dataaccess/datasource.hxx |   64 +-
 .../source/core/dataaccess/definitioncontainer.cxx |   42 +-
 .../source/core/dataaccess/documentcontainer.cxx   |   34 +-
 .../source/core/dataaccess/documentcontainer.hxx   |   34 +-
 .../source/core/dataaccess/documentdefinition.cxx  |   55 +-
 .../source/core/dataaccess/documentdefinition.hxx  |   28 +-
 .../core/dataaccess/documenteventexecutor.cxx      |    4 +-
 .../core/dataaccess/documenteventexecutor.hxx      |    4 +-
 .../source/core/dataaccess/documentevents.cxx      |   12 +-
 .../source/core/dataaccess/documentevents.hxx      |   12 +-
 main/dbaccess/source/core/dataaccess/intercept.cxx |   27 +-
 main/dbaccess/source/core/dataaccess/intercept.hxx |   54 +-
 .../source/core/dataaccess/myucp_datasupplier.cxx  |    1 -
 .../source/core/dataaccess/myucp_datasupplier.hxx  |    3 +-
 .../dbaccess/source/core/inc/ContainerListener.hxx |   14 +-
 .../dbaccess/source/core/inc/ContainerMediator.hxx |    8 +-
 main/dbaccess/source/core/inc/ContentHelper.hxx    |   40 +-
 .../source/core/inc/DatabaseDataProvider.hxx       |  216 ++--
 .../dbaccess/source/core/inc/FilteredContainer.hxx |    2 +-
 main/dbaccess/source/core/inc/PropertyForward.hxx  |    4 +-
 .../source/core/inc/SingleSelectQueryComposer.hxx  |   56 +-
 main/dbaccess/source/core/inc/TableDeco.hxx        |   37 +-
 main/dbaccess/source/core/inc/View.hxx             |    2 +-
 .../dbaccess/source/core/inc/callablestatement.hxx |   54 +-
 main/dbaccess/source/core/inc/column.hxx           |   34 +-
 main/dbaccess/source/core/inc/definitioncolumn.hxx |   46 +-
 .../source/core/inc/definitioncontainer.hxx        |   42 +-
 .../dbaccess/source/core/inc/preparedstatement.hxx |   70 +-
 main/dbaccess/source/core/inc/querycomposer.hxx    |   41 +-
 main/dbaccess/source/core/inc/querycontainer.hxx   |   28 +-
 main/dbaccess/source/core/inc/sdbcoretools.hxx     |    6 +-
 main/dbaccess/source/core/inc/statement.hxx        |   54 +-
 main/dbaccess/source/core/inc/table.hxx            |   16 +-
 main/dbaccess/source/core/inc/tablecontainer.hxx   |    8 +-
 main/dbaccess/source/core/inc/veto.hxx             |    4 +-
 main/dbaccess/source/core/inc/viewcontainer.hxx    |    8 +-
 .../source/core/misc/ContainerListener.cxx         |   14 +-
 .../source/core/misc/ContainerMediator.cxx         |    8 +-
 .../source/core/misc/DatabaseDataProvider.cxx      |  216 ++--
 main/dbaccess/source/core/misc/PropertyForward.cxx |    4 +-
 main/dbaccess/source/core/misc/apitools.cxx        |    4 +-
 main/dbaccess/source/core/misc/sdbcoretools.cxx    |    2 +-
 main/dbaccess/source/core/misc/veto.cxx            |    4 +-
 .../source/core/recovery/subcomponentloader.cxx    |   10 +-
 .../source/core/recovery/subcomponentloader.hxx    |   10 +-
 .../source/core/recovery/subcomponentrecovery.cxx  |   32 +-
 main/dbaccess/source/ext/adabas/ANewDb.cxx         |   12 +-
 main/dbaccess/source/ext/adabas/ANewDb.hxx         |   12 +-
 .../ext/macromigration/macromigrationwizard.cxx    |   28 +-
 .../source/ext/macromigration/migrationengine.cxx  |    1 +
 .../source/ext/macromigration/progresscapture.cxx  |   10 +-
 .../source/ext/macromigration/progresscapture.hxx  |   10 +-
 main/dbaccess/source/filter/xml/dbloader2.cxx      |    8 +-
 main/dbaccess/source/filter/xml/xmlExport.cxx      |   19 +-
 main/dbaccess/source/filter/xml/xmlExport.hxx      |    2 +-
 main/dbaccess/source/filter/xml/xmlfilter.cxx      |    6 +-
 main/dbaccess/source/filter/xml/xmlfilter.hxx      |    4 +-
 .../source/inc/OAuthenticationContinuation.hxx     |   24 +-
 main/dbaccess/source/inc/apitools.hxx              |   55 +-
 .../source/sdbtools/connection/connectiontools.cxx |   18 +-
 .../source/sdbtools/connection/connectiontools.hxx |   18 +-
 .../sdbtools/connection/datasourcemetadata.cxx     |    2 +-
 .../sdbtools/connection/datasourcemetadata.hxx     |    2 +-
 .../source/sdbtools/connection/objectnames.cxx     |   10 +-
 .../source/sdbtools/connection/objectnames.hxx     |   10 +-
 .../source/sdbtools/connection/tablename.cxx       |   22 +-
 .../source/sdbtools/connection/tablename.hxx       |   22 +-
 main/dbaccess/source/ui/app/AppController.cxx      |   34 +-
 main/dbaccess/source/ui/app/AppController.hxx      |   64 +-
 main/dbaccess/source/ui/app/AppControllerDnD.cxx   |    1 +
 main/dbaccess/source/ui/app/AppControllerGen.cxx   |   32 +-
 main/dbaccess/source/ui/app/closeveto.cxx          |   12 +-
 .../dbaccess/source/ui/app/subcomponentmanager.cxx |    4 +-
 .../dbaccess/source/ui/app/subcomponentmanager.hxx |    4 +-
 main/dbaccess/source/ui/browser/brwctrlr.cxx       |  274 ++---
 main/dbaccess/source/ui/browser/dbexchange.cxx     |    2 +-
 main/dbaccess/source/ui/browser/dbloader.cxx       |    4 +-
 main/dbaccess/source/ui/browser/exsrcbrw.cxx       |   24 +-
 main/dbaccess/source/ui/browser/formadapter.cxx    |  324 +++---
 .../source/ui/browser/genericcontroller.cxx        |   70 +-
 main/dbaccess/source/ui/browser/sbagrid.cxx        |   36 +-
 main/dbaccess/source/ui/browser/sbamultiplex.cxx   |    4 +-
 main/dbaccess/source/ui/browser/unodatbr.cxx       |   52 +-
 main/dbaccess/source/ui/control/dbtreelistbox.cxx  |   16 +-
 main/dbaccess/source/ui/control/tabletree.cxx      |    2 +-
 .../source/ui/control/toolboxcontroller.cxx        |    8 +-
 main/dbaccess/source/ui/dlg/DbAdminImpl.cxx        |    1 +
 main/dbaccess/source/ui/dlg/adtabdlg.cxx           |   24 +-
 main/dbaccess/source/ui/dlg/dbwizsetup.cxx         |   12 +-
 main/dbaccess/source/ui/dlg/finteraction.cxx       |    2 +-
 main/dbaccess/source/ui/dlg/finteraction.hxx       |    2 +-
 .../source/ui/inc/ConnectionLineAccess.hxx         |   48 +-
 main/dbaccess/source/ui/inc/JAccess.hxx            |   12 +-
 main/dbaccess/source/ui/inc/JoinController.hxx     |    4 +-
 main/dbaccess/source/ui/inc/JoinExchange.hxx       |    4 +-
 main/dbaccess/source/ui/inc/RelationController.hxx |    8 +-
 main/dbaccess/source/ui/inc/RelationTableView.hxx  |    6 +-
 main/dbaccess/source/ui/inc/TableController.hxx    |   14 +-
 main/dbaccess/source/ui/inc/TableWindow.hxx        |    6 +-
 main/dbaccess/source/ui/inc/TableWindowAccess.hxx  |   38 +-
 main/dbaccess/source/ui/inc/TokenWriter.hxx        |    2 +-
 main/dbaccess/source/ui/inc/brwctrlr.hxx           |   50 +-
 main/dbaccess/source/ui/inc/dbexchange.hxx         |    2 +-
 main/dbaccess/source/ui/inc/exsrcbrw.hxx           |   24 +-
 main/dbaccess/source/ui/inc/formadapter.hxx        |  356 +++----
 main/dbaccess/source/ui/inc/indexcollection.hxx    |   12 +-
 main/dbaccess/source/ui/inc/querycontroller.hxx    |   20 +-
 main/dbaccess/source/ui/inc/sbagrid.hxx            |   36 +-
 main/dbaccess/source/ui/inc/sbamultiplex.hxx       |   32 +-
 .../dbaccess/source/ui/inc/singledoccontroller.hxx |    4 +-
 main/dbaccess/source/ui/inc/tabletree.hxx          |    2 +-
 main/dbaccess/source/ui/inc/toolboxcontroller.hxx  |    8 +-
 main/dbaccess/source/ui/inc/unodatbr.hxx           |   52 +-
 main/dbaccess/source/ui/inc/unosqlmessage.hxx      |   14 +-
 main/dbaccess/source/ui/misc/TokenWriter.cxx       |    2 +-
 main/dbaccess/source/ui/misc/controllerframe.cxx   |   32 +-
 main/dbaccess/source/ui/misc/dbaundomanager.cxx    |   44 +-
 .../source/ui/misc/dbsubcomponentcontroller.cxx    |   21 +-
 main/dbaccess/source/ui/misc/indexcollection.cxx   |   12 +-
 .../source/ui/misc/singledoccontroller.cxx         |    4 +-
 .../source/ui/querydesign/ConnectionLineAccess.cxx |   48 +-
 main/dbaccess/source/ui/querydesign/JAccess.cxx    |   12 +-
 .../source/ui/querydesign/JoinController.cxx       |    4 +-
 .../source/ui/querydesign/JoinExchange.cxx         |    4 +-
 .../dbaccess/source/ui/querydesign/TableWindow.cxx |    6 +-
 .../source/ui/querydesign/TableWindowAccess.cxx    |   38 +-
 .../source/ui/querydesign/querycontroller.cxx      |   28 +-
 .../ui/relationdesign/RelationController.cxx       |    9 +-
 .../source/ui/relationdesign/RelationTableView.cxx |    6 +-
 .../source/ui/tabledesign/TableController.cxx      |   14 +-
 main/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx  |   12 +-
 main/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx  |   12 +-
 .../dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx |   24 +-
 main/dbaccess/source/ui/uno/ColumnControl.cxx      |    2 +-
 main/dbaccess/source/ui/uno/ColumnControl.hxx      |    2 +-
 main/dbaccess/source/ui/uno/ColumnModel.cxx        |   12 +-
 main/dbaccess/source/ui/uno/ColumnModel.hxx        |   10 +-
 main/dbaccess/source/ui/uno/ColumnPeer.cxx         |    4 +-
 main/dbaccess/source/ui/uno/ColumnPeer.hxx         |    4 +-
 main/dbaccess/source/ui/uno/DBTypeWizDlg.cxx       |   12 +-
 main/dbaccess/source/ui/uno/DBTypeWizDlg.hxx       |   12 +-
 main/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx  |   12 +-
 main/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx  |   12 +-
 main/dbaccess/source/ui/uno/TableFilterDlg.cxx     |   12 +-
 main/dbaccess/source/ui/uno/TableFilterDlg.hxx     |   12 +-
 main/dbaccess/source/ui/uno/UserSettingsDlg.cxx    |   12 +-
 main/dbaccess/source/ui/uno/UserSettingsDlg.hxx    |   12 +-
 main/dbaccess/source/ui/uno/admindlg.cxx           |   12 +-
 main/dbaccess/source/ui/uno/admindlg.hxx           |   12 +-
 main/dbaccess/source/ui/uno/copytablewizard.cxx    |   72 +-
 main/dbaccess/source/ui/uno/dbinteraction.cxx      |    4 +-
 main/dbaccess/source/ui/uno/dbinteraction.hxx      |    4 +-
 .../source/ui/uno/textconnectionsettings_uno.cxx   |   10 +-
 main/dbaccess/source/ui/uno/unosqlmessage.cxx      |   14 +-
 main/desktop/source/app/app.cxx                    |    9 +-
 main/desktop/source/app/check_ext_deps.cxx         |   22 +-
 main/desktop/source/app/configinit.cxx             |    8 +-
 main/desktop/source/app/desktopcontext.cxx         |    2 +-
 main/desktop/source/app/desktopcontext.hxx         |    3 +-
 main/desktop/source/app/dispatchwatcher.cxx        |    3 +-
 main/desktop/source/app/dispatchwatcher.hxx        |    5 +-
 main/desktop/source/app/officeipcthread.cxx        |    6 -
 main/desktop/source/app/officeipcthread.hxx        |   18 +-
 main/desktop/source/deployment/dp_log.cxx          |   10 +-
 .../source/deployment/gui/dp_gui_dialog2.cxx       |    4 +-
 .../source/deployment/gui/dp_gui_dialog2.hxx       |    4 +-
 .../deployment/gui/dp_gui_extensioncmdqueue.cxx    |   26 +-
 .../source/deployment/gui/dp_gui_extlistbox.cxx    |    1 -
 .../source/deployment/gui/dp_gui_extlistbox.hxx    |    3 +-
 .../source/deployment/gui/dp_gui_service.cxx       |   13 +-
 .../source/deployment/gui/dp_gui_theextmgr.cxx     |    4 -
 .../source/deployment/gui/dp_gui_theextmgr.hxx     |   12 +-
 .../source/deployment/gui/dp_gui_thread.cxx        |    1 -
 .../source/deployment/gui/dp_gui_thread.hxx        |    2 +-
 .../deployment/gui/dp_gui_updateinstalldialog.cxx  |   22 +-
 .../source/deployment/gui/license_dialog.cxx       |    4 +-
 .../source/deployment/gui/license_dialog.hxx       |    5 +-
 main/desktop/source/deployment/inc/dp_interact.h   |    2 +-
 .../deployment/manager/dp_commandenvironments.cxx  |   11 +-
 .../deployment/manager/dp_commandenvironments.hxx  |   27 +-
 .../deployment/manager/dp_extensionmanager.cxx     |   67 --
 .../deployment/manager/dp_extensionmanager.hxx     |  110 +-
 .../deployment/manager/dp_informationprovider.cxx  |   12 +-
 .../source/deployment/manager/dp_manager.cxx       |   47 +-
 .../desktop/source/deployment/manager/dp_manager.h |   93 +-
 .../source/deployment/manager/dp_managerfac.cxx    |    3 +-
 .../deployment/misc/dp_descriptioninfoset.cxx      |   19 +-
 .../desktop/source/deployment/misc/dp_interact.cxx |   19 +-
 .../desktop/source/deployment/misc/dp_platform.cxx |    3 +
 .../deployment/registry/component/dp_component.cxx |   10 +-
 .../registry/configuration/dp_configuration.cxx    |   10 +-
 .../source/deployment/registry/dp_backend.cxx      |   77 +-
 .../source/deployment/registry/dp_registry.cxx     |   23 +-
 .../registry/executable/dp_executable.cxx          |   10 +-
 .../source/deployment/registry/help/dp_help.cxx    |   15 +-
 .../source/deployment/registry/inc/dp_backend.h    |  139 +--
 .../deployment/registry/package/dp_package.cxx     |  109 +-
 .../deployment/registry/script/dp_script.cxx       |   14 +-
 .../deployment/registry/sfwk/dp_parceldesc.cxx     |    9 -
 .../deployment/registry/sfwk/dp_parceldesc.hxx     |   25 +-
 .../source/deployment/registry/sfwk/dp_sfwk.cxx    |   18 +-
 main/desktop/source/migration/cfgfilter.cxx        |   41 -
 main/desktop/source/migration/cfgfilter.hxx        |   70 +-
 .../migration/services/autocorrmigration.cxx       |    9 +-
 .../migration/services/autocorrmigration.hxx       |   19 +-
 .../source/migration/services/basicmigration.cxx   |    9 +-
 .../source/migration/services/basicmigration.hxx   |   19 +-
 main/desktop/source/migration/services/jvmfwk.cxx  |  122 +--
 .../migration/services/oo3extensionmigration.cxx   |   16 +-
 .../migration/services/oo3extensionmigration.hxx   |   34 +-
 .../migration/services/wordbookmigration.cxx       |    9 +-
 .../migration/services/wordbookmigration.hxx       |   19 +-
 main/desktop/source/offacc/acceptor.cxx            |    5 -
 main/desktop/source/offacc/acceptor.hxx            |   15 +-
 main/desktop/source/pkgchk/unopkg/unopkg_app.cxx   |    8 +-
 .../desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx |   25 +-
 main/desktop/source/so_comp/evaluation.cxx         |   13 +-
 main/desktop/source/so_comp/evaluation.hxx         |   16 +-
 main/desktop/source/so_comp/oemjob.cxx             |   10 +-
 main/desktop/source/so_comp/oemjob.hxx             |   14 +-
 main/desktop/source/splash/firststart.cxx          |   11 +-
 main/desktop/source/splash/firststart.hxx          |   16 +-
 main/desktop/source/splash/splash.cxx              |    6 -
 main/desktop/source/splash/splash.hxx              |   13 +-
 .../test/deployment/active/active_native.cxx       |   24 +-
 main/desktop/test/deployment/boxt/boxt.cxx         |   16 +-
 .../test/deployment/passive/passive_native.cxx     |   24 +-
 main/desktop/util/makefile.mk                      |   36 +-
 main/desktop/win32/source/setup/Resource.h         |    2 +
 main/desktop/win32/source/setup/makefile.mk        |    5 +-
 main/desktop/win32/source/setup/rctmpl.txt         |    2 +
 main/desktop/win32/source/setup/setup.cpp          |  232 ++++-
 main/desktop/win32/source/setup/setup.hxx          |    3 +-
 main/desktop/win32/source/setup/setup.ulf          |    6 +
 main/desktop/win32/source/setup/setup_main.cxx     |    5 +
 .../drawinglayer/primitive2d/baseprimitive2d.hxx   |    4 +-
 .../drawinglayer/primitive3d/baseprimitive3d.hxx   |    4 +-
 .../drawinglayeruno/xprimitive2drenderer.cxx       |   16 +-
 .../source/primitive2d/baseprimitive2d.cxx         |    4 +-
 .../source/primitive3d/baseprimitive3d.cxx         |    4 +-
 main/dtrans/source/cnttype/mcnttfactory.cxx        |    4 -
 main/dtrans/source/cnttype/mcnttfactory.hxx        |   12 +-
 main/dtrans/source/cnttype/mcnttype.cxx            |   14 +-
 main/dtrans/source/cnttype/mcnttype.hxx            |   17 +-
 main/dtrans/source/generic/clipboardmanager.cxx    |    9 -
 main/dtrans/source/generic/clipboardmanager.hxx    |   30 +-
 main/dtrans/source/generic/generic_clipboard.cxx   |   10 -
 main/dtrans/source/generic/generic_clipboard.hxx   |   30 +-
 main/dtrans/source/os2/clipb/Os2Clipboard.cxx      |   19 +-
 main/dtrans/source/os2/clipb/Os2Clipboard.hxx      |   30 +-
 main/dtrans/source/os2/clipb/Os2Transferable.cxx   |    3 -
 main/dtrans/source/os2/clipb/Os2Transferable.hxx   |   12 +-
 main/dtrans/source/os2/dnd/DragSource.cxx          |   19 +-
 main/dtrans/source/os2/dnd/DragSource.hxx          |   25 +-
 main/dtrans/source/os2/dnd/DropTarget.cxx          |   31 +-
 main/dtrans/source/os2/dnd/DropTarget.hxx          |   33 +-
 main/dtrans/source/os2/dnd/OTransferable.cxx       |    3 -
 main/dtrans/source/os2/dnd/OTransferable.hxx       |    9 +-
 main/dtrans/source/test/test_dtrans.cxx            |   21 +-
 main/dtrans/source/win32/clipb/WinClipbImpl.cxx    |   11 +-
 main/dtrans/source/win32/clipb/WinClipbImpl.hxx    |   14 +-
 main/dtrans/source/win32/clipb/WinClipboard.cxx    |   14 +-
 main/dtrans/source/win32/clipb/WinClipboard.hxx    |   28 +-
 main/dtrans/source/win32/dnd/source.cxx            |   17 +-
 main/dtrans/source/win32/dnd/source.hxx            |   17 +-
 main/dtrans/source/win32/dnd/sourcecontext.cxx     |    6 -
 main/dtrans/source/win32/dnd/sourcecontext.hxx     |   18 +-
 main/dtrans/source/win32/dnd/target.cxx            |   21 +-
 main/dtrans/source/win32/dnd/target.hxx            |   23 +-
 main/dtrans/source/win32/dnd/targetdragcontext.cxx |    2 -
 main/dtrans/source/win32/dnd/targetdragcontext.hxx |    6 +-
 main/dtrans/source/win32/dnd/targetdropcontext.cxx |    3 -
 main/dtrans/source/win32/dnd/targetdropcontext.hxx |    9 +-
 main/dtrans/source/win32/dtobj/DOTransferable.cxx  |    4 -
 main/dtrans/source/win32/dtobj/DOTransferable.hxx  |   12 +-
 main/dtrans/source/win32/ftransl/ftransl.cxx       |    5 -
 main/dtrans/source/win32/ftransl/ftransl.hxx       |   15 +-
 main/dtrans/source/win32/workbench/test_wincb.cxx  |   22 +-
 main/dtrans/test/win32/dnd/sourcelistener.cxx      |    6 -
 main/dtrans/test/win32/dnd/sourcelistener.hxx      |   20 +-
 main/dtrans/test/win32/dnd/targetlistener.cxx      |    6 -
 main/dtrans/test/win32/dnd/targetlistener.hxx      |   18 +-
 main/dtrans/test/win32/dnd/transferable.cxx        |    4 -
 main/dtrans/test/win32/dnd/transferable.hxx        |    8 +-
 .../inc/editeng/AccessibleComponentBase.hxx        |   45 +-
 main/editeng/inc/editeng/AccessibleContextBase.hxx |   71 +-
 .../inc/editeng/AccessibleEditableTextPara.hxx     |  146 +--
 main/editeng/inc/editeng/AccessibleImageBullet.hxx |   62 +-
 .../inc/editeng/AccessibleSelectionBase.hxx        |   14 +-
 .../inc/editeng/AccessibleStaticTextBase.hxx       |   50 +-
 .../inc/editeng/AccessibleSvxFindReplaceDialog.hxx |    4 +-
 .../editeng/inc/editeng/UnoForbiddenCharsTable.hxx |   12 +-
 main/editeng/inc/editeng/unofield.hxx              |   42 +-
 main/editeng/inc/editeng/unonrule.hxx              |   26 +-
 main/editeng/inc/editeng/unopracc.hxx              |   18 +-
 main/editeng/inc/editeng/unotext.hxx               |  240 ++---
 .../accessibility/AccessibleComponentBase.cxx      |   15 -
 .../source/accessibility/AccessibleContextBase.cxx |   25 -
 .../accessibility/AccessibleEditableTextPara.cxx   |  144 ++-
 .../source/accessibility/AccessibleHyperlink.cxx   |   18 +-
 .../source/accessibility/AccessibleHyperlink.hxx   |   18 +-
 .../source/accessibility/AccessibleImageBullet.cxx |   62 +-
 .../accessibility/AccessibleSelectionBase.cxx      |   14 +-
 .../accessibility/AccessibleStaticTextBase.cxx     |   56 +-
 main/editeng/source/editeng/eeobj.cxx              |    8 +-
 main/editeng/source/editeng/eeobj.hxx              |    8 +-
 main/editeng/source/editeng/impedit.cxx            |   12 +-
 main/editeng/source/editeng/impedit.hxx            |   12 +-
 main/editeng/source/misc/unolingu.cxx              |   64 +-
 main/editeng/source/uno/UnoForbiddenCharsTable.cxx |    6 -
 main/editeng/source/uno/unofield.cxx               |   28 +-
 main/editeng/source/uno/unonrule.cxx               |   24 +-
 main/editeng/source/uno/unopracc.cxx               |   16 +-
 main/editeng/source/uno/unotext.cxx                |  108 +-
 main/editeng/source/uno/unotext2.cxx               |   58 +-
 main/editeng/source/xml/xmltxtexp.cxx              |   73 +-
 .../source/commonembedding/embedobj.cxx            |   33 +-
 .../source/commonembedding/inplaceobj.cxx          |    8 -
 .../embeddedobj/source/commonembedding/miscobj.cxx |   16 -
 .../source/commonembedding/persistence.cxx         |   43 -
 .../source/commonembedding/specialobject.cxx       |   25 -
 main/embeddedobj/source/commonembedding/visobj.cxx |   14 -
 .../source/commonembedding/xfactory.cxx            |   35 -
 .../source/commonembedding/xfactory.hxx            |   26 +-
 main/embeddedobj/source/general/docholder.cxx      |   16 +-
 main/embeddedobj/source/general/dummyobject.cxx    |   87 --
 main/embeddedobj/source/general/intercept.cxx      |   30 -
 main/embeddedobj/source/general/xcreator.cxx       |   28 -
 main/embeddedobj/source/inc/closepreventer.hxx     |    6 +-
 main/embeddedobj/source/inc/commonembobj.hxx       |  208 +---
 main/embeddedobj/source/inc/docholder.hxx          |   30 +-
 main/embeddedobj/source/inc/dummyobject.hxx        |  165 +--
 main/embeddedobj/source/inc/intercept.hxx          |   54 +-
 main/embeddedobj/source/inc/oleembobj.hxx          |  222 +---
 main/embeddedobj/source/inc/specialobject.hxx      |   41 +-
 main/embeddedobj/source/inc/xcreator.hxx           |   18 +-
 main/embeddedobj/source/msole/closepreventer.cxx   |    3 -
 main/embeddedobj/source/msole/graphconvert.cxx     |    2 +-
 main/embeddedobj/source/msole/mtnotification.hxx   |    3 +-
 main/embeddedobj/source/msole/olecomponent.cxx     |   24 +-
 main/embeddedobj/source/msole/olecomponent.hxx     |   29 +-
 main/embeddedobj/source/msole/oleembed.cxx         |   27 -
 main/embeddedobj/source/msole/olemisc.cxx          |   25 +-
 main/embeddedobj/source/msole/olepersist.cxx       |   52 -
 main/embeddedobj/source/msole/olevisual.cxx        |   15 -
 main/embeddedobj/source/msole/ownview.cxx          |   15 +-
 main/embeddedobj/source/msole/ownview.hxx          |    8 +-
 main/embeddedobj/source/msole/xdialogcreator.cxx   |   11 -
 main/embeddedobj/source/msole/xdialogcreator.hxx   |   10 +-
 main/embeddedobj/source/msole/xolefactory.cxx      |   24 -
 main/embeddedobj/source/msole/xolefactory.hxx      |   16 +-
 .../test/MainThreadExecutor/xexecutor.cxx          |    6 -
 .../test/MainThreadExecutor/xexecutor.hxx          |    8 +-
 main/embeddedobj/test/mtexecutor/bitmapcreator.cxx |    7 -
 main/embeddedobj/test/mtexecutor/bitmapcreator.hxx |   10 +-
 .../test/mtexecutor/mainthreadexecutor.cxx         |    6 -
 .../test/mtexecutor/mainthreadexecutor.hxx         |    8 +-
 main/embedserv/source/embed/docholder.cxx          |   19 -
 main/embedserv/source/embed/intercept.cxx          |   31 -
 main/embedserv/source/embed/register.cxx           |    1 -
 main/embedserv/source/embed/servprov.cxx           |   12 +-
 main/embedserv/source/embed/xwin.cxx               |   62 --
 main/embedserv/source/inc/docholder.hxx            |   39 +-
 main/embedserv/source/inc/intercept.hxx            |   56 +-
 main/embedserv/source/inc/servprov.hxx             |    9 +-
 main/embedserv/source/inc/xwin.hxx                 |  104 +-
 main/embedserv/source/inprocserv/makefile.mk       |    7 +-
 main/eventattacher/source/eventattacher.cxx        |   79 +-
 main/extensions/inc/ucbhelper/ext_content.hxx      |   46 +-
 .../source/abpilot/datasourcehandling.cxx          |    6 +-
 main/extensions/source/abpilot/unodialogabp.cxx    |   18 +-
 main/extensions/source/abpilot/unodialogabp.hxx    |   18 +-
 main/extensions/source/bibliography/bibload.cxx    |   57 +-
 main/extensions/source/bibliography/datman.cxx     |   28 +-
 main/extensions/source/bibliography/datman.hxx     |   30 +-
 main/extensions/source/bibliography/framectr.cxx   |   43 +-
 main/extensions/source/bibliography/framectr.hxx   |   40 +-
 main/extensions/source/bibliography/general.cxx    |   18 +-
 main/extensions/source/bibliography/general.hxx    |    6 +-
 .../source/bibliography/loadlisteneradapter.cxx    |   16 +-
 .../source/bibliography/loadlisteneradapter.hxx    |   16 +-
 main/extensions/source/bibliography/toolbar.cxx    |    9 +-
 main/extensions/source/bibliography/toolbar.hxx    |   18 +-
 main/extensions/source/config/ldap/ldapaccess.cxx  |    7 -
 main/extensions/source/config/ldap/ldapaccess.hxx  |   21 +-
 .../source/config/ldap/ldapuserprofilebe.cxx       |   10 -
 .../source/config/ldap/ldapuserprofilebe.hxx       |   35 +-
 main/extensions/source/dbpilots/unoautopilot.hxx   |   12 +-
 main/extensions/source/dbpilots/unoautopilot.inl   |   12 +-
 main/extensions/source/logging/consolehandler.cxx  |   56 +-
 main/extensions/source/logging/csvformatter.cxx    |   70 +-
 main/extensions/source/logging/filehandler.cxx     |   48 +-
 main/extensions/source/logging/logger.cxx          |   64 +-
 .../source/logging/plaintextformatter.cxx          |   24 +-
 main/extensions/source/logging/sysloghandler.cxx   |   48 +-
 .../source/mozbootstrap/MMozillaBootstrap.cxx      |   36 +-
 .../source/mozbootstrap/MMozillaBootstrap.hxx      |   36 +-
 .../source/mozbootstrap/MNSINIParser.cxx           |    2 +-
 .../source/mozbootstrap/MNSINIParser.hxx           |    2 +-
 .../source/mozbootstrap/MNSProfileDiscover.cxx     |   12 +-
 .../source/mozbootstrap/MNSProfileDiscover.hxx     |   12 +-
 main/extensions/source/ole/oleobjw.cxx             |   14 +-
 main/extensions/source/ole/oleobjw.hxx             |   37 +-
 main/extensions/source/ole/servprov.cxx            |   15 +-
 main/extensions/source/ole/servprov.hxx            |   32 +-
 main/extensions/source/ole/servreg.cxx             |    4 -
 main/extensions/source/ole/unoobjw.cxx             |    2 -
 main/extensions/source/ole/unoobjw.hxx             |    5 +-
 main/extensions/source/oooimprovecore/core.cxx     |   36 +-
 .../source/oooimprovement/corecontroller.cxx       |   10 +-
 .../source/oooimprovement/corecontroller.hxx       |   15 +-
 .../source/oooimprovement/invite_job.cxx           |    8 +-
 .../source/oooimprovement/invite_job.hxx           |   12 +-
 .../source/oooimprovement/onlogrotate_job.cxx      |   13 +-
 .../source/oooimprovement/onlogrotate_job.hxx      |   12 +-
 main/extensions/source/preload/unoautopilot.hxx    |   12 +-
 main/extensions/source/preload/unoautopilot.inl    |   12 +-
 .../source/propctrlr/MasterDetailLinkDialog.cxx    |   12 +-
 .../source/propctrlr/MasterDetailLinkDialog.hxx    |   12 +-
 .../extensions/source/propctrlr/browserlistbox.cxx |   18 +-
 .../extensions/source/propctrlr/browserlistbox.hxx |   12 +-
 .../source/propctrlr/buttonnavigationhandler.cxx   |   20 +-
 .../source/propctrlr/buttonnavigationhandler.hxx   |   20 +-
 .../source/propctrlr/cellbindinghandler.cxx        |   16 +-
 .../source/propctrlr/cellbindinghandler.hxx        |   16 +-
 main/extensions/source/propctrlr/commoncontrol.cxx |   12 +-
 main/extensions/source/propctrlr/commoncontrol.hxx |   36 +-
 .../source/propctrlr/composeduiupdate.cxx          |   40 +-
 .../source/propctrlr/composeduiupdate.hxx          |    2 +-
 .../source/propctrlr/controlfontdialog.cxx         |   12 +-
 .../source/propctrlr/controlfontdialog.hxx         |   12 +-
 .../source/propctrlr/defaultforminspection.cxx     |   16 +-
 .../source/propctrlr/defaultforminspection.hxx     |   16 +-
 .../source/propctrlr/defaulthelpprovider.cxx       |   10 +-
 .../source/propctrlr/defaulthelpprovider.hxx       |   10 +-
 .../source/propctrlr/editpropertyhandler.cxx       |   14 +-
 .../source/propctrlr/editpropertyhandler.hxx       |   14 +-
 .../source/propctrlr/eformspropertyhandler.cxx     |   25 +-
 .../source/propctrlr/eformspropertyhandler.hxx     |   26 +-
 main/extensions/source/propctrlr/eventhandler.cxx  |   66 +-
 main/extensions/source/propctrlr/eventhandler.hxx  |   42 +-
 .../source/propctrlr/formcomponenthandler.cxx      |   31 +-
 .../source/propctrlr/formcomponenthandler.hxx      |   32 +-
 .../extensions/source/propctrlr/formcontroller.cxx |   20 +-
 .../extensions/source/propctrlr/formcontroller.hxx |   18 +-
 .../source/propctrlr/formgeometryhandler.cxx       |   43 +-
 .../extensions/source/propctrlr/formlinkdialog.cxx |    4 +-
 .../extensions/source/propctrlr/formlinkdialog.hxx |    4 +-
 .../source/propctrlr/genericpropertyhandler.cxx    |   49 +-
 .../source/propctrlr/genericpropertyhandler.hxx    |   42 +-
 .../source/propctrlr/inspectormodelbase.cxx        |   18 +-
 .../source/propctrlr/inspectormodelbase.hxx        |   18 +-
 .../source/propctrlr/objectinspectormodel.cxx      |   32 +-
 main/extensions/source/propctrlr/pcrcommon.hxx     |   12 +-
 main/extensions/source/propctrlr/pcrunodialogs.cxx |   12 +-
 main/extensions/source/propctrlr/pcrunodialogs.hxx |   12 +-
 .../extensions/source/propctrlr/propcontroller.cxx |   86 +-
 .../extensions/source/propctrlr/propcontroller.hxx |   85 +-
 .../source/propctrlr/propertycomposer.cxx          |   38 +-
 .../source/propctrlr/propertycomposer.hxx          |   38 +-
 .../source/propctrlr/propertycontrolextender.cxx   |    6 +-
 .../source/propctrlr/propertycontrolextender.hxx   |    6 +-
 .../source/propctrlr/propertyhandler.cxx           |   29 +-
 .../source/propctrlr/propertyhandler.hxx           |   42 +-
 .../source/propctrlr/propeventtranslation.cxx      |    4 +-
 .../source/propctrlr/propeventtranslation.hxx      |    4 +-
 .../source/propctrlr/pushbuttonnavigation.cxx      |    2 +-
 .../source/propctrlr/pushbuttonnavigation.hxx      |    2 +-
 .../source/propctrlr/sqlcommanddesign.cxx          |    4 +-
 .../source/propctrlr/sqlcommanddesign.hxx          |    4 +-
 .../source/propctrlr/standardcontrol.cxx           |  108 +-
 .../source/propctrlr/standardcontrol.hxx           |  108 +-
 .../source/propctrlr/stringrepresentation.cxx      |   25 +-
 .../source/propctrlr/submissionhandler.cxx         |   21 +-
 .../source/propctrlr/submissionhandler.hxx         |   22 +-
 main/extensions/source/propctrlr/taborder.cxx      |   16 +-
 main/extensions/source/propctrlr/usercontrol.cxx   |   20 +-
 main/extensions/source/propctrlr/usercontrol.hxx   |   20 +-
 .../source/propctrlr/xsdvalidationhelper.cxx       |    6 +-
 .../source/propctrlr/xsdvalidationhelper.hxx       |    7 +-
 .../propctrlr/xsdvalidationpropertyhandler.cxx     |   21 +-
 .../propctrlr/xsdvalidationpropertyhandler.hxx     |   22 +-
 .../source/resource/oooresourceloader.cxx          |   44 +-
 main/extensions/source/resource/resource.cxx       |   22 +-
 main/extensions/source/scanner/sane.hxx            |    2 +-
 main/extensions/source/scanner/scanner.cxx         |    4 +-
 main/extensions/source/scanner/scanner.hxx         |   12 +-
 main/extensions/source/scanner/scanunx.cxx         |   10 +-
 main/extensions/source/scanner/scanwin.cxx         |   16 +-
 .../source/unoactivex/main/initwindowpeer.cxx      |    9 -
 .../extensions/source/update/check/updatecheck.cxx |    4 +-
 .../source/update/check/updatecheckconfig.cxx      |   21 +-
 .../source/update/check/updatecheckconfig.hxx      |   43 +-
 .../source/update/check/updatecheckjob.cxx         |   31 +-
 main/extensions/source/update/check/updatehdl.cxx  |   12 -
 main/extensions/source/update/check/updatehdl.hxx  |   25 +-
 main/extensions/source/update/feed/updatefeed.cxx  |   61 +-
 main/extensions/source/update/ui/updatecheckui.cxx |   58 +-
 main/extensions/source/xmlextract/xmxtrct.cxx      |    2 +-
 main/extensions/source/xmlextract/xmxtrct.hxx      |    2 +-
 main/extensions/test/ole/cpnt/cpnt.cxx             |  618 ++++++-----
 main/extensions/workben/testpgp.cxx                |   84 +-
 main/external/vcredist/README                      |   47 +-
 main/external_deps.lst                             |    4 +-
 main/fileaccess/source/FileAccess.cxx              |   97 +-
 main/filter/inc/filter/msfilter/msvbahelper.hxx    |   16 +-
 main/filter/source/config/cache/basecontainer.cxx  |   27 -
 main/filter/source/config/cache/basecontainer.hxx  |   61 +-
 .../source/config/cache/cacheupdatelistener.cxx    |    2 -
 .../source/config/cache/cacheupdatelistener.hxx    |    6 +-
 main/filter/source/config/cache/configflush.cxx    |    6 -
 main/filter/source/config/cache/configflush.hxx    |   18 +-
 .../source/config/cache/contenthandlerfactory.cxx  |    5 -
 .../source/config/cache/contenthandlerfactory.hxx  |   11 +-
 main/filter/source/config/cache/filtercache.cxx    |   30 -
 main/filter/source/config/cache/filtercache.hxx    |   90 +-
 main/filter/source/config/cache/filterfactory.cxx  |    6 -
 main/filter/source/config/cache/filterfactory.hxx  |   14 +-
 .../source/config/cache/frameloaderfactory.cxx     |    5 -
 .../source/config/cache/frameloaderfactory.hxx     |   11 +-
 .../source/config/cache/lateinitlistener.cxx       |    2 -
 .../source/config/cache/lateinitlistener.hxx       |    6 +-
 main/filter/source/config/cache/typedetection.cxx  |    3 -
 main/filter/source/config/cache/typedetection.hxx  |    9 +-
 main/filter/source/filtertracer/filtertracer.cxx   |   19 +-
 main/filter/source/filtertracer/filtertracer.hxx   |   37 +-
 main/filter/source/flash/swfdialog.cxx             |   12 -
 main/filter/source/flash/swfdialog.hxx             |   16 +-
 main/filter/source/flash/swffilter.cxx             |   37 +-
 main/filter/source/flash/swfuno.cxx                |   14 +-
 main/filter/source/msfilter/msvbahelper.cxx        |   14 +-
 .../source/msfilter/powerpoint/pptimporter.cxx     |   10 -
 .../source/msfilter/powerpoint/pptimporter.hxx     |   30 +-
 main/filter/source/msfilter/services.cxx           |    2 +-
 main/filter/source/pdf/pdfdialog.cxx               |   11 -
 main/filter/source/pdf/pdfdialog.hxx               |   22 +-
 main/filter/source/pdf/pdfexport.cxx               |    8 +-
 main/filter/source/pdf/pdffilter.cxx               |   15 +-
 main/filter/source/pdf/pdffilter.hxx               |   26 +-
 main/filter/source/pdf/pdfinteract.cxx             |   12 +-
 main/filter/source/pdf/pdfinteract.hxx             |   22 +-
 main/filter/source/placeware/exporter.cxx          |    4 +-
 main/filter/source/placeware/filter.cxx            |   25 +-
 main/filter/source/placeware/uno.cxx               |    8 +-
 main/filter/source/svg/svgdialog.cxx               |   12 -
 main/filter/source/svg/svgdialog.hxx               |   28 +-
 main/filter/source/svg/svgexport.cxx               |    1 -
 main/filter/source/svg/svgfilter.cxx               |   16 +-
 main/filter/source/svg/svgfilter.hxx               |   32 +-
 main/filter/source/svg/svgimport.cxx               |    1 -
 main/filter/source/svg/svgwriter.cxx               |    9 +-
 main/filter/source/svg/svgwriter.hxx               |   18 +-
 main/filter/source/t602/t602filter.cxx             |   27 +-
 main/filter/source/t602/t602filter.hxx             |   90 +-
 .../source/xmlfilteradaptor/XmlFilterAdaptor.cxx   |   14 -
 .../source/xmlfilteradaptor/XmlFilterAdaptor.hxx   |   56 +-
 main/filter/source/xmlfilteradaptor/streamwrap.cxx |    6 +-
 main/filter/source/xmlfilteradaptor/streamwrap.hxx |    8 +-
 .../filter/source/xmlfilterdetect/filterdetect.cxx |   10 +-
 .../filter/source/xmlfilterdetect/filterdetect.hxx |   43 +-
 .../source/xsltdialog/typedetectionimport.cxx      |    8 -
 .../source/xsltdialog/typedetectionimport.hxx      |   24 +-
 main/filter/source/xsltdialog/xmlfileview.cxx      |   12 +-
 .../source/xsltdialog/xmlfilterdialogcomponent.cxx |   60 +-
 main/filter/source/xsltdialog/xmlfilterjar.cxx     |    6 +-
 main/filter/source/xsltdialog/xmlfilterjar.hxx     |    2 +-
 .../source/xsltdialog/xmlfiltertestdialog.cxx      |    8 +-
 main/filter/source/xsltfilter/XSLTFilter.cxx       |   62 +-
 main/filter/source/xsltfilter/uof2merge.cxx        |   72 +-
 main/filter/source/xsltfilter/uof2splithandler.cxx |   12 +-
 main/filter/source/xsltfilter/uof2splithandler.hxx |   24 +-
 main/filter/source/xsltfilter/uof2splitter.cxx     |   16 +-
 main/filter/source/xsltfilter/uof2splitter.hxx     |   16 +-
 main/forms/source/component/Button.cxx             |   42 +-
 main/forms/source/component/Button.hxx             |   44 +-
 main/forms/source/component/CheckBox.cxx           |   13 +-
 main/forms/source/component/CheckBox.hxx           |   10 +-
 main/forms/source/component/Columns.cxx            |   16 +-
 main/forms/source/component/Columns.hxx            |   21 +-
 main/forms/source/component/ComboBox.cxx           |   21 +-
 main/forms/source/component/ComboBox.hxx           |   22 +-
 main/forms/source/component/Currency.cxx           |    2 +-
 main/forms/source/component/Currency.hxx           |    2 +-
 main/forms/source/component/DatabaseForm.cxx       |  239 +++--
 main/forms/source/component/DatabaseForm.hxx       |  247 +++--
 main/forms/source/component/Date.cxx               |    6 +-
 main/forms/source/component/Date.hxx               |    7 +-
 main/forms/source/component/Edit.cxx               |   26 +-
 main/forms/source/component/Edit.hxx               |   26 +-
 main/forms/source/component/EditBase.cxx           |    8 +-
 main/forms/source/component/EditBase.hxx           |    9 +-
 main/forms/source/component/EventThread.cxx        |    4 +-
 main/forms/source/component/EventThread.hxx        |    4 +-
 main/forms/source/component/File.cxx               |   19 +-
 main/forms/source/component/File.hxx               |   21 +-
 main/forms/source/component/Filter.cxx             |   48 +-
 main/forms/source/component/Filter.hxx             |   52 +-
 main/forms/source/component/FixedText.cxx          |    9 +-
 main/forms/source/component/FixedText.hxx          |    8 +-
 main/forms/source/component/FormComponent.cxx      |  146 ++-
 main/forms/source/component/FormattedField.cxx     |   29 +-
 main/forms/source/component/FormattedField.hxx     |   31 +-
 .../source/component/FormattedFieldWrapper.cxx     |   16 +-
 .../source/component/FormattedFieldWrapper.hxx     |   16 +-
 main/forms/source/component/FormsCollection.cxx    |   20 +-
 main/forms/source/component/FormsCollection.hxx    |   20 +-
 main/forms/source/component/Grid.cxx               |   50 +-
 main/forms/source/component/Grid.hxx               |   49 +-
 main/forms/source/component/GroupBox.cxx           |   13 +-
 main/forms/source/component/GroupBox.hxx           |   10 +-
 main/forms/source/component/GroupManager.cxx       |   10 +-
 main/forms/source/component/GroupManager.hxx       |   10 +-
 main/forms/source/component/Hidden.cxx             |   12 +-
 main/forms/source/component/Hidden.hxx             |   14 +-
 main/forms/source/component/ImageButton.cxx        |   16 +-
 main/forms/source/component/ImageButton.hxx        |   18 +-
 main/forms/source/component/ImageControl.cxx       |   35 +-
 main/forms/source/component/ImageControl.hxx       |   37 +-
 main/forms/source/component/ListBox.cxx            |   83 +-
 main/forms/source/component/ListBox.hxx            |   82 +-
 main/forms/source/component/Numeric.cxx            |    2 +-
 main/forms/source/component/Numeric.hxx            |    2 +-
 main/forms/source/component/Pattern.cxx            |    2 +-
 main/forms/source/component/Pattern.hxx            |    2 +-
 main/forms/source/component/RadioButton.cxx        |   19 +-
 main/forms/source/component/RadioButton.hxx        |   17 +-
 main/forms/source/component/Time.cxx               |    6 +-
 main/forms/source/component/Time.hxx               |    7 +-
 main/forms/source/component/clickableimage.cxx     |   40 +-
 main/forms/source/component/clickableimage.hxx     |   47 +-
 main/forms/source/component/entrylisthelper.cxx    |   20 +-
 main/forms/source/component/entrylisthelper.hxx    |   23 +-
 main/forms/source/component/errorbroadcaster.cxx   |    4 +-
 main/forms/source/component/errorbroadcaster.hxx   |    4 +-
 main/forms/source/component/formcontrolfont.cxx    |    4 +-
 main/forms/source/component/imgprod.cxx            |   10 +-
 main/forms/source/component/imgprod.hxx            |   10 +-
 main/forms/source/component/navigationbar.cxx      |   16 +-
 main/forms/source/component/navigationbar.hxx      |   17 +-
 main/forms/source/component/refvaluecomponent.cxx  |    4 +-
 main/forms/source/component/refvaluecomponent.hxx  |    6 +-
 main/forms/source/component/scrollbar.cxx          |    8 +-
 main/forms/source/component/scrollbar.hxx          |    6 +-
 main/forms/source/component/spinbutton.cxx         |    8 +-
 main/forms/source/component/spinbutton.hxx         |    6 +-
 .../source/helper/controlfeatureinterception.cxx   |   10 +-
 main/forms/source/helper/formnavigation.cxx        |   10 +-
 main/forms/source/helper/windowstateguard.cxx      |   28 +-
 main/forms/source/inc/FormComponent.hxx            |  180 ++--
 main/forms/source/inc/InterfaceContainer.hxx       |   76 +-
 .../source/inc/controlfeatureinterception.hxx      |   10 +-
 main/forms/source/inc/formcontrolfont.hxx          |    4 +-
 main/forms/source/inc/formnavigation.hxx           |   10 +-
 main/forms/source/inc/forms_module.hxx             |    8 +-
 main/forms/source/inc/listenercontainers.hxx       |    4 +-
 main/forms/source/misc/InterfaceContainer.cxx      |   75 +-
 main/forms/source/misc/listenercontainers.cxx      |    2 +-
 main/forms/source/misc/services.cxx                |    4 +-
 main/forms/source/richtext/attributedispatcher.cxx |    2 +-
 main/forms/source/richtext/attributedispatcher.hxx |    2 +-
 main/forms/source/richtext/clipboarddispatcher.cxx |    2 +-
 main/forms/source/richtext/clipboarddispatcher.hxx |    2 +-
 main/forms/source/richtext/featuredispatcher.cxx   |    4 +-
 main/forms/source/richtext/featuredispatcher.hxx   |    4 +-
 .../richtext/parametrizedattributedispatcher.cxx   |    2 +-
 .../richtext/parametrizedattributedispatcher.hxx   |    2 +-
 main/forms/source/richtext/richtextcontrol.cxx     |   22 +-
 main/forms/source/richtext/richtextcontrol.hxx     |   22 +-
 main/forms/source/richtext/richtextmodel.cxx       |   18 +-
 main/forms/source/richtext/richtextmodel.hxx       |   13 +-
 main/forms/source/richtext/specialdispatchers.cxx  |    4 +-
 main/forms/source/richtext/specialdispatchers.hxx  |    4 +-
 main/forms/source/runtime/formoperations.cxx       |   50 +-
 main/forms/source/runtime/formoperations.hxx       |   50 +-
 .../forms/source/solar/component/navbarcontrol.cxx |   24 +-
 .../forms/source/solar/component/navbarcontrol.hxx |   24 +-
 main/forms/source/xforms/NameContainer.hxx         |   18 -
 main/forms/source/xforms/binding.cxx               |   31 -
 main/forms/source/xforms/binding.hxx               |   73 +-
 main/forms/source/xforms/collection.hxx            |   20 -
 main/forms/source/xforms/datatyperepository.cxx    |   22 +-
 main/forms/source/xforms/datatyperepository.hxx    |   22 +-
 main/forms/source/xforms/datatypes.cxx             |   38 +-
 main/forms/source/xforms/datatypes.hxx             |   44 +-
 main/forms/source/xforms/datatypes_impl.hxx        |    2 +-
 main/forms/source/xforms/enumeration.cxx           |    4 -
 main/forms/source/xforms/enumeration.hxx           |    8 +-
 main/forms/source/xforms/model.cxx                 |   26 -
 main/forms/source/xforms/model.hxx                 |  139 +--
 main/forms/source/xforms/model_ui.cxx              |   23 -
 main/forms/source/xforms/namedcollection.hxx       |    7 -
 main/forms/source/xforms/propertysetbase.cxx       |    4 +-
 main/forms/source/xforms/propertysetbase.hxx       |    8 +-
 main/forms/source/xforms/submission.cxx            |   28 +-
 main/forms/source/xforms/submission.hxx            |   45 +-
 main/forms/source/xforms/submission/submission.hxx |   10 +-
 main/forms/source/xforms/xforms_services.cxx       |    2 -
 main/forms/source/xforms/xforms_services.hxx       |    9 +-
 main/forms/source/xforms/xformsevent.cxx           |   21 +-
 main/forms/source/xforms/xformsevent.hxx           |   24 +-
 main/forms/source/xforms/xpathlib/extension.cxx    |    4 +-
 main/forms/source/xforms/xpathlib/extension.hxx    |    4 +-
 .../formula/inc/formula/FormulaOpCodeMapperObj.hxx |   21 +-
 .../source/core/api/FormulaOpCodeMapperObj.cxx     |   12 +-
 main/fpicker/source/aqua/FilterHelper.cxx          |   12 +-
 main/fpicker/source/aqua/FilterHelper.hxx          |   12 +-
 main/fpicker/source/aqua/SalAquaFilePicker.cxx     |   32 +-
 main/fpicker/source/aqua/SalAquaFilePicker.hxx     |   73 +-
 main/fpicker/source/aqua/SalAquaFolderPicker.cxx   |   16 +-
 main/fpicker/source/aqua/SalAquaFolderPicker.hxx   |   33 +-
 main/fpicker/source/aqua/SalAquaPicker.cxx         |    5 +-
 main/fpicker/source/aqua/SalAquaPicker.hxx         |    9 +-
 main/fpicker/source/office/OfficeControlAccess.cxx |    4 +-
 main/fpicker/source/office/OfficeControlAccess.hxx |    2 +-
 main/fpicker/source/office/OfficeFilePicker.cxx    |   52 +-
 main/fpicker/source/office/OfficeFilePicker.hxx    |   68 +-
 main/fpicker/source/office/OfficeFolderPicker.cxx  |   21 +-
 main/fpicker/source/office/OfficeFolderPicker.hxx  |   25 +-
 main/fpicker/source/office/commonpicker.cxx        |   29 +-
 main/fpicker/source/office/commonpicker.hxx        |   31 +-
 main/fpicker/source/office/fpinteraction.cxx       |    2 +-
 main/fpicker/source/office/fpinteraction.hxx       |    2 +-
 main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx |   47 +-
 main/fpicker/source/unx/gnome/SalGtkFilePicker.hxx |   97 +-
 .../source/unx/gnome/SalGtkFolderPicker.cxx        |   16 +-
 .../source/unx/gnome/SalGtkFolderPicker.hxx        |   33 +-
 main/fpicker/source/unx/gnome/SalGtkPicker.cxx     |    6 +-
 main/fpicker/source/unx/gnome/SalGtkPicker.hxx     |   33 +-
 main/fpicker/source/unx/kde4/KDE4FilePicker.cxx    |   24 -
 main/fpicker/source/unx/kde4/KDE4FilePicker.hxx    |   48 +-
 .../fpicker/source/win32/filepicker/FilePicker.cxx |   46 +-
 .../fpicker/source/win32/filepicker/FilePicker.hxx |   89 +-
 .../source/win32/filepicker/VistaFilePicker.cxx    |   38 -
 .../source/win32/filepicker/VistaFilePicker.hxx    |  101 +-
 .../filepicker/VistaFilePickerEventHandler.cxx     |    2 -
 .../filepicker/VistaFilePickerEventHandler.hxx     |    6 +-
 .../source/win32/filepicker/WinFileOpenImpl.cxx    |   24 +-
 .../source/win32/filepicker/WinFileOpenImpl.hxx    |   61 +-
 .../fpicker/source/win32/filepicker/dibpreview.cxx |   11 +-
 .../fpicker/source/win32/filepicker/dibpreview.hxx |   18 +-
 .../source/win32/filepicker/previewadapter.cxx     |    9 +-
 .../source/win32/filepicker/previewadapter.hxx     |    3 +-
 .../source/win32/filepicker/previewbase.cxx        |   11 +-
 .../source/win32/filepicker/previewbase.hxx        |   18 +-
 .../source/win32/filepicker/workbench/Test_fps.cxx |   24 +-
 .../source/win32/folderpicker/FolderPicker.cxx     |   13 +-
 .../source/win32/folderpicker/FolderPicker.hxx     |   30 +-
 .../source/win32/folderpicker/WinFOPImpl.cxx       |    6 +-
 .../source/win32/folderpicker/WinFOPImpl.hxx       |   12 +-
 main/fpicker/source/win32/misc/WinImplHelper.cxx   |    6 -
 main/fpicker/source/win32/misc/WinImplHelper.hxx   |   18 +-
 .../inc/classes/actiontriggercontainer.hxx         |   22 +-
 .../inc/classes/actiontriggerpropertyset.hxx       |   28 +-
 .../classes/actiontriggerseparatorpropertyset.hxx  |   24 +-
 main/framework/inc/classes/droptargetlistener.hxx  |   12 +-
 main/framework/inc/classes/filtercache.hxx         |   27 +-
 main/framework/inc/classes/imagewrapper.hxx        |    8 +-
 main/framework/inc/classes/menumanager.hxx         |    4 +-
 main/framework/inc/classes/propertysethelper.hxx   |   55 +-
 .../inc/classes/rootactiontriggercontainer.hxx     |   49 +-
 main/framework/inc/dispatch/basedispatcher.hxx     |   14 +-
 main/framework/inc/dispatch/blankdispatcher.hxx    |    2 +-
 main/framework/inc/dispatch/closedispatcher.hxx    |   12 +-
 main/framework/inc/dispatch/createdispatcher.hxx   |    2 +-
 .../inc/dispatch/dispatchinformationprovider.hxx   |    6 +-
 main/framework/inc/dispatch/dispatchprovider.hxx   |    4 +-
 .../framework/inc/dispatch/helpagentdispatcher.hxx |   24 +-
 main/framework/inc/dispatch/interceptionhelper.hxx |   14 +-
 main/framework/inc/dispatch/mailtodispatcher.hxx   |   14 +-
 main/framework/inc/dispatch/menudispatcher.hxx     |   10 +-
 main/framework/inc/dispatch/oxt_handler.hxx        |   10 +-
 .../framework/inc/dispatch/popupmenudispatcher.hxx |   19 +-
 main/framework/inc/dispatch/selfdispatcher.hxx     |    2 +-
 main/framework/inc/dispatch/servicehandler.hxx     |   14 +-
 .../inc/dispatch/startmoduledispatcher.hxx         |   12 +-
 main/framework/inc/dispatch/systemexec.hxx         |   12 +-
 main/framework/inc/framework/menuconfiguration.hxx |   15 +-
 .../inc/framework/preventduplicateinteraction.hxx  |    9 +-
 main/framework/inc/framework/titlehelper.hxx       |   24 +-
 .../inc/helper/dockingareadefaultacceptor.hxx      |    6 +-
 main/framework/inc/helper/ocomponentaccess.hxx     |    6 +-
 .../framework/inc/helper/ocomponentenumeration.hxx |    8 +-
 main/framework/inc/helper/oframes.hxx              |   16 +-
 main/framework/inc/helper/otasksaccess.hxx         |    6 +-
 main/framework/inc/helper/otasksenumeration.hxx    |    8 +-
 .../framework/inc/helper/persistentwindowstate.hxx |   10 +-
 main/framework/inc/helper/propertysetcontainer.hxx |   22 +-
 main/framework/inc/helper/statusindicator.hxx      |   15 +-
 .../inc/helper/statusindicatorfactory.hxx          |   10 +-
 main/framework/inc/helper/tagwindowasmodified.hxx  |   13 +-
 main/framework/inc/helper/titlebarupdate.hxx       |   13 +-
 .../inc/helper/uiconfigelementwrapperbase.hxx      |   44 +-
 main/framework/inc/helper/uielementwrapperbase.hxx |   30 +-
 main/framework/inc/helper/vclstatusindicator.hxx   |   15 +-
 .../framework/inc/interaction/quietinteraction.hxx |    2 +-
 main/framework/inc/jobs/helponstartup.hxx          |    8 +-
 main/framework/inc/jobs/job.hxx                    |   14 +-
 main/framework/inc/jobs/jobdispatch.hxx            |   15 +-
 main/framework/inc/jobs/jobexecutor.hxx            |   12 +-
 main/framework/inc/jobs/shelljob.hxx               |    5 +-
 main/framework/inc/macros/xinterface.hxx           |    8 +-
 main/framework/inc/macros/xserviceinfo.hxx         |   17 +-
 main/framework/inc/macros/xtypeprovider.hxx        |   12 +-
 main/framework/inc/recording/dispatchrecorder.hxx  |   20 +-
 .../inc/recording/dispatchrecordersupplier.hxx     |    6 +-
 .../inc/services/ContextChangeEventMultiplexer.hxx |   33 +-
 main/framework/inc/services/EventMultiplexer.hxx   |   30 +-
 main/framework/inc/services/autorecovery.hxx       |   30 +-
 main/framework/inc/services/backingcomp.hxx        |   42 +-
 .../inc/services/contenthandlerfactory.hxx         |   39 +-
 main/framework/inc/services/desktop.hxx            |  104 +-
 main/framework/inc/services/detectorfactory.hxx    |   54 +-
 main/framework/inc/services/dispatchhelper.hxx     |    9 +-
 main/framework/inc/services/frame.hxx              |  117 ++-
 main/framework/inc/services/frameloaderfactory.hxx |   20 +-
 main/framework/inc/services/layoutmanager.hxx      |  105 +-
 main/framework/inc/services/license.hxx            |    9 +-
 main/framework/inc/services/logindialog.hxx        |   30 +-
 .../inc/services/mediatypedetectionhelper.hxx      |    2 +-
 main/framework/inc/services/modelwinservice.hxx    |   12 +-
 main/framework/inc/services/modulemanager.hxx      |   37 +-
 main/framework/inc/services/pathsettings.hxx       |   11 +-
 main/framework/inc/services/pluginframe.hxx        |   37 +-
 main/framework/inc/services/sessionlistener.hxx    |   24 +-
 main/framework/inc/services/substitutepathvars.hxx |   18 +-
 main/framework/inc/services/tabwindowservice.hxx   |   26 +-
 main/framework/inc/services/task.hxx               |   56 +-
 main/framework/inc/services/taskcreatorsrv.hxx     |    8 +-
 main/framework/inc/services/uriabbreviation.hxx    |    2 +-
 main/framework/inc/services/urltransformer.hxx     |    8 +-
 main/framework/inc/tabwin/tabwindow.hxx            |   54 +-
 main/framework/inc/tabwin/tabwinfactory.hxx        |    4 +-
 .../framework/inc/threadhelp/itransactionmanager.h |    4 +-
 .../inc/threadhelp/transactionmanager.hxx          |    6 +-
 .../inc/uiconfiguration/graphicnameaccess.hxx      |   16 +-
 .../framework/inc/uiconfiguration/imagemanager.hxx |   38 +-
 .../inc/uiconfiguration/moduleimagemanager.hxx     |   36 +-
 .../inc/uiconfiguration/moduleuicfgsupplier.hxx    |   12 +-
 .../moduleuiconfigurationmanager.hxx               |   48 +-
 .../inc/uiconfiguration/uiconfigurationmanager.hxx |   46 +-
 .../uiconfiguration/windowstateconfiguration.hxx   |   15 +-
 .../inc/uielement/addonstoolbarmanager.hxx         |    2 +-
 .../inc/uielement/addonstoolbarwrapper.hxx         |    6 +-
 .../inc/uielement/buttontoolbarcontroller.hxx      |   26 +-
 .../inc/uielement/comboboxtoolbarcontroller.hxx    |    2 +-
 .../inc/uielement/complextoolbarcontroller.hxx     |    6 +-
 .../framework/inc/uielement/constitemcontainer.hxx |   30 +-
 .../inc/uielement/controlmenucontroller.hxx        |   10 +-
 .../inc/uielement/dropdownboxtoolbarcontroller.hxx |    2 +-
 .../inc/uielement/edittoolbarcontroller.hxx        |    2 +-
 .../framework/inc/uielement/fontmenucontroller.hxx |    8 +-
 .../inc/uielement/fontsizemenucontroller.hxx       |    6 +-
 .../inc/uielement/footermenucontroller.hxx         |    8 +-
 .../inc/uielement/genericstatusbarcontroller.hxx   |    6 +-
 .../inc/uielement/generictoolbarcontroller.hxx     |   10 +-
 .../inc/uielement/headermenucontroller.hxx         |    6 +-
 .../inc/uielement/imagebuttontoolbarcontroller.hxx |    2 +-
 main/framework/inc/uielement/itemcontainer.hxx     |   21 +-
 .../inc/uielement/langselectionmenucontroller.hxx  |    8 +-
 .../uielement/langselectionstatusbarcontroller.hxx |   10 +-
 .../inc/uielement/macrosmenucontroller.hxx         |    4 +-
 main/framework/inc/uielement/menubarmanager.hxx    |   22 +-
 main/framework/inc/uielement/menubarwrapper.hxx    |   18 +-
 main/framework/inc/uielement/newmenucontroller.hxx |   10 +-
 .../inc/uielement/objectmenucontroller.hxx         |    4 +-
 main/framework/inc/uielement/panelwrapper.hxx      |   14 +-
 .../inc/uielement/popuptoolbarcontroller.hxx       |   14 +-
 .../framework/inc/uielement/progressbarwrapper.hxx |   18 +-
 .../inc/uielement/recentfilesmenucontroller.hxx    |   12 +-
 main/framework/inc/uielement/rootitemcontainer.hxx |   31 +-
 .../inc/uielement/spinfieldtoolbarcontroller.hxx   |    2 +-
 main/framework/inc/uielement/statusbaritem.hxx     |   34 +-
 main/framework/inc/uielement/statusbarmanager.hxx  |   16 +-
 main/framework/inc/uielement/statusbarwrapper.hxx  |    8 +-
 .../uielement/statusindicatorinterfacewrapper.hxx  |   10 +-
 .../uielement/togglebuttontoolbarcontroller.hxx    |    4 +-
 main/framework/inc/uielement/toolbarmanager.hxx    |   18 +-
 .../inc/uielement/toolbarsmenucontroller.hxx       |   12 +-
 main/framework/inc/uielement/toolbarwrapper.hxx    |   18 +-
 .../inc/uielement/uicommanddescription.hxx         |   15 +-
 .../inc/uifactory/addonstoolboxfactory.hxx         |    2 +-
 .../inc/uifactory/factoryconfiguration.hxx         |    8 +-
 main/framework/inc/uifactory/menubarfactory.hxx    |    2 +-
 main/framework/inc/uifactory/statusbarfactory.hxx  |    2 +-
 main/framework/inc/uifactory/toolboxfactory.hxx    |    2 +-
 .../inc/uifactory/uicontrollerfactory.hxx          |   18 +-
 .../inc/uifactory/uielementfactorymanager.hxx      |   18 +-
 .../inc/uifactory/windowcontentfactorymanager.hxx  |    4 +-
 .../inc/xml/acceleratorconfigurationreader.hxx     |   32 +-
 main/framework/inc/xml/eventsdocumenthandler.hxx   |   40 +-
 main/framework/inc/xml/imagesdocumenthandler.hxx   |   52 +-
 main/framework/inc/xml/menudocumenthandler.hxx     |  118 +--
 main/framework/inc/xml/saxnamespacefilter.hxx      |   32 +-
 .../framework/inc/xml/statusbardocumenthandler.hxx |   40 +-
 main/framework/inc/xml/toolboxdocumenthandler.hxx  |   52 +-
 main/framework/inc/xml/xmlnamespaces.hxx           |   12 +-
 .../accelerators/acceleratorconfiguration.cxx      |   65 --
 .../documentacceleratorconfiguration.cxx           |    4 -
 .../globalacceleratorconfiguration.cxx             |    3 -
 main/framework/source/accelerators/keymapping.cxx  |    1 -
 .../moduleacceleratorconfiguration.cxx             |    3 -
 .../source/classes/droptargetlistener.cxx          |   12 +-
 main/framework/source/classes/menumanager.cxx      |    4 +-
 main/framework/source/dispatch/closedispatcher.cxx |    6 -
 .../dispatch/dispatchinformationprovider.cxx       |    2 -
 .../framework/source/dispatch/dispatchprovider.cxx |    4 +-
 .../source/dispatch/helpagentdispatcher.cxx        |    8 -
 .../source/dispatch/interceptionhelper.cxx         |    5 -
 main/framework/source/dispatch/loaddispatcher.cxx  |    5 -
 .../framework/source/dispatch/mailtodispatcher.cxx |   14 +-
 main/framework/source/dispatch/menudispatcher.cxx  |   10 +-
 main/framework/source/dispatch/oxt_handler.cxx     |    3 -
 .../source/dispatch/popupmenudispatcher.cxx        |    9 +-
 main/framework/source/dispatch/servicehandler.cxx  |   14 +-
 .../source/dispatch/startmoduledispatcher.cxx      |    6 -
 main/framework/source/dispatch/systemexec.cxx      |   12 +-
 .../source/dispatch/windowcommanddispatch.cxx      |    1 -
 .../source/fwe/classes/actiontriggercontainer.cxx  |   11 +-
 .../fwe/classes/actiontriggerpropertyset.cxx       |   14 +-
 .../classes/actiontriggerseparatorpropertyset.cxx  |   12 +-
 main/framework/source/fwe/classes/imagewrapper.cxx |    8 +-
 .../fwe/classes/rootactiontriggercontainer.cxx     |   24 +-
 main/framework/source/fwe/dispatch/interaction.cxx |   24 +-
 .../source/fwe/helper/actiontriggerhelper.cxx      |    6 +-
 .../source/fwe/helper/documentundoguard.cxx        |   48 +-
 .../source/fwe/helper/propertysetcontainer.cxx     |    7 -
 main/framework/source/fwe/helper/titlehelper.cxx   |    8 -
 .../interaction/preventduplicateinteraction.cxx    |    3 -
 .../source/fwe/xml/eventsdocumenthandler.cxx       |   14 +-
 .../framework/source/fwe/xml/menuconfiguration.cxx |    3 -
 .../source/fwe/xml/menudocumenthandler.cxx         |   25 -
 .../source/fwe/xml/saxnamespacefilter.cxx          |    8 -
 .../source/fwe/xml/statusbardocumenthandler.cxx    |   12 +-
 .../source/fwe/xml/toolboxdocumenthandler.cxx      |   21 +-
 main/framework/source/fwe/xml/xmlnamespaces.cxx    |    8 +-
 .../source/fwi/classes/propertysethelper.cxx       |   29 -
 .../source/fwi/threadhelp/transactionmanager.cxx   |    6 +-
 .../source/fwi/uielement/constitemcontainer.cxx    |   26 +-
 .../source/fwi/uielement/itemcontainer.cxx         |    8 +-
 .../source/fwi/uielement/rootitemcontainer.cxx     |   13 +-
 .../source/helper/dockingareadefaultacceptor.cxx   |    6 +-
 main/framework/source/helper/ocomponentaccess.cxx  |    6 +-
 .../source/helper/ocomponentenumeration.cxx        |    8 +-
 main/framework/source/helper/oframes.cxx           |   16 +-
 .../source/helper/persistentwindowstate.cxx        |    4 -
 main/framework/source/helper/statusindicator.cxx   |    5 -
 .../source/helper/statusindicatorfactory.cxx       |    4 -
 .../source/helper/tagwindowasmodified.cxx          |    5 -
 main/framework/source/helper/titlebarupdate.cxx    |    5 -
 .../source/helper/uiconfigelementwrapperbase.cxx   |   32 +-
 .../source/helper/uielementwrapperbase.cxx         |   21 +-
 .../framework/source/helper/vclstatusindicator.cxx |    5 -
 .../inc/accelerators/acceleratorconfiguration.hxx  |  148 +--
 .../documentacceleratorconfiguration.hxx           |   10 +-
 .../globalacceleratorconfiguration.hxx             |    6 +-
 .../source/inc/accelerators/keymapping.hxx         |    3 +-
 .../moduleacceleratorconfiguration.hxx             |    6 +-
 .../source/inc/dispatch/loaddispatcher.hxx         |   15 +-
 .../source/inc/dispatch/windowcommanddispatch.hxx  |    3 +-
 main/framework/source/inc/loadenv/loadenv.hxx      |   41 +-
 .../source/interaction/quietinteraction.cxx        |    2 +-
 main/framework/source/jobs/helponstartup.cxx       |    4 -
 main/framework/source/jobs/job.cxx                 |   14 +-
 main/framework/source/jobs/jobdispatch.cxx         |   15 +-
 main/framework/source/jobs/jobexecutor.cxx         |   12 +-
 main/framework/source/jobs/shelljob.cxx            |    3 -
 .../source/layoutmanager/layoutmanager.cxx         |   61 +-
 .../source/layoutmanager/panelmanager.cxx          |    7 -
 .../source/layoutmanager/panelmanager.hxx          |   14 +-
 .../source/layoutmanager/toolbarlayoutmanager.cxx  |   18 +-
 .../source/layoutmanager/toolbarlayoutmanager.hxx  |   32 +-
 main/framework/source/loadenv/loadenv.cxx          |   30 +-
 .../source/recording/dispatchrecorder.cxx          |   21 +-
 .../source/recording/dispatchrecordersupplier.cxx  |    6 +-
 .../services/ContextChangeEventMultiplexer.cxx     |   11 -
 .../framework/source/services/EventMultiplexer.cxx |   10 -
 main/framework/source/services/autorecovery.cxx    |   12 -
 main/framework/source/services/backingcomp.cxx     |   21 -
 main/framework/source/services/backingwindow.cxx   |    1 -
 main/framework/source/services/desktop.cxx         |   87 +-
 main/framework/source/services/dispatchhelper.cxx  |    3 -
 main/framework/source/services/frame.cxx           |   99 +-
 main/framework/source/services/license.cxx         |    5 +-
 .../source/services/mediatypedetectionhelper.cxx   |    1 -
 main/framework/source/services/modelwinservice.cxx |   25 +-
 main/framework/source/services/modulemanager.cxx   |   17 -
 main/framework/source/services/pathsettings.cxx    |    5 -
 main/framework/source/services/sessionlistener.cxx |    9 +-
 .../source/services/substitutepathvars.cxx         |    6 -
 .../framework/source/services/tabwindowservice.cxx |   17 -
 main/framework/source/services/taskcreatorsrv.cxx  |    4 -
 main/framework/source/services/uriabbreviation.cxx |    2 +-
 main/framework/source/services/urltransformer.cxx  |    8 +-
 main/framework/source/tabwin/tabwindow.cxx         |   28 +-
 main/framework/source/tabwin/tabwinfactory.cxx     |    2 -
 .../source/uiconfiguration/globalsettings.cxx      |   12 +-
 .../source/uiconfiguration/graphicnameaccess.cxx   |    7 -
 .../source/uiconfiguration/imagemanager.cxx        |   32 +-
 .../source/uiconfiguration/imagemanagerimpl.cxx    |   27 +-
 .../source/uiconfiguration/imagemanagerimpl.hxx    |   32 +-
 .../source/uiconfiguration/moduleimagemanager.cxx  |   31 +-
 .../source/uiconfiguration/moduleuicfgsupplier.cxx |    8 +-
 .../moduleuiconfigurationmanager.cxx               |   40 +-
 .../uiconfiguration/uicategorydescription.cxx      |   36 +-
 .../uiconfiguration/uiconfigurationmanager.cxx     |   40 +-
 .../uiconfiguration/uiconfigurationmanagerimpl.cxx |   44 +-
 .../uiconfiguration/uiconfigurationmanagerimpl.hxx |   52 +-
 .../uiconfiguration/windowstateconfiguration.cxx   |   53 +-
 .../source/uielement/addonstoolbarmanager.cxx      |    2 +-
 .../source/uielement/addonstoolbarwrapper.cxx      |    6 +-
 .../source/uielement/buttontoolbarcontroller.cxx   |   14 +-
 .../source/uielement/comboboxtoolbarcontroller.cxx |    1 -
 .../source/uielement/complextoolbarcontroller.cxx  |    3 -
 .../source/uielement/controlmenucontroller.cxx     |   10 +-
 .../uielement/dropdownboxtoolbarcontroller.cxx     |    1 -
 .../source/uielement/edittoolbarcontroller.cxx     |    1 -
 .../source/uielement/fontmenucontroller.cxx        |    8 +-
 .../source/uielement/fontsizemenucontroller.cxx    |    6 +-
 .../uielement/genericstatusbarcontroller.cxx       |    3 -
 .../source/uielement/generictoolbarcontroller.cxx  |    7 +-
 .../source/uielement/headermenucontroller.cxx      |    6 +-
 .../uielement/imagebuttontoolbarcontroller.cxx     |    1 -
 .../uielement/langselectionmenucontroller.cxx      |    8 +-
 .../uielement/langselectionstatusbarcontroller.cxx |    5 -
 .../source/uielement/macrosmenucontroller.cxx      |    4 +-
 main/framework/source/uielement/menubarmanager.cxx |   18 +-
 main/framework/source/uielement/menubarwrapper.cxx |   15 +-
 .../source/uielement/newmenucontroller.cxx         |   10 +-
 .../source/uielement/objectmenucontroller.cxx      |    4 +-
 main/framework/source/uielement/panelwrapper.cxx   |   13 +-
 .../source/uielement/popuptoolbarcontroller.cxx    |    7 -
 .../source/uielement/progressbarwrapper.cxx        |    9 -
 .../source/uielement/recentfilesmenucontroller.cxx |   11 +-
 .../uielement/spinfieldtoolbarcontroller.cxx       |    1 -
 main/framework/source/uielement/statusbaritem.cxx  |   17 -
 .../source/uielement/statusbarmanager.cxx          |   15 +-
 .../source/uielement/statusbarwrapper.cxx          |    8 +-
 .../uielement/statusindicatorinterfacewrapper.cxx  |    5 -
 .../uielement/togglebuttontoolbarcontroller.cxx    |    2 -
 main/framework/source/uielement/toolbarmanager.cxx |   19 +-
 .../source/uielement/toolbarsmenucontroller.cxx    |   12 +-
 main/framework/source/uielement/toolbarwrapper.cxx |   16 +-
 .../source/uielement/uicommanddescription.cxx      |   41 +-
 .../source/uifactory/addonstoolboxfactory.cxx      |    3 -
 .../source/uifactory/factoryconfiguration.cxx      |    8 +-
 main/framework/source/uifactory/menubarfactory.cxx |    1 -
 .../source/uifactory/statusbarfactory.cxx          |    1 -
 main/framework/source/uifactory/toolboxfactory.cxx |    1 -
 .../source/uifactory/uicontrollerfactory.cxx       |    6 -
 .../source/uifactory/uielementfactorymanager.cxx   |   13 +-
 .../uifactory/windowcontentfactorymanager.cxx      |    2 -
 .../source/xml/acceleratorconfigurationreader.cxx  |   16 -
 .../framework/source/xml/imagesdocumenthandler.cxx |   23 +-
 main/i18npool/inc/breakiteratorImpl.hxx            |   60 +-
 main/i18npool/inc/breakiterator_cjk.hxx            |   12 +-
 main/i18npool/inc/breakiterator_ctl.hxx            |    9 +-
 main/i18npool/inc/breakiterator_th.hxx             |    2 +-
 main/i18npool/inc/breakiterator_unicode.hxx        |   28 +-
 main/i18npool/inc/calendarImpl.hxx                 |   48 +-
 main/i18npool/inc/calendar_gregorian.hxx           |   62 +-
 main/i18npool/inc/calendar_hijri.hxx               |    4 +-
 main/i18npool/inc/calendar_jewish.hxx              |    6 +-
 main/i18npool/inc/cclass_cjk.hxx                   |    3 +-
 main/i18npool/inc/cclass_unicode.hxx               |   27 +-
 main/i18npool/inc/chaptercollator.hxx              |   10 +-
 main/i18npool/inc/characterclassificationImpl.hxx  |   41 +-
 main/i18npool/inc/collatorImpl.hxx                 |   28 +-
 main/i18npool/inc/collator_unicode.hxx             |   24 +-
 main/i18npool/inc/defaultnumberingprovider.hxx     |   37 +-
 main/i18npool/inc/indexentrysupplier.hxx           |   40 +-
 main/i18npool/inc/indexentrysupplier_asian.hxx     |   12 +-
 main/i18npool/inc/indexentrysupplier_common.hxx    |   39 +-
 main/i18npool/inc/indexentrysupplier_default.hxx   |   16 +-
 .../inc/indexentrysupplier_ja_phonetic.hxx         |    8 +-
 main/i18npool/inc/inputsequencechecker.hxx         |   15 +-
 main/i18npool/inc/inputsequencechecker_hi.hxx      |    4 +-
 main/i18npool/inc/inputsequencechecker_th.hxx      |    4 +-
 main/i18npool/inc/localedata.hxx                   |   64 +-
 main/i18npool/inc/nativenumbersupplier.hxx         |   27 +-
 main/i18npool/inc/numberformatcode.hxx             |   17 +-
 main/i18npool/inc/ordinalsuffix.hxx                |    8 +-
 main/i18npool/inc/scripttypedetector.hxx           |   21 +-
 main/i18npool/inc/textToPronounce_zh.hxx           |   15 +-
 main/i18npool/inc/textconversion.hxx               |   69 +-
 main/i18npool/inc/textconversionImpl.hxx           |   32 +-
 main/i18npool/inc/transliterationImpl.hxx          |   57 +-
 main/i18npool/inc/transliteration_Ignore.hxx       |   30 +-
 main/i18npool/inc/transliteration_Numeric.hxx      |   21 +-
 main/i18npool/inc/transliteration_OneToOne.hxx     |   23 +-
 main/i18npool/inc/transliteration_body.hxx         |   22 +-
 main/i18npool/inc/transliteration_caseignore.hxx   |   20 +-
 main/i18npool/inc/transliteration_commonclass.hxx  |   56 +-
 .../source/breakiterator/breakiteratorImpl.cxx     |   47 +-
 .../source/breakiterator/breakiterator_cjk.cxx     |    7 +-
 .../source/breakiterator/breakiterator_ctl.cxx     |    5 +-
 .../source/breakiterator/breakiterator_th.cxx      |    1 -
 .../source/breakiterator/breakiterator_unicode.cxx |   22 +-
 main/i18npool/source/calendar/calendarImpl.cxx     |   46 +-
 .../source/calendar/calendar_gregorian.cxx         |   60 +-
 main/i18npool/source/calendar/calendar_hijri.cxx   |    4 +-
 main/i18npool/source/calendar/calendar_jewish.cxx  |    5 +-
 .../characterclassification/cclass_unicode.cxx     |   24 +-
 .../characterclassificationImpl.cxx                |   21 +-
 .../characterclassification/scripttypedetector.cxx |   18 +-
 main/i18npool/source/collator/chaptercollator.cxx  |   10 +-
 main/i18npool/source/collator/collatorImpl.cxx     |   20 +-
 main/i18npool/source/collator/collator_unicode.cxx |   11 +-
 .../defaultnumberingprovider.cxx                   |   15 +-
 .../source/indexentry/indexentrysupplier.cxx       |   26 +-
 .../source/indexentry/indexentrysupplier_asian.cxx |    7 +-
 .../indexentry/indexentrysupplier_common.cxx       |   25 +-
 .../indexentry/indexentrysupplier_default.cxx      |   11 +-
 .../indexentry/indexentrysupplier_ja_phonetic.cxx  |   11 +-
 .../source/inputchecker/inputsequencechecker.cxx   |   12 +-
 .../inputchecker/inputsequencechecker_hi.cxx       |    2 -
 .../inputchecker/inputsequencechecker_th.cxx       |    3 +-
 main/i18npool/source/localedata/localedata.cxx     |   75 +-
 main/i18npool/source/localedata/saxparser.cxx      |   36 +-
 .../source/nativenumber/nativenumbersupplier.cxx   |   24 +-
 .../source/numberformatcode/numberformatcode.cxx   |   12 +-
 .../source/ordinalsuffix/ordinalsuffix.cxx         |    8 +-
 main/i18npool/source/search/textsearch.cxx         |   15 +-
 main/i18npool/source/search/textsearch.hxx         |   39 +-
 .../source/textconversion/textconversion.cxx       |    6 +-
 .../source/textconversion/textconversionImpl.cxx   |   11 +-
 .../source/textconversion/textconversion_ko.cxx    |    4 -
 .../source/textconversion/textconversion_zh.cxx    |    4 -
 .../transliteration/fullwidthToHalfwidth.cxx       |    6 -
 .../transliteration/halfwidthToFullwidth.cxx       |    6 -
 .../ignoreIandEfollowedByYa_ja_JP.cxx              |    1 -
 .../transliteration/ignoreIterationMark_ja_JP.cxx  |    1 -
 .../i18npool/source/transliteration/ignoreKana.cxx |    4 +-
 .../ignoreKiKuFollowedBySa_ja_JP.cxx               |    1 -
 .../ignoreProlongedSoundMark_ja_JP.cxx             |    1 -
 .../source/transliteration/ignoreSize_ja_JP.cxx    |    4 +-
 .../source/transliteration/ignoreWidth.cxx         |    4 +-
 .../source/transliteration/textToPronounce_zh.cxx  |    9 +-
 .../source/transliteration/transliterationImpl.cxx |   37 +-
 .../transliteration/transliteration_Ignore.cxx     |   13 +-
 .../transliteration/transliteration_Numeric.cxx    |   11 +-
 .../transliteration/transliteration_OneToOne.cxx   |    9 +-
 .../transliteration/transliteration_body.cxx       |   14 +-
 .../transliteration/transliteration_caseignore.cxx |    8 +-
 .../transliteration_commonclass.cxx                |   20 +-
 main/i18nutil/inc/i18nutil/casefolding.hxx         |    6 +-
 main/i18nutil/source/utility/casefolding.cxx       |    6 +-
 main/icu/makefile.mk                               |   18 +
 main/idlc/inc/idlc/options.hxx                     |   12 +-
 main/idlc/source/options.cxx                       |    5 +-
 main/io/source/TextInputStream/TextInputStream.cxx |   50 +-
 .../source/TextOutputStream/TextOutputStream.cxx   |   31 +-
 main/io/source/acceptor/acc_pipe.cxx               |   28 +-
 main/io/source/acceptor/acc_socket.cxx             |   38 +-
 main/io/source/acceptor/acceptor.cxx               |   16 +-
 main/io/source/connector/connector.cxx             |    4 +-
 main/io/source/connector/connector.hxx             |   44 +-
 main/io/source/connector/ctr_pipe.cxx              |    9 -
 main/io/source/connector/ctr_socket.cxx            |   13 +-
 main/io/source/stm/factreg.hxx                     |   16 +-
 main/io/source/stm/odata.cxx                       |  308 ++----
 main/io/source/stm/omark.cxx                       |  181 +---
 main/io/source/stm/opipe.cxx                       |   76 +-
 main/io/source/stm/opump.cxx                       |    6 +-
 main/io/source/stm/streamhelper.cxx                |   15 +-
 main/io/source/stm/streamhelper.hxx                |   41 +-
 main/io/test/stm/datatest.cxx                      |  114 +--
 main/io/test/stm/marktest.cxx                      |   65 +-
 main/io/test/stm/pipetest.cxx                      |   28 +-
 main/io/test/stm/pumptest.cxx                      |   37 +-
 main/io/test/stm/testfactreg.hxx                   |   14 +-
 main/javaunohelper/source/vm.cxx                   |    8 +-
 .../jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |    1 +
 main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx  |    1 +
 main/l10ntools/source/help/HelpCompiler.cxx        |    2 +-
 main/l10ntools/source/help/HelpCompiler.hxx        |    2 +-
 main/l10ntools/source/help/HelpLinker.cxx          |    9 +-
 main/libxmlsec/makefile.mk                         |   11 +-
 main/libxmlsec/xmlsec1-nowin98.patch               |   20 +
 main/libxmlsec/xmlsec1-ucrt-snprintf.patch         |   51 +
 .../hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx   |   16 -
 .../hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx   |   30 +-
 .../source/languageguessing/guesslang.cxx          |   30 +-
 .../source/spellcheck/macosxspell/macspellimp.cxx  |   15 -
 .../source/spellcheck/macosxspell/macspellimp.hxx  |   28 +-
 .../source/spellcheck/spell/sspellimp.cxx          |   15 -
 .../source/spellcheck/spell/sspellimp.hxx          |   28 +-
 .../source/thesaurus/libnth/nthesdta.cxx           |    2 -
 .../source/thesaurus/libnth/nthesdta.hxx           |    4 +-
 .../source/thesaurus/libnth/nthesimp.cxx           |   12 -
 .../source/thesaurus/libnth/nthesimp.hxx           |   22 +-
 main/linguistic/inc/iprcache.hxx                   |    6 +-
 main/linguistic/inc/linguistic/hyphdta.hxx         |   30 +-
 main/linguistic/inc/linguistic/lngprophelp.hxx     |   33 +-
 main/linguistic/inc/linguistic/misc.hxx            |    6 +-
 main/linguistic/inc/linguistic/spelldta.hxx        |   14 +-
 main/linguistic/inc/thesdta.hxx                    |    6 +-
 main/linguistic/source/convdic.cxx                 |   19 -
 main/linguistic/source/convdic.hxx                 |   38 +-
 main/linguistic/source/convdiclist.cxx             |   36 +-
 main/linguistic/source/convdiclist.hxx             |   20 +-
 main/linguistic/source/convdicxml.cxx              |    4 -
 main/linguistic/source/convdicxml.hxx              |    8 +-
 main/linguistic/source/dicimp.cxx                  |   27 -
 main/linguistic/source/dicimp.hxx                  |   78 +-
 main/linguistic/source/dlistimp.cxx                |   32 +-
 main/linguistic/source/dlistimp.hxx                |   36 +-
 main/linguistic/source/gciterator.cxx              |   17 +-
 main/linguistic/source/gciterator.hxx              |   28 +-
 main/linguistic/source/hhconvdic.cxx               |    6 +-
 main/linguistic/source/hhconvdic.hxx               |    8 +-
 main/linguistic/source/hyphdsp.cxx                 |    5 -
 main/linguistic/source/hyphdsp.hxx                 |   18 +-
 main/linguistic/source/hyphdta.cxx                 |   10 -
 main/linguistic/source/iprcache.cxx                |    3 -
 main/linguistic/source/lngopt.cxx                  |   21 -
 main/linguistic/source/lngopt.hxx                  |   34 +-
 main/linguistic/source/lngprophelp.cxx             |   11 -
 main/linguistic/source/lngsvcmgr.cxx               |   28 +-
 main/linguistic/source/lngsvcmgr.hxx               |   30 +-
 main/linguistic/source/misc.cxx                    |    3 -
 main/linguistic/source/spelldsp.cxx                |   10 -
 main/linguistic/source/spelldsp.hxx                |   22 +-
 main/linguistic/source/spelldta.cxx                |    7 -
 main/linguistic/source/thesdsp.cxx                 |    3 -
 main/linguistic/source/thesdsp.hxx                 |   10 +-
 main/linguistic/source/thesdta.cxx                 |    2 +-
 main/linguistic/workben/sprophelp.cxx              |    4 -
 main/linguistic/workben/sprophelp.hxx              |   15 +-
 main/linguistic/workben/sspellimp.cxx              |   15 -
 main/linguistic/workben/sspellimp.hxx              |   44 +-
 main/mysqlc/source/mysqlc_connection.cxx           |   25 -
 main/mysqlc/source/mysqlc_connection.hxx           |   76 +-
 main/mysqlc/source/mysqlc_databasemetadata.cxx     |  149 ---
 main/mysqlc/source/mysqlc_databasemetadata.hxx     |  301 +++---
 main/mysqlc/source/mysqlc_driver.cxx               |   12 -
 main/mysqlc/source/mysqlc_driver.hxx               |   24 +-
 main/mysqlc/source/mysqlc_general.cxx              |    2 -
 main/mysqlc/source/mysqlc_general.hxx              |    6 +-
 main/mysqlc/source/mysqlc_preparedstatement.cxx    |   38 -
 main/mysqlc/source/mysqlc_preparedstatement.hxx    |   94 +-
 main/mysqlc/source/mysqlc_resultset.cxx            |   86 +-
 main/mysqlc/source/mysqlc_resultset.hxx            |  193 ++--
 main/mysqlc/source/mysqlc_resultsetmetadata.cxx    |   22 -
 main/mysqlc/source/mysqlc_resultsetmetadata.hxx    |   44 +-
 main/mysqlc/source/mysqlc_statement.cxx            |   20 -
 main/mysqlc/source/mysqlc_statement.hxx            |   53 +-
 main/mysqlc/source/mysqlc_subcomponent.hxx         |   14 +-
 main/nss/makefile.mk                               |    5 +
 main/nss/nss_win_hostarch.patch                    |   33 +
 .../Addons/ProtocolHandlerAddon_cpp/addon.cxx      |   17 +-
 .../Addons/ProtocolHandlerAddon_cpp/addon.hxx      |   37 +-
 .../Components/CppComponent/service1_impl.cxx      |   32 +-
 .../Components/CppComponent/service2_impl.cxx      |   24 +-
 .../Database/DriverSkeleton/OSubComponent.hxx      |   14 +-
 .../Database/DriverSkeleton/SConnection.cxx        |   46 +-
 .../Database/DriverSkeleton/SConnection.hxx        |   48 +-
 .../Database/DriverSkeleton/SDatabaseMetaData.cxx  |  298 +++---
 .../Database/DriverSkeleton/SDatabaseMetaData.hxx  |  298 +++---
 .../Database/DriverSkeleton/SDriver.cxx            |   23 +-
 .../Database/DriverSkeleton/SDriver.hxx            |   22 +-
 .../Database/DriverSkeleton/SPreparedStatement.cxx |   70 +-
 .../Database/DriverSkeleton/SPreparedStatement.hxx |   71 +-
 .../Database/DriverSkeleton/SResultSet.cxx         |  162 ++-
 .../Database/DriverSkeleton/SResultSet.hxx         |  160 ++-
 .../Database/DriverSkeleton/SResultSetMetaData.cxx |   42 +-
 .../Database/DriverSkeleton/SResultSetMetaData.hxx |   42 +-
 .../Database/DriverSkeleton/SStatement.cxx         |   39 +-
 .../Database/DriverSkeleton/SStatement.hxx         |   41 +-
 .../FlatXmlFilterDetection/filterdetect.cxx        |    9 -
 .../FlatXmlFilterDetection/filterdetect.hxx        |   33 +-
 .../FlatXmlFilter_cpp/FlatXml.cxx                  |   42 +-
 .../cpp/complextoolbarcontrols/ListenerHelper.cxx  |    2 +-
 .../cpp/complextoolbarcontrols/ListenerHelper.h    |    2 +-
 .../complextoolbarcontrols/MyProtocolHandler.cxx   |   19 +-
 .../cpp/complextoolbarcontrols/MyProtocolHandler.h |   40 +-
 main/odk/examples/cpp/counter/counter.cxx          |   19 +-
 main/odk/examples/cpp/custompanel/ctp_factory.cxx  |   14 +-
 main/odk/examples/cpp/custompanel/ctp_factory.hxx  |   14 +-
 main/odk/examples/cpp/custompanel/ctp_panel.cxx    |   16 +-
 main/odk/examples/cpp/custompanel/ctp_panel.hxx    |   16 +-
 .../odk/examples/cpp/remoteclient/remoteclient.cxx |    5 +-
 main/odk/pack/copying/dk.mk                        |    7 +
 main/odk/pack/copying/makefile.mk                  |    9 +-
 main/odk/settings/platform.mk                      |   13 +-
 main/odk/util/check.pl                             |    6 +-
 main/oox/inc/oox/core/binaryfilterbase.hxx         |    3 +-
 main/oox/inc/oox/core/contexthandler.hxx           |   18 +-
 main/oox/inc/oox/core/contexthandler2.hxx          |   16 +-
 main/oox/inc/oox/core/encryption.hxx               |    8 +-
 main/oox/inc/oox/core/fastparser.hxx               |   18 +-
 main/oox/inc/oox/core/fasttokenhandler.hxx         |   14 +-
 main/oox/inc/oox/core/filterbase.hxx               |   30 +-
 main/oox/inc/oox/core/filterdetect.hxx             |   36 +-
 main/oox/inc/oox/core/fragmenthandler.hxx          |   24 +-
 main/oox/inc/oox/core/fragmenthandler2.hxx         |   24 +-
 main/oox/inc/oox/core/recordparser.hxx             |    5 +-
 main/oox/inc/oox/core/relationshandler.hxx         |    3 +-
 main/oox/inc/oox/core/xmlfilterbase.hxx            |    3 +-
 main/oox/inc/oox/drawingml/clrschemecontext.hxx    |    2 +-
 main/oox/inc/oox/drawingml/colorchoicecontext.hxx  |    9 +-
 .../inc/oox/drawingml/connectorshapecontext.hxx    |    2 +-
 main/oox/inc/oox/drawingml/customshapegeometry.hxx |    6 +-
 .../inc/oox/drawingml/diagram/datamodelcontext.hxx |    2 +-
 .../drawingml/diagram/diagramfragmenthandler.hxx   |   16 +-
 .../oox/drawingml/fillpropertiesgroupcontext.hxx   |   18 +-
 main/oox/inc/oox/drawingml/graphicshapecontext.hxx |   11 +-
 main/oox/inc/oox/drawingml/guidcontext.hxx         |    2 +-
 .../inc/oox/drawingml/linepropertiescontext.hxx    |    3 +-
 .../oox/inc/oox/drawingml/objectdefaultcontext.hxx |    2 +-
 main/oox/inc/oox/drawingml/shapecontext.hxx        |    4 +-
 main/oox/inc/oox/drawingml/shapegroupcontext.hxx   |    2 +-
 .../inc/oox/drawingml/shapepropertiescontext.hxx   |    2 +-
 main/oox/inc/oox/drawingml/shapestylecontext.hxx   |    4 +-
 main/oox/inc/oox/drawingml/spdefcontext.hxx        |    2 +-
 .../table/tablebackgroundstylecontext.hxx          |    2 +-
 .../inc/oox/drawingml/table/tablecellcontext.hxx   |    2 +-
 main/oox/inc/oox/drawingml/table/tablecontext.hxx  |    2 +-
 .../oox/drawingml/table/tablepartstylecontext.hxx  |    2 +-
 .../inc/oox/drawingml/table/tablerowcontext.hxx    |    2 +-
 .../drawingml/table/tablestylecellstylecontext.hxx |    2 +-
 .../inc/oox/drawingml/table/tablestylecontext.hxx  |    2 +-
 .../table/tablestylelistfragmenthandler.hxx        |    2 +-
 .../drawingml/table/tablestyletextstylecontext.hxx |    2 +-
 main/oox/inc/oox/drawingml/textbodycontext.hxx     |   10 +-
 .../oox/drawingml/textbodypropertiescontext.hxx    |    4 +-
 .../drawingml/textcharacterpropertiescontext.hxx   |    4 +-
 main/oox/inc/oox/drawingml/textfieldcontext.hxx    |    7 +-
 .../oox/inc/oox/drawingml/textliststylecontext.hxx |    4 +-
 .../drawingml/textparagraphpropertiescontext.hxx   |    4 +-
 .../oox/inc/oox/drawingml/themeelementscontext.hxx |    3 +-
 main/oox/inc/oox/drawingml/transform2dcontext.hxx  |    2 +-
 main/oox/inc/oox/helper/openssl_wrapper.hxx        |   24 +-
 main/oox/inc/oox/ole/vbaprojectfilter.hxx          |    6 +-
 main/oox/inc/oox/ppt/backgroundproperties.hxx      |    2 +-
 main/oox/inc/oox/ppt/layoutfragmenthandler.hxx     |    4 +-
 main/oox/inc/oox/ppt/pptimport.hxx                 |    3 +-
 main/oox/inc/oox/ppt/pptshapecontext.hxx           |    2 +-
 main/oox/inc/oox/ppt/pptshapegroupcontext.hxx      |    2 +-
 main/oox/inc/oox/ppt/pptshapepropertiescontext.hxx |    3 +-
 .../inc/oox/ppt/presentationfragmenthandler.hxx    |    6 +-
 main/oox/inc/oox/ppt/slidefragmenthandler.hxx      |    4 +-
 .../inc/oox/ppt/slidemastertextstylescontext.hxx   |    2 +-
 main/oox/inc/oox/ppt/slidetimingcontext.hxx        |    6 +-
 main/oox/inc/oox/ppt/slidetransitioncontext.hxx    |    5 +-
 main/oox/inc/oox/ppt/soundactioncontext.hxx        |    4 +-
 main/oox/inc/oox/ppt/timenodelistcontext.hxx       |    3 +-
 main/oox/inc/oox/vml/vmlinputstream.hxx            |   21 +-
 main/oox/inc/oox/xls/biffdetector.hxx              |   13 +-
 main/oox/inc/oox/xls/drawingfragment.hxx           |    3 +-
 main/oox/inc/oox/xls/excelfilter.hxx               |    9 +-
 main/oox/inc/oox/xls/ooxformulaparser.hxx          |   19 +-
 main/oox/source/core/binaryfilterbase.cxx          |    2 +-
 main/oox/source/core/contexthandler.cxx            |   18 +-
 main/oox/source/core/contexthandler2.cxx           |    8 +-
 main/oox/source/core/encryption.cxx                |   94 +-
 main/oox/source/core/fastparser.cxx                |   12 +-
 main/oox/source/core/fasttokenhandler.cxx          |   16 +-
 main/oox/source/core/filterbase.cxx                |   26 +-
 main/oox/source/core/filterdetect.cxx              |   25 +-
 main/oox/source/core/fragmenthandler.cxx           |   24 +-
 main/oox/source/core/fragmenthandler2.cxx          |   12 +-
 main/oox/source/core/recordparser.cxx              |   22 +-
 main/oox/source/core/relationshandler.cxx          |    2 +-
 main/oox/source/core/services.cxx                  |    2 +-
 main/oox/source/core/xmlfilterbase.cxx             |    6 +-
 main/oox/source/docprop/docprophandler.cxx         |   12 -
 main/oox/source/docprop/docprophandler.hxx         |   24 +-
 main/oox/source/docprop/ooxmldocpropimport.cxx     |   11 +-
 main/oox/source/docprop/ooxmldocpropimport.hxx     |    9 +-
 main/oox/source/drawingml/clrschemecontext.cxx     |    2 +-
 main/oox/source/drawingml/colorchoicecontext.cxx   |    5 +-
 .../oox/source/drawingml/connectorshapecontext.cxx |    2 +-
 main/oox/source/drawingml/customshapegeometry.cxx  |   51 +-
 .../source/drawingml/diagram/datamodelcontext.cxx  |    6 -
 .../drawingml/diagram/diagramdefinitioncontext.cxx |    2 -
 .../drawingml/diagram/diagramdefinitioncontext.hxx |    4 +-
 .../drawingml/diagram/diagramfragmenthandler.cxx   |    8 -
 .../source/drawingml/diagram/layoutnodecontext.cxx |    4 -
 .../source/drawingml/diagram/layoutnodecontext.hxx |    4 +-
 .../drawingml/fillpropertiesgroupcontext.cxx       |   11 +-
 main/oox/source/drawingml/graphicshapecontext.cxx  |    8 +-
 main/oox/source/drawingml/guidcontext.cxx          |    2 +-
 main/oox/source/drawingml/hyperlinkcontext.cxx     |    2 +-
 main/oox/source/drawingml/hyperlinkcontext.hxx     |    2 +-
 .../oox/source/drawingml/linepropertiescontext.cxx |    2 +-
 main/oox/source/drawingml/objectdefaultcontext.cxx |    2 +-
 main/oox/source/drawingml/shapecontext.cxx         |    4 +-
 main/oox/source/drawingml/shapegroupcontext.cxx    |    2 +-
 .../source/drawingml/shapepropertiescontext.cxx    |    2 +-
 main/oox/source/drawingml/shapestylecontext.cxx    |    3 +-
 main/oox/source/drawingml/spdefcontext.cxx         |    2 +-
 .../table/tablebackgroundstylecontext.cxx          |    1 -
 .../source/drawingml/table/tablecellcontext.cxx    |    1 -
 main/oox/source/drawingml/table/tablecontext.cxx   |    1 -
 .../drawingml/table/tablepartstylecontext.cxx      |    1 -
 .../oox/source/drawingml/table/tablerowcontext.cxx |    1 -
 .../drawingml/table/tablestylecellstylecontext.cxx |    1 -
 .../source/drawingml/table/tablestylecontext.cxx   |    1 -
 .../table/tablestylelistfragmenthandler.cxx        |    1 -
 .../drawingml/table/tablestyletextstylecontext.cxx |    1 -
 main/oox/source/drawingml/textbodycontext.cxx      |   18 +-
 .../source/drawingml/textbodypropertiescontext.cxx |    4 +-
 .../drawingml/textcharacterpropertiescontext.cxx   |    4 +-
 main/oox/source/drawingml/textfieldcontext.cxx     |    5 +-
 main/oox/source/drawingml/textliststylecontext.cxx |    4 +-
 .../drawingml/textparagraphpropertiescontext.cxx   |    4 +-
 main/oox/source/drawingml/textspacingcontext.cxx   |    2 -
 main/oox/source/drawingml/textspacingcontext.hxx   |    4 +-
 .../source/drawingml/texttabstoplistcontext.cxx    |    2 -
 .../source/drawingml/texttabstoplistcontext.hxx    |    4 +-
 main/oox/source/drawingml/themeelementscontext.cxx |   19 +-
 main/oox/source/drawingml/transform2dcontext.cxx   |    2 +-
 main/oox/source/helper/openssl_wrapper.cxx         |    2 +-
 main/oox/source/helper/propertymap.cxx             |   40 +-
 main/oox/source/helper/textinputstream.cxx         |   26 +-
 main/oox/source/ole/olestorage.cxx                 |   32 +-
 main/oox/source/ole/vbaprojectfilter.cxx           |    6 +-
 main/oox/source/ppt/animvariantcontext.cxx         |    2 -
 main/oox/source/ppt/animvariantcontext.hxx         |    4 +-
 main/oox/source/ppt/backgroundproperties.cxx       |    2 +-
 main/oox/source/ppt/buildlistcontext.cxx           |    3 +-
 main/oox/source/ppt/buildlistcontext.hxx           |    4 +-
 main/oox/source/ppt/commonbehaviorcontext.cxx      |    3 -
 main/oox/source/ppt/commonbehaviorcontext.hxx      |   12 +-
 main/oox/source/ppt/commontimenodecontext.cxx      |    4 +-
 main/oox/source/ppt/commontimenodecontext.hxx      |    4 +-
 main/oox/source/ppt/conditioncontext.cxx           |    4 +-
 main/oox/source/ppt/conditioncontext.hxx           |    4 +-
 main/oox/source/ppt/customshowlistcontext.cxx      |    5 +-
 main/oox/source/ppt/customshowlistcontext.hxx      |    3 +-
 main/oox/source/ppt/layoutfragmenthandler.cxx      |    2 -
 main/oox/source/ppt/pptimport.cxx                  |    4 +-
 main/oox/source/ppt/pptshapecontext.cxx            |    2 +-
 main/oox/source/ppt/pptshapegroupcontext.cxx       |    2 +-
 main/oox/source/ppt/pptshapepropertiescontext.cxx  |    1 -
 .../oox/source/ppt/presentationfragmenthandler.cxx |    6 +-
 main/oox/source/ppt/slidefragmenthandler.cxx       |    4 +-
 .../source/ppt/slidemastertextstylescontext.cxx    |    2 +-
 main/oox/source/ppt/slidetimingcontext.cxx         |    6 +-
 main/oox/source/ppt/slidetransitioncontext.cxx     |    4 +-
 main/oox/source/ppt/soundactioncontext.cxx         |    4 +-
 main/oox/source/ppt/timeanimvaluecontext.cxx       |    2 -
 main/oox/source/ppt/timeanimvaluecontext.hxx       |    4 +-
 main/oox/source/ppt/timenodelistcontext.cxx        |   24 +-
 main/oox/source/ppt/timetargetelementcontext.cxx   |    5 +-
 main/oox/source/ppt/timetargetelementcontext.hxx   |    4 +-
 main/oox/source/shape/ShapeContextHandler.cxx      |   29 +-
 main/oox/source/shape/ShapeContextHandler.hxx      |   58 +-
 main/oox/source/shape/ShapeFilterBase.cxx          |    2 +-
 main/oox/source/shape/ShapeFilterBase.hxx          |    3 +-
 main/oox/source/vml/vmlinputstream.cxx             |   13 +-
 main/oox/source/xls/biffdetector.cxx               |   12 +-
 main/oox/source/xls/drawingfragment.cxx            |    2 +-
 main/oox/source/xls/excelfilter.cxx                |   12 +-
 main/oox/source/xls/ooxformulaparser.cxx           |   16 +-
 main/package/inc/ByteChucker.hxx                   |    6 +-
 main/package/inc/ByteGrabber.hxx                   |   12 +-
 main/package/inc/CRC32.hxx                         |   15 +-
 main/package/inc/ZipFile.hxx                       |   41 +-
 main/package/inc/ZipOutputStream.hxx               |   36 +-
 main/package/inc/ZipPackage.hxx                    |   60 +-
 main/package/inc/ZipPackageBuffer.hxx              |   33 +-
 main/package/inc/ZipPackageEntry.hxx               |   36 +-
 main/package/inc/ZipPackageFolder.hxx              |   54 +-
 main/package/inc/ZipPackageStream.hxx              |   51 +-
 main/package/inc/zipfileaccess.hxx                 |   26 +-
 .../source/package/manifest/ManifestImport.cxx     |    8 -
 .../source/package/manifest/ManifestImport.hxx     |   24 +-
 .../source/package/manifest/ManifestReader.cxx     |    4 -
 .../source/package/manifest/ManifestReader.hxx     |   12 +-
 .../source/package/manifest/ManifestWriter.cxx     |    4 -
 .../source/package/manifest/ManifestWriter.hxx     |   12 +-
 main/package/source/package/zipapi/ByteChucker.cxx |    2 -
 main/package/source/package/zipapi/ByteGrabber.cxx |    4 -
 main/package/source/package/zipapi/CRC32.cxx       |    5 -
 .../source/package/zipapi/MemoryByteGrabber.hxx    |    8 -
 .../source/package/zipapi/XUnbufferedStream.cxx    |    5 -
 .../source/package/zipapi/XUnbufferedStream.hxx    |   15 +-
 main/package/source/package/zipapi/ZipFile.cxx     |   17 -
 .../source/package/zipapi/ZipOutputStream.cxx      |   12 -
 .../source/package/zipapi/blowfishcontext.cxx      |    2 -
 .../source/package/zipapi/blowfishcontext.hxx      |    4 +-
 main/package/source/package/zipapi/sha1context.cxx |    2 -
 main/package/source/package/zipapi/sha1context.hxx |    4 +-
 .../source/package/zippackage/ZipPackage.cxx       |   27 -
 .../source/package/zippackage/ZipPackageBuffer.cxx |   11 -
 .../source/package/zippackage/ZipPackageEntry.cxx  |    9 -
 .../source/package/zippackage/ZipPackageFolder.cxx |   18 -
 .../zippackage/ZipPackageFolderEnumeration.cxx     |    5 -
 .../zippackage/ZipPackageFolderEnumeration.hxx     |   15 +-
 .../source/package/zippackage/ZipPackageSink.cxx   |    2 -
 .../source/package/zippackage/ZipPackageSink.hxx   |    6 +-
 .../source/package/zippackage/ZipPackageStream.cxx |   23 -
 .../package/zippackage/wrapstreamforshare.cxx      |   25 -
 .../package/zippackage/wrapstreamforshare.hxx      |   21 +-
 .../source/package/zippackage/zipfileaccess.cxx    |   18 -
 main/package/source/xstor/disposelistener.cxx      |    1 -
 main/package/source/xstor/disposelistener.hxx      |    2 +-
 main/package/source/xstor/ocompinstream.cxx        |   70 --
 main/package/source/xstor/ocompinstream.hxx        |   62 +-
 main/package/source/xstor/ohierarchyholder.cxx     |    5 -
 main/package/source/xstor/ohierarchyholder.hxx     |   15 +-
 main/package/source/xstor/oseekinstream.cxx        |    9 -
 main/package/source/xstor/oseekinstream.hxx        |   10 +-
 main/package/source/xstor/owriteablestream.cxx     |  107 --
 main/package/source/xstor/owriteablestream.hxx     |  109 +-
 .../source/xstor/selfterminatefilestream.cxx       |   25 -
 .../source/xstor/selfterminatefilestream.hxx       |   21 +-
 .../source/xstor/switchpersistencestream.cxx       |   15 -
 .../source/xstor/switchpersistencestream.hxx       |   30 +-
 main/package/source/xstor/xfactory.cxx             |    7 -
 main/package/source/xstor/xfactory.hxx             |   10 +-
 main/package/source/xstor/xstorage.cxx             |  272 -----
 main/package/source/xstor/xstorage.hxx             |  440 ++------
 main/padmin/source/desktopcontext.cxx              |    2 +-
 main/padmin/source/desktopcontext.hxx              |    3 +-
 main/postprocess/rebase/makefile.mk                |   12 +
 main/postprocess/rebase/rebase.pl                  |   21 +-
 main/python/makefile.mk                            |   78 +-
 main/python/prj/build.lst                          |    2 +-
 main/python/prj/d.lst                              |   97 +-
 main/pyuno/inc/pyuno/pyuno.hxx                     |   21 +-
 main/pyuno/source/loader/pyuno_loader.cxx          |    5 +-
 main/pyuno/source/module/pyuno_adapter.cxx         |    9 +-
 main/pyuno/source/module/pyuno_except.cxx          |    1 -
 main/pyuno/source/module/pyuno_impl.hxx            |   56 +-
 main/pyuno/source/module/pyuno_module.cxx          |    2 +-
 main/pyuno/source/module/pyuno_runtime.cxx         |   18 +-
 main/pyuno/source/module/pyuno_type.cxx            |    6 +-
 main/pyuno/source/module/pyuno_util.cxx            |    1 -
 main/rdbmaker/inc/codemaker/options.hxx            |    6 +-
 main/rdbmaker/source/codemaker/options.cxx         |    1 -
 main/rdbmaker/source/rdbmaker/rdbmaker.cxx         |    1 -
 main/rdbmaker/source/rdbmaker/rdboptions.cxx       |    1 -
 main/rdbmaker/source/rdbmaker/rdboptions.hxx       |    3 +-
 main/rdbmaker/source/rdbmaker/rdbtype.cxx          |    2 -
 main/rdbmaker/source/rdbmaker/rdbtype.hxx          |    3 +-
 main/redland/rasqal/makefile.mk                    |    5 +
 main/redland/rasqal/rasqal-0.9.33.patch.ucrt       |   33 +
 main/redland/redland/makefile.mk                   |    5 +
 main/redland/redland/redland-1.0.17.patch.ucrt     |   15 +
 main/remotebridges/examples/officeclient.cxx       |    5 +-
 .../source/unourl_resolver/unourl_resolver.cxx     |   13 +-
 main/reportdesign/inc/PropertyForward.hxx          |    4 +-
 main/reportdesign/inc/ReportDefinition.hxx         |  242 ++---
 main/reportdesign/inc/ReportHelperDefines.hxx      |  308 +++---
 main/reportdesign/inc/RptObject.hxx                |    4 +-
 main/reportdesign/inc/UndoActions.hxx              |   12 +-
 main/reportdesign/inc/UndoEnv.hxx                  |   12 +-
 main/reportdesign/source/core/api/FixedLine.cxx    |  132 +--
 main/reportdesign/source/core/api/FixedText.cxx    |   80 +-
 .../source/core/api/FormatCondition.cxx            |   34 +-
 .../source/core/api/FormattedField.cxx             |   84 +-
 main/reportdesign/source/core/api/Function.cxx     |   50 +-
 main/reportdesign/source/core/api/Functions.cxx    |   26 +-
 main/reportdesign/source/core/api/Group.cxx        |   72 +-
 main/reportdesign/source/core/api/Groups.cxx       |   28 +-
 main/reportdesign/source/core/api/ImageControl.cxx |  110 +-
 .../source/core/api/ReportControlModel.cxx         |   16 +-
 .../source/core/api/ReportDefinition.cxx           |  328 +++---
 .../source/core/api/ReportEngineJFree.cxx          |   52 +-
 main/reportdesign/source/core/api/Section.cxx      |  106 +-
 main/reportdesign/source/core/api/Shape.cxx        |  108 +-
 main/reportdesign/source/core/inc/FixedLine.hxx    |   80 +-
 main/reportdesign/source/core/inc/FixedText.hxx    |   60 +-
 .../source/core/inc/FormatCondition.hxx            |   38 +-
 .../source/core/inc/FormattedField.hxx             |   64 +-
 main/reportdesign/source/core/inc/Function.hxx     |   54 +-
 main/reportdesign/source/core/inc/Functions.hxx    |   30 +-
 main/reportdesign/source/core/inc/Group.hxx        |   76 +-
 main/reportdesign/source/core/inc/Groups.hxx       |   32 +-
 main/reportdesign/source/core/inc/ImageControl.hxx |   70 +-
 .../source/core/inc/ReportControlModel.hxx         |   16 +-
 .../source/core/inc/ReportEngineJFree.hxx          |   56 +-
 .../source/core/inc/ReportHelperImpl.hxx           |  518 +++++-----
 .../source/core/inc/RptObjectListener.hxx          |    4 +-
 main/reportdesign/source/core/inc/Section.hxx      |  110 +-
 main/reportdesign/source/core/inc/Shape.hxx        |   80 +-
 .../source/core/sdr/PropertyForward.cxx            |    4 +-
 main/reportdesign/source/core/sdr/RptObject.cxx    |    4 +-
 .../source/core/sdr/RptObjectListener.cxx          |    4 +-
 main/reportdesign/source/core/sdr/UndoActions.cxx  |   12 +-
 main/reportdesign/source/core/sdr/UndoEnv.cxx      |   12 +-
 main/reportdesign/source/filter/xml/dbloader2.cxx  |    4 +-
 main/reportdesign/source/filter/xml/dbloader2.hxx  |    6 +-
 main/reportdesign/source/filter/xml/xmlExport.cxx  |   33 +-
 main/reportdesign/source/filter/xml/xmlExport.hxx  |   32 +-
 .../source/filter/xml/xmlExportDocumentHandler.cxx |   32 +-
 .../source/filter/xml/xmlExportDocumentHandler.hxx |   28 +-
 .../source/filter/xml/xmlImportDocumentHandler.cxx |   32 +-
 .../source/filter/xml/xmlImportDocumentHandler.hxx |   28 +-
 main/reportdesign/source/filter/xml/xmlfilter.cxx  |   30 +-
 main/reportdesign/source/filter/xml/xmlfilter.hxx  |   36 +-
 main/reportdesign/source/ui/dlg/AddField.cxx       |    8 +-
 main/reportdesign/source/ui/dlg/GroupsSorting.cxx  |   20 +-
 main/reportdesign/source/ui/dlg/Navigator.cxx      |   32 +-
 main/reportdesign/source/ui/inc/AddField.hxx       |    8 +-
 .../source/ui/inc/DataProviderHandler.hxx          |   46 +-
 .../source/ui/inc/DefaultInspection.hxx            |   28 +-
 main/reportdesign/source/ui/inc/FixedTextColor.hxx |    4 +-
 .../source/ui/inc/FormattedFieldBeautifier.hxx     |    2 +-
 .../reportdesign/source/ui/inc/GeometryHandler.hxx |   50 +-
 main/reportdesign/source/ui/inc/GroupsSorting.hxx  |    4 +-
 .../source/ui/inc/ReportComponentHandler.hxx       |   46 +-
 .../source/ui/inc/ReportController.hxx             |   58 +-
 .../source/ui/inc/ReportControllerObserver.hxx     |   12 +-
 main/reportdesign/source/ui/inc/ReportSection.hxx  |    2 +-
 main/reportdesign/source/ui/inc/ReportWindow.hxx   |    2 +-
 main/reportdesign/source/ui/inc/ScrollHelper.hxx   |    2 +-
 main/reportdesign/source/ui/inc/SectionWindow.hxx  |    2 +-
 .../source/ui/inc/statusbarcontroller.hxx          |   32 +-
 .../source/ui/inc/toolboxcontroller.hxx            |   28 +-
 .../source/ui/inspection/DataProviderHandler.cxx   |   46 +-
 .../source/ui/inspection/DefaultInspection.cxx     |   28 +-
 .../source/ui/inspection/GeometryHandler.cxx       |   51 +-
 .../ui/inspection/ReportComponentHandler.cxx       |   46 +-
 .../source/ui/misc/statusbarcontroller.cxx         |   28 +-
 .../source/ui/misc/toolboxcontroller.cxx           |   27 +-
 .../source/ui/report/FixedTextColor.cxx            |    4 +-
 .../source/ui/report/FormattedFieldBeautifier.cxx  |    2 +-
 .../source/ui/report/ReportController.cxx          |   55 +-
 .../source/ui/report/ReportControllerObserver.cxx  |   12 +-
 .../source/ui/report/ReportSection.cxx             |    2 +-
 .../reportdesign/source/ui/report/ReportWindow.cxx |    2 +-
 .../reportdesign/source/ui/report/ScrollHelper.cxx |    2 +-
 .../source/ui/report/SectionWindow.cxx             |    2 +-
 main/rsc/inc/rsckey.hxx                            |    6 +-
 main/rsc/source/parser/rscibas.cxx                 |    2 +-
 main/rsc/source/parser/rscinit.cxx                 |   36 +-
 main/rsc/source/parser/rsckey.cxx                  |   12 +-
 main/rsc/source/parser/rsclex.cxx                  |    4 +-
 main/sal/cpprt/operators_new_delete.cxx            |    5 +-
 main/sal/inc/sal/types.h                           |    6 +
 main/sal/inc/systools/win32/snprintf.h             |    9 +
 main/sal/systools/win32/kill/makefile.mk           |   11 +
 main/sal/systools/win32/uwinapi/makefile.mk        |    8 +
 main/sal/systools/win32/uwinapi/sntprintf.c        |   13 +
 main/sal/test/unloading/samplelib1.cxx             |   16 +-
 main/sal/test/unloading/samplelib2.cxx             |   15 +-
 main/salhelper/inc/salhelper/condition.hxx         |    5 +-
 .../inc/salhelper/simplereferenceobject.hxx        |    2 +-
 main/salhelper/source/condition.cxx                |    3 -
 main/salhelper/source/simplereferenceobject.cxx    |    1 -
 main/sax/inc/sax/fastattribs.hxx                   |   14 +-
 main/sax/inc/sax/parser/saxparser.hxx              |    2 +-
 main/sax/inc/xml2utf.hxx                           |    6 +-
 main/sax/source/expatwrap/attrlistimpl.cxx         |   14 +-
 main/sax/source/expatwrap/attrlistimpl.hxx         |   20 +-
 main/sax/source/expatwrap/factory.hxx              |    2 +-
 main/sax/source/expatwrap/sax_expat.cxx            |   34 +-
 main/sax/source/expatwrap/saxwriter.cxx            |  127 +--
 main/sax/source/expatwrap/xml2utf.cxx              |    1 -
 main/sax/source/fastparser/facreg.cxx              |    4 +-
 main/sax/source/fastparser/fastparser.cxx          |   46 +-
 main/sax/source/fastparser/fastparser.hxx          |   28 +-
 main/sax/source/tools/fastattribs.cxx              |   14 +-
 main/sax/source/tools/fastserializer.cxx           |   21 +-
 main/sax/source/tools/fastserializer.hxx           |   39 +-
 main/sax/test/sax/factory.hxx                      |    2 +-
 main/sax/test/sax/testsax.cxx                      |   57 +-
 main/sax/test/sax/testwriter.cxx                   |   64 +-
 main/sax/test/saxdemo.cxx                          |   72 +-
 main/sc/inc/AccessibleFilterMenu.hxx               |   69 +-
 main/sc/inc/AccessibleFilterMenuItem.hxx           |   33 +-
 main/sc/inc/AccessibleFilterTopWindow.hxx          |    9 +-
 main/sc/inc/AccessibleGlobal.hxx                   |   12 +-
 main/sc/inc/ScPanelFactory.hxx                     |    6 +-
 main/sc/inc/addruno.hxx                            |   44 +-
 main/sc/inc/afmtuno.hxx                            |  161 +--
 main/sc/inc/appluno.hxx                            |  100 +-
 main/sc/inc/cellsuno.hxx                           |  873 ++++++----------
 main/sc/inc/chart2uno.hxx                          |  208 ++--
 main/sc/inc/chartuno.hxx                           |   82 +-
 main/sc/inc/confuno.hxx                            |   44 +-
 main/sc/inc/cursuno.hxx                            |   61 +-
 main/sc/inc/dapiuno.hxx                            |  484 +++------
 main/sc/inc/datauno.hxx                            |  293 ++----
 main/sc/inc/defltuno.hxx                           |   61 +-
 main/sc/inc/dispuno.hxx                            |   34 +-
 main/sc/inc/docuno.hxx                             |  491 +++------
 main/sc/inc/dptabsrc.hxx                           |  332 ++----
 main/sc/inc/eventuno.hxx                           |   31 +-
 main/sc/inc/fielduno.hxx                           |  228 ++---
 main/sc/inc/filtuno.hxx                            |   31 +-
 main/sc/inc/fmtuno.hxx                             |  158 +--
 main/sc/inc/funcuno.hxx                            |   49 +-
 main/sc/inc/linkuno.hxx                            |  328 ++----
 main/sc/inc/miscuno.hxx                            |   48 +-
 main/sc/inc/nameuno.hxx                            |  211 ++--
 main/sc/inc/notesuno.hxx                           |   53 +-
 main/sc/inc/optuno.hxx                             |   12 +-
 main/sc/inc/pageuno.hxx                            |    9 +-
 main/sc/inc/shapeuno.hxx                           |  124 +--
 main/sc/inc/srchuno.hxx                            |   57 +-
 main/sc/inc/styleuno.hxx                           |  224 ++--
 main/sc/inc/targuno.hxx                            |   80 +-
 main/sc/inc/textuno.hxx                            |   99 +-
 main/sc/inc/tokenuno.hxx                           |   50 +-
 main/sc/inc/viewuno.hxx                            |  192 ++--
 main/sc/source/core/data/dptabsrc.cxx              |   96 +-
 main/sc/source/core/data/table5.cxx                |    1 +
 main/sc/source/core/inc/addinlis.hxx               |   15 +-
 main/sc/source/core/tool/addinlis.cxx              |    2 -
 main/sc/source/filter/xml/XMLCodeNameProvider.cxx  |    6 -
 main/sc/source/filter/xml/XMLCodeNameProvider.hxx  |   17 +-
 main/sc/source/filter/xml/xmlexprt.cxx             |   28 +-
 main/sc/source/filter/xml/xmlexprt.hxx             |   16 +-
 main/sc/source/filter/xml/xmlimprt.cxx             |   14 +-
 main/sc/source/filter/xml/xmlimprt.hxx             |   10 +-
 main/sc/source/ui/Accessibility/AccessibleCell.cxx |   14 +-
 .../source/ui/Accessibility/AccessibleCellBase.cxx |   18 -
 .../ui/Accessibility/AccessibleContextBase.cxx     |   38 -
 .../ui/Accessibility/AccessibleCsvControl.cxx      |  132 +--
 .../Accessibility/AccessibleDataPilotControl.cxx   |   99 +-
 .../source/ui/Accessibility/AccessibleDocument.cxx |   41 +-
 .../AccessibleDocumentPagePreview.cxx              |   20 +-
 .../ui/Accessibility/AccessibleEditObject.cxx      |   26 -
 .../ui/Accessibility/AccessibleFilterMenu.cxx      |   29 +-
 .../ui/Accessibility/AccessibleFilterMenuItem.cxx  |   13 +-
 .../ui/Accessibility/AccessibleFilterTopWindow.cxx |    6 +-
 .../source/ui/Accessibility/AccessibleGlobal.cxx   |    6 +-
 .../ui/Accessibility/AccessiblePageHeader.cxx      |   18 +-
 .../ui/Accessibility/AccessiblePageHeaderArea.cxx  |   12 -
 .../ui/Accessibility/AccessiblePreviewCell.cxx     |   15 +-
 .../Accessibility/AccessiblePreviewHeaderCell.cxx  |   30 +-
 .../ui/Accessibility/AccessiblePreviewTable.cxx    |   48 +-
 .../ui/Accessibility/AccessibleSpreadsheet.cxx     |   31 +-
 .../ui/Accessibility/AccessibleTableBase.cxx       |   41 -
 .../ui/Accessibility/DrawModelBroadcaster.cxx      |    2 -
 main/sc/source/ui/app/drwtrans.cxx                 |    2 +-
 main/sc/source/ui/app/transobj.cxx                 |    2 +-
 main/sc/source/ui/inc/AccessibleCell.hxx           |   37 +-
 main/sc/source/ui/inc/AccessibleCellBase.hxx       |   56 +-
 main/sc/source/ui/inc/AccessibleContextBase.hxx    |  111 +-
 main/sc/source/ui/inc/AccessibleCsvControl.hxx     |  264 ++---
 .../source/ui/inc/AccessibleDataPilotControl.hxx   |   42 +-
 main/sc/source/ui/inc/AccessibleDocument.hxx       |   89 +-
 .../ui/inc/AccessibleDocumentPagePreview.hxx       |   40 +-
 main/sc/source/ui/inc/AccessibleEditObject.hxx     |   73 +-
 main/sc/source/ui/inc/AccessiblePageHeader.hxx     |   29 +-
 main/sc/source/ui/inc/AccessiblePageHeaderArea.hxx |   30 +-
 main/sc/source/ui/inc/AccessiblePreviewCell.hxx    |   26 +-
 .../source/ui/inc/AccessiblePreviewHeaderCell.hxx  |   47 +-
 main/sc/source/ui/inc/AccessiblePreviewTable.hxx   |  100 +-
 main/sc/source/ui/inc/AccessibleSpreadsheet.hxx    |   97 +-
 main/sc/source/ui/inc/AccessibleTableBase.hxx      |  136 +--
 .../source/ui/inc/ChartRangeSelectionListener.hxx  |   15 +-
 main/sc/source/ui/inc/DrawModelBroadcaster.hxx     |    6 +-
 main/sc/source/ui/inc/drwtrans.hxx                 |    2 +-
 main/sc/source/ui/inc/transobj.hxx                 |    2 +-
 main/sc/source/ui/sidebar/ScPanelFactory.cxx       |    4 -
 .../ui/unoobj/ChartRangeSelectionListener.cxx      |    2 -
 main/sc/source/ui/unoobj/addruno.cxx               |   10 +-
 main/sc/source/ui/unoobj/afmtuno.cxx               |   45 +-
 main/sc/source/ui/unoobj/appluno.cxx               |   57 +-
 main/sc/source/ui/unoobj/celllistsource.cxx        |   28 +-
 main/sc/source/ui/unoobj/celllistsource.hxx        |   30 +-
 main/sc/source/ui/unoobj/cellsuno.cxx              |  399 ++------
 main/sc/source/ui/unoobj/cellvaluebinding.cxx      |   32 +-
 main/sc/source/ui/unoobj/cellvaluebinding.hxx      |   35 +-
 main/sc/source/ui/unoobj/chart2uno.cxx             |   80 +-
 main/sc/source/ui/unoobj/chartuno.cxx              |   39 +-
 main/sc/source/ui/unoobj/confuno.cxx               |   10 +-
 main/sc/source/ui/unoobj/cursuno.cxx               |   37 +-
 main/sc/source/ui/unoobj/dapiuno.cxx               |  154 +--
 main/sc/source/ui/unoobj/datauno.cxx               |   93 +-
 main/sc/source/ui/unoobj/defltuno.cxx              |   11 -
 main/sc/source/ui/unoobj/dispuno.cxx               |   12 -
 main/sc/source/ui/unoobj/docuno.cxx                |  172 +---
 main/sc/source/ui/unoobj/eventuno.cxx              |   11 +-
 main/sc/source/ui/unoobj/fielduno.cxx              |   78 +-
 main/sc/source/ui/unoobj/filtuno.cxx               |   10 +-
 main/sc/source/ui/unoobj/fmtuno.cxx                |   56 +-
 main/sc/source/ui/unoobj/funcuno.cxx               |   12 +-
 main/sc/source/ui/unoobj/linkuno.cxx               |  111 +-
 main/sc/source/ui/unoobj/miscuno.cxx               |   16 +-
 main/sc/source/ui/unoobj/nameuno.cxx               |   87 +-
 main/sc/source/ui/unoobj/notesuno.cxx              |   28 +-
 main/sc/source/ui/unoobj/optuno.cxx                |    5 -
 main/sc/source/ui/unoobj/pageuno.cxx               |    3 -
 main/sc/source/ui/unoobj/scdetect.cxx              |   10 +-
 main/sc/source/ui/unoobj/scdetect.hxx              |    2 +-
 main/sc/source/ui/unoobj/servuno.cxx               |   12 +-
 main/sc/source/ui/unoobj/shapeuno.cxx              |   70 +-
 main/sc/source/ui/unoobj/srchuno.cxx               |   18 +-
 main/sc/source/ui/unoobj/styleuno.cxx              |   86 +-
 main/sc/source/ui/unoobj/targuno.cxx               |   28 +-
 main/sc/source/ui/unoobj/textuno.cxx               |   53 +-
 main/sc/source/ui/unoobj/tokenuno.cxx              |    8 -
 main/sc/source/ui/unoobj/unodoc.cxx                |    2 +-
 main/sc/source/ui/unoobj/viewuno.cxx               |   96 +-
 main/sc/source/ui/vba/excelvbahelper.cxx           |   22 +-
 main/sc/source/ui/vba/excelvbahelper.hxx           |   16 +-
 main/sc/source/ui/vba/testvba/testvba.cxx          |    4 +-
 main/sc/source/ui/vba/vbaapplication.cxx           |  114 +--
 main/sc/source/ui/vba/vbaapplication.hxx           |  118 +--
 main/sc/source/ui/vba/vbaassistant.cxx             |   22 +-
 main/sc/source/ui/vba/vbaassistant.hxx             |   22 +-
 main/sc/source/ui/vba/vbaaxes.cxx                  |   20 +-
 main/sc/source/ui/vba/vbaaxes.hxx                  |    8 +-
 main/sc/source/ui/vba/vbaaxis.cxx                  |   86 +-
 main/sc/source/ui/vba/vbaaxis.hxx                  |   86 +-
 main/sc/source/ui/vba/vbaborders.cxx               |   50 +-
 main/sc/source/ui/vba/vbaborders.hxx               |   22 +-
 main/sc/source/ui/vba/vbacharacters.cxx            |   20 +-
 main/sc/source/ui/vba/vbacharacters.hxx            |   20 +-
 main/sc/source/ui/vba/vbachart.cxx                 |   78 +-
 main/sc/source/ui/vba/vbachart.hxx                 |   78 +-
 main/sc/source/ui/vba/vbachartobject.cxx           |   18 +-
 main/sc/source/ui/vba/vbachartobject.hxx           |   18 +-
 main/sc/source/ui/vba/vbachartobjects.cxx          |   14 +-
 main/sc/source/ui/vba/vbachartobjects.hxx          |   10 +-
 main/sc/source/ui/vba/vbacharts.cxx                |    8 +-
 main/sc/source/ui/vba/vbacharts.hxx                |   10 +-
 main/sc/source/ui/vba/vbacomment.cxx               |   28 +-
 main/sc/source/ui/vba/vbacomment.hxx               |   28 +-
 main/sc/source/ui/vba/vbacomments.cxx              |    8 +-
 main/sc/source/ui/vba/vbacomments.hxx              |    4 +-
 main/sc/source/ui/vba/vbacondition.cxx             |   12 +-
 main/sc/source/ui/vba/vbacondition.hxx             |   14 +-
 main/sc/source/ui/vba/vbadialogs.cxx               |    4 +-
 main/sc/source/ui/vba/vbadialogs.hxx               |    4 +-
 main/sc/source/ui/vba/vbaeventshelper.cxx          |   74 +-
 main/sc/source/ui/vba/vbaeventshelper.hxx          |   20 +-
 main/sc/source/ui/vba/vbafont.cxx                  |   50 +-
 main/sc/source/ui/vba/vbafont.hxx                  |   48 +-
 main/sc/source/ui/vba/vbaformat.cxx                |   64 +-
 main/sc/source/ui/vba/vbaformat.hxx                |   72 +-
 main/sc/source/ui/vba/vbaformatcondition.cxx       |   28 +-
 main/sc/source/ui/vba/vbaformatcondition.hxx       |   26 +-
 main/sc/source/ui/vba/vbaformatconditions.cxx      |   20 +-
 main/sc/source/ui/vba/vbaformatconditions.hxx      |   16 +-
 main/sc/source/ui/vba/vbaglobals.cxx               |   52 +-
 main/sc/source/ui/vba/vbaglobals.hxx               |   53 +-
 main/sc/source/ui/vba/vbahelper.cxx                |   16 +-
 main/sc/source/ui/vba/vbahyperlink.cxx             |   36 +-
 main/sc/source/ui/vba/vbahyperlink.hxx             |   36 +-
 main/sc/source/ui/vba/vbahyperlinks.cxx            |   49 +-
 main/sc/source/ui/vba/vbahyperlinks.hxx            |   13 +-
 main/sc/source/ui/vba/vbainterior.cxx              |   22 +-
 main/sc/source/ui/vba/vbainterior.hxx              |   22 +-
 main/sc/source/ui/vba/vbaname.cxx                  |   40 +-
 main/sc/source/ui/vba/vbaname.hxx                  |   40 +-
 main/sc/source/ui/vba/vbanames.cxx                 |   10 +-
 main/sc/source/ui/vba/vbanames.hxx                 |    6 +-
 main/sc/source/ui/vba/vbaoleobject.cxx             |   26 +-
 main/sc/source/ui/vba/vbaoleobject.hxx             |   26 +-
 main/sc/source/ui/vba/vbaoleobjects.cxx            |   18 +-
 main/sc/source/ui/vba/vbaoleobjects.hxx            |    6 +-
 main/sc/source/ui/vba/vbaoutline.cxx               |    2 +-
 main/sc/source/ui/vba/vbaoutline.hxx               |    2 +-
 main/sc/source/ui/vba/vbapagebreak.cxx             |   12 +-
 main/sc/source/ui/vba/vbapagebreak.hxx             |   14 +-
 main/sc/source/ui/vba/vbapagebreaks.cxx            |   48 +-
 main/sc/source/ui/vba/vbapagebreaks.hxx            |   16 +-
 main/sc/source/ui/vba/vbapagesetup.cxx             |   72 +-
 main/sc/source/ui/vba/vbapagesetup.hxx             |   70 +-
 main/sc/source/ui/vba/vbapalette.cxx               |    8 +-
 main/sc/source/ui/vba/vbapane.cxx                  |   16 +-
 main/sc/source/ui/vba/vbapane.hxx                  |   16 +-
 main/sc/source/ui/vba/vbapivotcache.cxx            |    2 +-
 main/sc/source/ui/vba/vbapivotcache.hxx            |    2 +-
 main/sc/source/ui/vba/vbapivottable.cxx            |    2 +-
 main/sc/source/ui/vba/vbapivottable.hxx            |    2 +-
 main/sc/source/ui/vba/vbapivottables.cxx           |    8 +-
 main/sc/source/ui/vba/vbapivottables.hxx           |    4 +-
 main/sc/source/ui/vba/vbapropvalue.cxx             |    4 +-
 main/sc/source/ui/vba/vbapropvalue.hxx             |    6 +-
 main/sc/source/ui/vba/vbarange.cxx                 |  364 +++----
 main/sc/source/ui/vba/vbarange.hxx                 |  282 +++--
 main/sc/source/ui/vba/vbaseriescollection.cxx      |    4 +-
 main/sc/source/ui/vba/vbaseriescollection.hxx      |    4 +-
 main/sc/source/ui/vba/vbasheetobject.cxx           |  104 +-
 main/sc/source/ui/vba/vbasheetobject.hxx           |  104 +-
 main/sc/source/ui/vba/vbasheetobjects.cxx          |   99 +-
 main/sc/source/ui/vba/vbasheetobjects.hxx          |   16 +-
 main/sc/source/ui/vba/vbastyle.cxx                 |   26 +-
 main/sc/source/ui/vba/vbastyle.hxx                 |   24 +-
 main/sc/source/ui/vba/vbastyles.cxx                |   16 +-
 main/sc/source/ui/vba/vbastyles.hxx                |   12 +-
 main/sc/source/ui/vba/vbatextboxshape.cxx          |    6 +-
 main/sc/source/ui/vba/vbatextboxshape.hxx          |    6 +-
 main/sc/source/ui/vba/vbatextframe.cxx             |    4 +-
 main/sc/source/ui/vba/vbatextframe.hxx             |    4 +-
 main/sc/source/ui/vba/vbatitle.hxx                 |   22 +-
 main/sc/source/ui/vba/vbavalidation.cxx            |   40 +-
 main/sc/source/ui/vba/vbavalidation.hxx            |   40 +-
 main/sc/source/ui/vba/vbawindow.cxx                |  138 +--
 main/sc/source/ui/vba/vbawindow.hxx                |  118 ++-
 main/sc/source/ui/vba/vbawindows.cxx               |   32 +-
 main/sc/source/ui/vba/vbawindows.hxx               |    6 +-
 main/sc/source/ui/vba/vbaworkbook.cxx              |   30 +-
 main/sc/source/ui/vba/vbaworkbook.hxx              |   30 +-
 main/sc/source/ui/vba/vbaworkbooks.cxx             |   14 +-
 main/sc/source/ui/vba/vbaworkbooks.hxx             |   10 +-
 main/sc/source/ui/vba/vbaworksheet.cxx             |  139 ++-
 main/sc/source/ui/vba/vbaworksheet.hxx             |  150 +--
 main/sc/source/ui/vba/vbaworksheets.cxx            |   46 +-
 main/sc/source/ui/vba/vbaworksheets.hxx            |   23 +-
 main/sc/source/ui/vba/vbawsfunction.cxx            |   14 +-
 main/sc/source/ui/vba/vbawsfunction.hxx            |   14 +-
 main/sc/workben/addin.cxx                          |   30 +-
 main/sc/workben/addin.hxx                          |   46 +-
 main/sc/workben/result.cxx                         |    4 +-
 main/sc/workben/result.hxx                         |    4 +-
 main/scaddins/source/analysis/analysis.cxx         |  166 +--
 main/scaddins/source/analysis/analysis.hxx         |  277 +++--
 main/scaddins/source/analysis/analysisdefs.hxx     |    3 -
 main/scaddins/source/analysis/analysishelper.cxx   |  135 ++-
 main/scaddins/source/analysis/analysishelper.hxx   |  166 ++-
 main/scaddins/source/analysis/bessel.cxx           |   16 +-
 main/scaddins/source/analysis/bessel.hxx           |    8 +-
 main/scaddins/source/analysis/financial.cxx        |   68 +-
 main/scaddins/source/datefunc/datefunc.cxx         |   52 +-
 main/scaddins/source/datefunc/datefunc.hxx         |   58 +-
 main/sccomp/source/solver/solver.cxx               |   40 +-
 main/sccomp/source/solver/solver.hxx               |   55 +-
 main/scp2/source/ooo/file_library_ooo.scp          |   21 +-
 main/scp2/source/ooo/makefile.mk                   |    5 +
 main/scp2/source/ooo/ure.scp                       |   26 +-
 main/scp2/source/ooo/vc_redist.scp                 |   11 +
 main/scripting/source/basprov/baslibnode.cxx       |    8 +-
 main/scripting/source/basprov/baslibnode.hxx       |   12 +-
 main/scripting/source/basprov/basmethnode.cxx      |   22 +-
 main/scripting/source/basprov/basmethnode.hxx      |   35 +-
 main/scripting/source/basprov/basmodnode.cxx       |    8 +-
 main/scripting/source/basprov/basmodnode.hxx       |   12 +-
 main/scripting/source/basprov/basprov.cxx          |   17 +-
 main/scripting/source/basprov/basprov.hxx          |   27 +-
 main/scripting/source/basprov/basscript.cxx        |    1 -
 main/scripting/source/basprov/basscript.hxx        |    6 +-
 .../source/dlgprov/DialogModelProvider.cxx         |   38 +-
 .../source/dlgprov/DialogModelProvider.hxx         |   38 +-
 main/scripting/source/dlgprov/dlgevtatt.cxx        |   14 +-
 main/scripting/source/dlgprov/dlgevtatt.hxx        |   27 +-
 main/scripting/source/dlgprov/dlgprov.cxx          |   23 +-
 main/scripting/source/dlgprov/dlgprov.hxx          |   35 +-
 .../source/protocolhandler/scripthandler.cxx       |   11 -
 .../source/protocolhandler/scripthandler.hxx       |   32 +-
 main/scripting/source/provider/ActiveMSPList.cxx   |    4 -
 main/scripting/source/provider/ActiveMSPList.hxx   |   12 +-
 .../source/provider/BrowseNodeFactoryImpl.cxx      |   30 -
 .../source/provider/BrowseNodeFactoryImpl.hxx      |   18 +-
 .../source/provider/MasterScriptProvider.cxx       |   30 +-
 .../source/provider/MasterScriptProvider.hxx       |   48 +-
 .../provider/MasterScriptProviderFactory.cxx       |    6 +-
 .../provider/MasterScriptProviderFactory.hxx       |   12 +-
 main/scripting/source/provider/ProviderCache.cxx   |   12 +-
 main/scripting/source/provider/ProviderCache.hxx   |   13 +-
 main/scripting/source/provider/ScriptImpl.cxx      |    5 +-
 main/scripting/source/provider/ScriptImpl.hxx      |    9 +-
 .../scripting/source/provider/ScriptingContext.cxx |    4 +-
 .../scripting/source/provider/ScriptingContext.hxx |    4 +-
 main/scripting/source/provider/URIHelper.cxx       |    8 -
 main/scripting/source/provider/URIHelper.hxx       |   26 +-
 .../source/runtimemgr/ScriptNameResolverImpl.cxx   |    9 +-
 .../source/runtimemgr/ScriptNameResolverImpl.hxx   |   22 +-
 .../source/runtimemgr/ScriptRuntimeManager.cxx     |   14 +-
 .../source/runtimemgr/ScriptRuntimeManager.hxx     |   25 +-
 main/scripting/source/runtimemgr/StorageBridge.cxx |    5 +-
 main/scripting/source/runtimemgr/StorageBridge.hxx |    9 +-
 main/scripting/source/storage/ScriptInfo.cxx       |   70 +-
 main/scripting/source/storage/ScriptInfo.hxx       |   22 +-
 .../source/storage/ScriptMetadataImporter.cxx      |   14 -
 .../source/storage/ScriptMetadataImporter.hxx      |   43 +-
 .../source/storage/ScriptSecurityManager.cxx       |    9 +-
 .../source/storage/ScriptSecurityManager.hxx       |   24 +-
 main/scripting/source/storage/ScriptStorage.cxx    |   14 +-
 main/scripting/source/storage/ScriptStorage.hxx    |   36 +-
 .../source/storage/ScriptStorageManager.cxx        |   14 +-
 .../source/storage/ScriptStorageManager.hxx        |   40 +-
 main/scripting/source/storage/ScriptURI.cxx        |    3 +-
 main/scripting/source/storage/ScriptURI.hxx        |    3 +-
 main/scripting/source/storage/XMLElement.cxx       |    6 -
 main/scripting/source/storage/XMLElement.hxx       |   18 +-
 .../source/stringresource/stringresource.cxx       |  146 +--
 .../source/stringresource/stringresource.hxx       |  433 +++-----
 main/scripting/source/vbaevents/eventhelper.cxx    |   66 +-
 main/sd/inc/CustomAnimationEffect.hxx              |    2 +-
 main/sd/inc/helper/simplereferencecomponent.hxx    |    2 +-
 main/sd/inc/sdpage.hxx                             |    4 +-
 main/sd/inc/stlfamily.hxx                          |   60 +-
 main/sd/inc/stlpool.hxx                            |   28 +-
 main/sd/inc/stlsheet.hxx                           |   52 +-
 main/sd/inc/textapi.hxx                            |    2 +-
 main/sd/source/core/CustomAnimationEffect.cxx      |   11 +-
 main/sd/source/core/annotations/Annotation.cxx     |   72 +-
 .../core/annotations/AnnotationEnumeration.cxx     |    8 +-
 main/sd/source/core/sdpage_animations.cxx          |    4 +-
 main/sd/source/core/stlfamily.cxx                  |   60 +-
 main/sd/source/core/stlpool.cxx                    |   28 +-
 main/sd/source/core/stlsheet.cxx                   |   52 +-
 main/sd/source/core/text/textapi.cxx               |    2 +-
 main/sd/source/filter/grf/sdgrffilter.cxx          |    4 +-
 main/sd/source/filter/html/HtmlOptionsDialog.cxx   |   38 +-
 main/sd/source/filter/sddetect.cxx                 |   20 +-
 main/sd/source/helper/simplereferencecomponent.cxx |    1 -
 .../accessibility/AccessibleDocumentViewBase.cxx   |   29 -
 .../accessibility/AccessibleDrawDocumentView.cxx   |   15 -
 .../ui/accessibility/AccessibleOutlineView.cxx     |   12 +-
 .../ui/accessibility/AccessiblePageShape.cxx       |   11 -
 .../AccessiblePresentationGraphicShape.cxx         |    4 -
 .../AccessiblePresentationOLEShape.cxx             |    4 -
 .../accessibility/AccessiblePresentationShape.cxx  |    3 -
 .../ui/accessibility/AccessibleScrollPanel.cxx     |    4 -
 .../accessibility/AccessibleSlideSorterObject.cxx  |   27 -
 .../ui/accessibility/AccessibleSlideSorterView.cxx |   37 -
 .../source/ui/accessibility/AccessibleTreeNode.cxx |   27 -
 main/sd/source/ui/animations/motionpathtag.cxx     |    6 +-
 main/sd/source/ui/animations/motionpathtag.hxx     |    6 +-
 .../sd/source/ui/annotations/annotationmanager.cxx |    4 +-
 .../ui/annotations/annotationmanagerimpl.hxx       |    4 +-
 main/sd/source/ui/app/sdxfer.cxx                   |    2 +-
 .../source/ui/controller/slidelayoutcontroller.cxx |   12 +-
 .../source/ui/controller/slidelayoutcontroller.hxx |    4 +-
 main/sd/source/ui/dlg/TemplateScanner.cxx          |    2 +-
 main/sd/source/ui/dlg/sdtreelb.cxx                 |    2 +-
 .../ui/framework/configuration/Configuration.cxx   |   11 +-
 .../configuration/ConfigurationController.cxx      |   23 +-
 .../GenericConfigurationChangeRequest.cxx          |    5 +-
 .../GenericConfigurationChangeRequest.hxx          |   12 +-
 .../configuration/ResourceFactoryManager.cxx       |    5 -
 .../configuration/ResourceFactoryManager.hxx       |   15 +-
 .../ui/framework/configuration/ResourceId.cxx      |   14 +-
 .../ui/framework/configuration/UpdateRequest.cxx   |    3 -
 .../ui/framework/configuration/UpdateRequest.hxx   |    9 +-
 .../ui/framework/factories/BasicPaneFactory.cxx    |    9 +-
 .../ui/framework/factories/BasicPaneFactory.hxx    |   18 +-
 .../ui/framework/factories/BasicToolBarFactory.cxx |    8 +-
 .../ui/framework/factories/BasicToolBarFactory.hxx |   15 +-
 .../ui/framework/factories/BasicViewFactory.cxx    |    6 +-
 .../ui/framework/factories/BasicViewFactory.hxx    |    9 +-
 .../ui/framework/factories/ChildWindowPane.cxx     |    2 -
 .../ui/framework/factories/ChildWindowPane.hxx     |    6 +-
 .../ui/framework/factories/FrameWindowPane.cxx     |    1 -
 .../ui/framework/factories/FrameWindowPane.hxx     |    3 +-
 .../ui/framework/factories/FullScreenPane.cxx      |    5 -
 .../ui/framework/factories/FullScreenPane.hxx      |   15 +-
 main/sd/source/ui/framework/factories/Pane.cxx     |   11 -
 .../ui/framework/factories/PresentationFactory.cxx |   16 +-
 .../ui/framework/factories/TaskPanelResource.cxx   |    2 -
 .../ui/framework/factories/ViewShellWrapper.cxx    |    9 -
 .../ui/framework/module/CenterViewFocusModule.cxx  |    2 -
 .../ui/framework/module/CenterViewFocusModule.hxx  |    6 +-
 .../ui/framework/module/ModuleController.cxx       |    5 +-
 .../ui/framework/module/ReadOnlyModeObserver.cxx   |    3 -
 .../ui/framework/module/ReadOnlyModeObserver.hxx   |    9 +-
 .../source/ui/framework/module/ResourceManager.cxx |    2 -
 .../source/ui/framework/module/ResourceManager.hxx |    6 +-
 .../source/ui/framework/module/ShellStackGuard.cxx |    2 -
 .../source/ui/framework/module/ShellStackGuard.hxx |    6 +-
 .../ui/framework/module/SlideSorterModule.cxx      |    1 -
 .../ui/framework/module/SlideSorterModule.hxx      |    3 +-
 .../source/ui/framework/module/ToolBarModule.cxx   |    2 -
 .../source/ui/framework/module/ToolBarModule.hxx   |    6 +-
 .../source/ui/framework/module/ToolPanelModule.cxx |    2 -
 .../ui/framework/module/ViewTabBarModule.cxx       |    2 -
 .../ui/framework/module/ViewTabBarModule.hxx       |    6 +-
 .../source/ui/framework/tools/FrameworkHelper.cxx  |   16 +-
 .../source/ui/inc/AccessibleDocumentViewBase.hxx   |   88 +-
 .../source/ui/inc/AccessibleDrawDocumentView.hxx   |   46 +-
 main/sd/source/ui/inc/AccessibleOutlineView.hxx    |   30 +-
 main/sd/source/ui/inc/AccessiblePageShape.hxx      |   33 +-
 .../ui/inc/AccessiblePresentationGraphicShape.hxx  |   11 +-
 .../ui/inc/AccessiblePresentationOLEShape.hxx      |   11 +-
 .../source/ui/inc/AccessiblePresentationShape.hxx  |    9 +-
 main/sd/source/ui/inc/AccessibleScrollPanel.hxx    |    9 +-
 .../source/ui/inc/AccessibleSlideSorterObject.hxx  |   78 +-
 .../sd/source/ui/inc/AccessibleSlideSorterView.hxx |  103 +-
 main/sd/source/ui/inc/AccessibleSlideView.hxx      |  139 ++-
 main/sd/source/ui/inc/AccessibleTreeNode.hxx       |   78 +-
 main/sd/source/ui/inc/DocumentRenderer.hxx         |    9 +-
 main/sd/source/ui/inc/DrawController.hxx           |   62 +-
 main/sd/source/ui/inc/DrawSubController.hxx        |    6 +-
 main/sd/source/ui/inc/SdUnoDrawView.hxx            |   37 +-
 main/sd/source/ui/inc/SdUnoOutlineView.hxx         |   40 +-
 main/sd/source/ui/inc/SdUnoSlideView.hxx           |   37 +-
 main/sd/source/ui/inc/ViewTabBar.hxx               |   30 +-
 main/sd/source/ui/inc/framework/Configuration.hxx  |   24 +-
 .../ui/inc/framework/ConfigurationController.hxx   |   60 +-
 .../source/ui/inc/framework/ModuleController.hxx   |    6 +-
 main/sd/source/ui/inc/framework/Pane.hxx           |   33 +-
 .../ui/inc/framework/PresentationFactory.hxx       |   15 +-
 main/sd/source/ui/inc/framework/ResourceId.hxx     |   33 +-
 .../source/ui/inc/framework/TaskPanelResource.hxx  |    4 +-
 .../source/ui/inc/framework/ViewShellWrapper.hxx   |   27 +-
 main/sd/source/ui/inc/sdtreelb.hxx                 |    2 +-
 main/sd/source/ui/inc/sdxfer.hxx                   |    2 +-
 main/sd/source/ui/inc/slideshow.hxx                |   34 +-
 main/sd/source/ui/inc/tools/PropertySet.hxx        |   40 +-
 main/sd/source/ui/inc/tools/SlotStateListener.hxx  |    9 +-
 main/sd/source/ui/inc/unomodel.hxx                 |  146 +--
 main/sd/source/ui/inc/unosrch.hxx                  |   42 +-
 main/sd/source/ui/presenter/PresenterCanvas.cxx    |  100 +-
 main/sd/source/ui/presenter/PresenterCanvas.hxx    |  131 +--
 main/sd/source/ui/presenter/PresenterHelper.cxx    |   11 -
 main/sd/source/ui/presenter/PresenterHelper.hxx    |   27 +-
 .../source/ui/presenter/PresenterPreviewCache.cxx  |   13 +-
 .../source/ui/presenter/PresenterPreviewCache.hxx  |   29 +-
 main/sd/source/ui/presenter/PresenterTextView.cxx  |    5 +-
 main/sd/source/ui/presenter/PresenterTextView.hxx  |    5 +-
 main/sd/source/ui/presenter/SlideRenderer.cxx      |    9 +-
 main/sd/source/ui/presenter/SlideRenderer.hxx      |   17 +-
 .../source/ui/sidebar/AllMasterPagesSelector.cxx   |    2 +-
 .../source/ui/sidebar/MasterPageContainerQueue.cxx |    2 +-
 main/sd/source/ui/sidebar/MasterPageObserver.cxx   |    1 +
 main/sd/source/ui/sidebar/PanelFactory.cxx         |    7 +-
 main/sd/source/ui/sidebar/PanelFactory.hxx         |    6 +-
 main/sd/source/ui/sidebar/SidebarFactory.cxx       |    9 +-
 main/sd/source/ui/sidebar/SidebarFactory.hxx       |   12 +-
 main/sd/source/ui/slideshow/slideshow.cxx          |   34 +-
 main/sd/source/ui/slideshow/slideshowimpl.cxx      |  125 ++-
 main/sd/source/ui/slideshow/slideshowimpl.hxx      |  126 +--
 main/sd/source/ui/slideshow/slideshowviewimpl.cxx  |   60 +-
 main/sd/source/ui/slideshow/slideshowviewimpl.hxx  |   60 +-
 .../ui/slidesorter/cache/SlsRequestQueue.cxx       |    2 +-
 .../ui/slidesorter/controller/SlsListener.cxx      |    6 -
 .../ui/slidesorter/controller/SlsListener.hxx      |   18 +-
 .../ui/slidesorter/shell/SlideSorterService.cxx    |   40 +-
 .../ui/slidesorter/shell/SlideSorterService.hxx    |  110 +-
 main/sd/source/ui/tools/EventMultiplexer.cxx       |   24 +-
 main/sd/source/ui/tools/PropertySet.cxx            |   22 -
 main/sd/source/ui/tools/SlotStateListener.cxx      |    3 -
 main/sd/source/ui/unoidl/DrawController.cxx        |   33 +-
 main/sd/source/ui/unoidl/SdUnoDrawView.cxx         |   20 +-
 main/sd/source/ui/unoidl/SdUnoOutlineView.cxx      |   21 +-
 main/sd/source/ui/unoidl/SdUnoSlideView.cxx        |   20 +-
 main/sd/source/ui/unoidl/UnoDocumentSettings.cxx   |   70 +-
 main/sd/source/ui/unoidl/facreg.cxx                |  155 ++-
 main/sd/source/ui/unoidl/randomnode.cxx            |  162 ++-
 main/sd/source/ui/unoidl/unocpres.cxx              |   30 +-
 main/sd/source/ui/unoidl/unocpres.hxx              |   56 +-
 main/sd/source/ui/unoidl/unodoc.cxx                |    8 +-
 main/sd/source/ui/unoidl/unolayer.cxx              |   46 +-
 main/sd/source/ui/unoidl/unolayer.hxx              |   64 +-
 main/sd/source/ui/unoidl/unomodel.cxx              |  104 +-
 main/sd/source/ui/unoidl/unomodule.cxx             |   22 +-
 main/sd/source/ui/unoidl/unomodule.hxx             |   18 +-
 main/sd/source/ui/unoidl/unoobj.cxx                |   48 +-
 main/sd/source/ui/unoidl/unoobj.hxx                |   26 +-
 main/sd/source/ui/unoidl/unopage.cxx               |  113 +-
 main/sd/source/ui/unoidl/unopage.hxx               |  136 +--
 main/sd/source/ui/unoidl/unopback.cxx              |   18 +-
 main/sd/source/ui/unoidl/unopback.hxx              |   28 +-
 main/sd/source/ui/unoidl/unopool.cxx               |    3 +-
 main/sd/source/ui/unoidl/unosrch.cxx               |   25 +-
 main/sd/source/ui/view/DocumentRenderer.cxx        |    3 -
 main/sd/source/ui/view/ToolBarManager.cxx          |    1 +
 main/sd/source/ui/view/UpdateLockManager.cxx       |    8 +-
 main/sd/source/ui/view/ViewTabBar.cxx              |   10 -
 main/sd/source/ui/view/drviewsa.cxx                |    4 +-
 main/sd/workben/custompanel/ctp_panel.cxx          |   12 +-
 main/sd/workben/custompanel/ctp_panel.hxx          |   12 +-
 main/sdext/source/minimizer/optimizerdialog.cxx    |    9 -
 main/sdext/source/minimizer/optimizerdialog.hxx    |   20 +-
 main/sdext/source/minimizer/pppoptimizer.cxx       |   12 +-
 main/sdext/source/minimizer/pppoptimizer.hxx       |   29 +-
 main/sdext/source/minimizer/pppoptimizerdialog.cxx |    7 -
 main/sdext/source/minimizer/pppoptimizerdialog.hxx |   19 +-
 main/sdext/source/minimizer/unodialog.cxx          |    1 -
 main/sdext/source/minimizer/unodialog.hxx          |    2 +-
 main/sdext/source/pdfimport/filterdet.cxx          |    6 +-
 main/sdext/source/pdfimport/filterdet.hxx          |    3 +-
 main/sdext/source/pdfimport/misc/pwdinteract.cxx   |   20 +-
 main/sdext/source/pdfimport/pdfiadaptor.cxx        |    8 +-
 main/sdext/source/pdfimport/pdfiadaptor.hxx        |   10 +-
 main/sdext/source/pdfimport/test/outputwrap.hxx    |    6 +-
 .../source/presenter/PresenterAccessibility.cxx    |  235 +----
 .../source/presenter/PresenterAccessibility.hxx    |   15 +-
 main/sdext/source/presenter/PresenterButton.cxx    |   13 -
 main/sdext/source/presenter/PresenterButton.hxx    |   39 +-
 main/sdext/source/presenter/PresenterClock.cxx     |   13 -
 main/sdext/source/presenter/PresenterClock.hxx     |   39 +-
 .../sdext/source/presenter/PresenterController.cxx |   14 -
 .../sdext/source/presenter/PresenterController.hxx |   41 +-
 .../presenter/PresenterCurrentSlideObserver.cxx    |   11 -
 .../presenter/PresenterCurrentSlideObserver.hxx    |   23 +-
 .../presenter/PresenterFrameworkObserver.cxx       |    2 -
 .../presenter/PresenterFrameworkObserver.hxx       |    6 +-
 main/sdext/source/presenter/PresenterHelpView.cxx  |    9 -
 main/sdext/source/presenter/PresenterHelpView.hxx  |   27 +-
 main/sdext/source/presenter/PresenterNotesView.cxx |   13 -
 main/sdext/source/presenter/PresenterNotesView.hxx |   39 +-
 main/sdext/source/presenter/PresenterPane.cxx      |    7 -
 main/sdext/source/presenter/PresenterPane.hxx      |   24 +-
 main/sdext/source/presenter/PresenterPaneBase.cxx  |    9 -
 main/sdext/source/presenter/PresenterPaneBase.hxx  |   27 +-
 .../presenter/PresenterPaneBorderManager.cxx       |   10 -
 .../presenter/PresenterPaneBorderManager.hxx       |   30 +-
 .../presenter/PresenterPaneBorderPainter.cxx       |    6 -
 .../presenter/PresenterPaneBorderPainter.hxx       |   18 +-
 .../source/presenter/PresenterPaneContainer.cxx    |    1 -
 .../source/presenter/PresenterPaneContainer.hxx    |    3 +-
 .../source/presenter/PresenterPaneFactory.cxx      |    4 -
 .../source/presenter/PresenterPaneFactory.hxx      |   14 +-
 .../source/presenter/PresenterProtocolHandler.cxx  |   28 +-
 .../source/presenter/PresenterProtocolHandler.hxx  |   14 +-
 main/sdext/source/presenter/PresenterScreen.cxx    |   15 +-
 main/sdext/source/presenter/PresenterScreen.hxx    |   10 +-
 main/sdext/source/presenter/PresenterScrollBar.cxx |   12 -
 main/sdext/source/presenter/PresenterScrollBar.hxx |   36 +-
 .../source/presenter/PresenterSlidePreview.cxx     |   11 -
 .../source/presenter/PresenterSlidePreview.hxx     |   32 +-
 .../source/presenter/PresenterSlideShowView.cxx    |   31 +-
 .../source/presenter/PresenterSlideShowView.hxx    |   90 +-
 .../source/presenter/PresenterSlideSorter.cxx      |   19 -
 .../source/presenter/PresenterSlideSorter.hxx      |   57 +-
 .../sdext/source/presenter/PresenterSpritePane.cxx |    7 -
 .../sdext/source/presenter/PresenterSpritePane.hxx |   24 +-
 main/sdext/source/presenter/PresenterTimer.cxx     |    4 +-
 main/sdext/source/presenter/PresenterTimer.hxx     |    3 +-
 main/sdext/source/presenter/PresenterToolBar.cxx   |   38 +-
 main/sdext/source/presenter/PresenterToolBar.hxx   |   66 +-
 .../source/presenter/PresenterViewFactory.cxx      |    7 +-
 .../source/presenter/PresenterViewFactory.hxx      |   14 +-
 .../source/presenter/PresenterWindowManager.cxx    |   21 +-
 .../source/presenter/PresenterWindowManager.hxx    |   38 +-
 main/set_soenv.in                                  |  120 ++-
 .../customactions/regpatchactivex/makefile.mk      |    5 +-
 main/sfx2/inc/frmload.hxx                          |    4 +-
 main/sfx2/inc/progind.hxx                          |   10 +-
 main/sfx2/inc/sfx2/DocumentMetadataAccess.hxx      |   71 +-
 main/sfx2/inc/sfx2/Metadatable.hxx                 |   19 +-
 main/sfx2/inc/sfx2/appuno.hxx                      |   30 +-
 main/sfx2/inc/sfx2/docfilt.hxx                     |    5 +-
 main/sfx2/inc/sfx2/docstoragemodifylistener.hxx    |    4 +-
 main/sfx2/inc/sfx2/objuno.hxx                      |  102 +-
 main/sfx2/inc/sfx2/sfxbasecontroller.hxx           |   64 +-
 main/sfx2/inc/sfx2/sfxbasemodel.hxx                |  359 +++----
 main/sfx2/inc/sfx2/sfxstatuslistener.hxx           |   10 +-
 main/sfx2/inc/sfx2/sfxuno.hxx                      |   28 +-
 main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx    |   30 +-
 main/sfx2/inc/sfx2/sidebar/Theme.hxx               |   41 +-
 main/sfx2/inc/sfx2/stbitem.hxx                     |   23 +-
 main/sfx2/inc/sfx2/tbxctrl.hxx                     |   49 +-
 main/sfx2/inc/sfx2/unoctitm.hxx                    |   27 +-
 main/sfx2/inc/sfx2/userinputinterception.hxx       |    8 +-
 main/sfx2/source/appl/appbaslib.cxx                |    2 -
 main/sfx2/source/appl/appinit.cxx                  |   24 +-
 main/sfx2/source/appl/appopen.cxx                  |    8 +-
 main/sfx2/source/appl/appuno.cxx                   |   63 +-
 main/sfx2/source/appl/childwin.cxx                 |    2 +-
 main/sfx2/source/appl/helpdispatch.cxx             |    6 +-
 main/sfx2/source/appl/helpdispatch.hxx             |    6 +-
 main/sfx2/source/appl/helpinterceptor.cxx          |   28 +-
 main/sfx2/source/appl/helpinterceptor.hxx          |   32 +-
 main/sfx2/source/appl/imestatuswindow.cxx          |    2 -
 main/sfx2/source/appl/imestatuswindow.hxx          |    6 +-
 main/sfx2/source/appl/newhelp.hxx                  |    4 +-
 main/sfx2/source/appl/sfxpicklist.cxx              |    1 -
 main/sfx2/source/appl/shutdownicon.cxx             |   22 +-
 main/sfx2/source/appl/shutdownicon.hxx             |   26 +-
 main/sfx2/source/appl/shutdowniconaqua.mm          |    1 -
 main/sfx2/source/appl/workwin.cxx                  |    5 -
 main/sfx2/source/appl/xpackcreator.cxx             |    5 -
 main/sfx2/source/appl/xpackcreator.hxx             |    8 +-
 main/sfx2/source/bastyp/fltlst.cxx                 |    4 +-
 main/sfx2/source/bastyp/fltlst.hxx                 |    4 +-
 main/sfx2/source/control/querystatus.cxx           |    6 +-
 main/sfx2/source/control/sfxstatuslistener.cxx     |    6 +-
 main/sfx2/source/control/statcach.cxx              |    4 +-
 main/sfx2/source/control/unoctitm.cxx              |   24 +-
 main/sfx2/source/dialog/filedlghelper.cxx          |   14 +-
 main/sfx2/source/dialog/filedlgimpl.hxx            |   14 +-
 main/sfx2/source/dialog/mailmodel.cxx              |   10 +-
 main/sfx2/source/doc/DocumentMetadataAccess.cxx    |   31 +-
 main/sfx2/source/doc/Metadatable.cxx               |    6 -
 main/sfx2/source/doc/SfxDocumentMetaData.cxx       |  267 ++---
 main/sfx2/source/doc/docfile.cxx                   |    4 +-
 main/sfx2/source/doc/docfilt.cxx                   |    3 -
 main/sfx2/source/doc/docstoragemodifylistener.cxx  |    4 +-
 main/sfx2/source/doc/doctemplates.cxx              |   15 +-
 main/sfx2/source/doc/doctemplateslocal.cxx         |   11 -
 main/sfx2/source/doc/doctemplateslocal.hxx         |   25 +-
 main/sfx2/source/doc/docundomanager.cxx            |   44 +-
 main/sfx2/source/doc/iframe.cxx                    |   29 +-
 main/sfx2/source/doc/objserv.cxx                   |   12 +-
 main/sfx2/source/doc/objuno.cxx                    |   96 +-
 main/sfx2/source/doc/objxtor.cxx                   |   12 +-
 main/sfx2/source/doc/ownsubfilterservice.cxx       |    6 -
 main/sfx2/source/doc/plugin.cxx                    |   25 +-
 main/sfx2/source/doc/printhelper.cxx               |   26 +-
 main/sfx2/source/doc/printhelper.hxx               |   14 +-
 main/sfx2/source/doc/sfxbasemodel.cxx              |  242 ++---
 main/sfx2/source/doc/sfxmodelfactory.cxx           |   20 +-
 main/sfx2/source/inc/appbaslib.hxx                 |    6 +-
 main/sfx2/source/inc/doctemplates.hxx              |   22 +-
 main/sfx2/source/inc/docundomanager.hxx            |   44 +-
 main/sfx2/source/inc/eventsupplier.hxx             |   75 +-
 main/sfx2/source/inc/fltoptint.hxx                 |   10 +-
 main/sfx2/source/inc/iframe.hxx                    |   32 +-
 main/sfx2/source/inc/ownsubfilterservice.hxx       |   12 +-
 main/sfx2/source/inc/plugin.hxx                    |   28 +-
 main/sfx2/source/inc/statcach.hxx                  |    4 +-
 main/sfx2/source/inc/tplcomp.hxx                   |   52 +-
 main/sfx2/source/inc/workwin.hxx                   |   10 +-
 main/sfx2/source/notify/eventsupplier.cxx          |   39 +-
 main/sfx2/source/sidebar/Accessible.cxx            |    1 -
 main/sfx2/source/sidebar/Accessible.hxx            |    3 +-
 main/sfx2/source/sidebar/CommandInfoProvider.cxx   |    1 -
 main/sfx2/source/sidebar/ControllerItem.cxx        |    2 -
 main/sfx2/source/sidebar/SidebarController.cxx     |    5 -
 main/sfx2/source/sidebar/SidebarController.hxx     |   15 +-
 main/sfx2/source/sidebar/SidebarPanel.cxx          |    4 -
 main/sfx2/source/sidebar/SidebarPanel.hxx          |    3 +-
 main/sfx2/source/sidebar/SidebarPanelBase.cxx      |   10 -
 main/sfx2/source/sidebar/Theme.cxx                 |   21 -
 main/sfx2/source/statbar/stbitem.cxx               |   11 -
 main/sfx2/source/toolbox/tbxitem.cxx               |   31 +-
 main/sfx2/source/view/frmload.cxx                  |   11 +-
 main/sfx2/source/view/ipclient.cxx                 |   76 +-
 main/sfx2/source/view/sfxbasecontroller.cxx        |   98 +-
 main/sfx2/source/view/userinputinterception.cxx    |    8 +-
 main/sfx2/source/view/viewsh.cxx                   |    8 +-
 .../source/backends/desktopbe/desktopbackend.cxx   |   37 +-
 .../shell/source/backends/gconfbe/gconfbackend.cxx |   37 +-
 main/shell/source/backends/kde4be/kde4backend.cxx  |   37 +-
 main/shell/source/backends/kdebe/kdebackend.cxx    |   37 +-
 .../source/backends/localebe/localebackend.cxx     |   10 -
 .../source/backends/localebe/localebackend.hxx     |   35 +-
 main/shell/source/backends/macbe/macbackend.cxx    |   10 -
 main/shell/source/backends/macbe/macbackend.hxx    |   35 +-
 .../source/backends/wininetbe/wininetbackend.cxx   |   10 -
 .../source/backends/wininetbe/wininetbackend.hxx   |   35 +-
 main/shell/source/cmdmail/cmdmailmsg.cxx           |   14 -
 main/shell/source/cmdmail/cmdmailmsg.hxx           |   42 +-
 main/shell/source/cmdmail/syscmdmail.cxx           |    6 -
 main/shell/source/cmdmail/syscmdmail.hxx           |   18 +-
 main/shell/source/unix/exec/shellexec.cxx          |    4 -
 main/shell/source/unix/exec/shellexec.hxx          |   12 +-
 main/shell/source/win32/SysShExec.cxx              |    4 -
 main/shell/source/win32/SysShExec.hxx              |   12 +-
 main/shell/source/win32/sysmail/sysmailclient.cxx  |    2 -
 main/shell/source/win32/sysmail/sysmailclient.hxx  |    6 +-
 main/shell/source/win32/sysmail/sysmailmsg.cxx     |   14 -
 main/shell/source/win32/sysmail/sysmailmsg.hxx     |   42 +-
 main/shell/source/win32/sysmail/sysmailprov.cxx    |    4 -
 main/shell/source/win32/sysmail/sysmailprov.hxx    |   12 +-
 main/shell/source/win32/sysmail/sysmapi.hxx        |   12 +-
 .../engine/OGLTrans/OGLTrans_TransitionerImpl.cxx  |   12 +-
 main/slideshow/source/engine/eventmultiplexer.cxx  |   35 +-
 main/slideshow/source/engine/shapes/drawshape.cxx  |    1 +
 .../slideshow/source/engine/shapes/gdimtftools.cxx |    2 +-
 main/slideshow/source/engine/slideshowimpl.cxx     |   67 +-
 main/slideshow/source/engine/slideview.cxx         |   12 +-
 main/slideshow/test/demoshow.cxx                   |   52 +-
 main/slideshow/test/slidetest.cxx                  |   12 +-
 main/slideshow/test/testshape.cxx                  |   10 +-
 main/slideshow/test/testview.cxx                   |   26 +-
 main/solenv/bin/extract-linker-member.sh           |   84 ++
 main/solenv/bin/make_installer.pl                  |   30 +
 main/solenv/bin/modules/installer/download.pm      |   10 +-
 main/solenv/bin/modules/installer/globals.pm       |    1 +
 main/solenv/bin/modules/installer/parameter.pm     |    9 +
 main/solenv/bin/throwspec.py                       |  434 ++++++++
 main/solenv/gbuild/platform/windows.mk             |   93 +-
 main/solenv/inc/_tg_def.mk                         |  110 +-
 main/solenv/inc/set_wntx64.mk                      |   24 +
 main/solenv/inc/settings.mk                        |    8 +
 main/solenv/inc/tg_def.mk                          |   11 +-
 main/solenv/inc/wnt.mk                             |    4 +-
 main/solenv/inc/wntmsc14.mk                        |  187 ++++
 main/solenv/inc/wntmsci11.mk                       |    8 +-
 main/solenv/inc/wntmscx.mk                         |    8 +-
 main/soltools/cpp/_include.c                       |   19 +
 main/soltools/cpp/_macro.c                         |   19 +
 main/soltools/ldump/ldump.cxx                      |   21 +-
 main/sot/source/sdstor/ucbstorage.cxx              |   31 +-
 main/sot/source/sdstor/unostorageholder.cxx        |    7 -
 main/sot/source/sdstor/unostorageholder.hxx        |   17 +-
 .../sot/source/unoolestorage/xolesimplestorage.cxx |   38 -
 .../sot/source/unoolestorage/xolesimplestorage.hxx |   82 +-
 main/starmath/inc/unomodel.hxx                     |   26 +-
 main/starmath/source/accessibility.cxx             |   70 +-
 main/starmath/source/accessibility.hxx             |  134 +--
 main/starmath/source/mathmlexport.cxx              |    8 -
 main/starmath/source/mathmlexport.hxx              |    4 +-
 main/starmath/source/mathmlimport.cxx              |    6 -
 main/starmath/source/mathmlimport.hxx              |    8 +-
 main/starmath/source/register.cxx                  |   20 +-
 main/starmath/source/smdetect.cxx                  |   10 +-
 main/starmath/source/smdetect.hxx                  |    2 +-
 main/starmath/source/unodoc.cxx                    |    2 +-
 main/starmath/source/unomodel.cxx                  |   17 +-
 main/stlport/systemstl/functional                  |    9 +
 main/stlport/systemstl/list                        |    9 +
 main/stlport/systemstl/map                         |    9 +
 main/stlport/systemstl/numeric                     |    9 +
 main/stlport/systemstl/set                         |    9 +
 main/stlport/systemstl/vector                      |    9 +
 main/stoc/inc/bootstrapservices.hxx                |   24 +-
 main/stoc/inc/stocservices.hxx                     |   18 +-
 main/stoc/source/corereflection/base.hxx           |  118 +--
 main/stoc/source/corereflection/crarray.cxx        |   10 -
 main/stoc/source/corereflection/crbase.cxx         |   19 +-
 main/stoc/source/corereflection/crcomp.cxx         |   34 +-
 main/stoc/source/corereflection/crefl.cxx          |   17 -
 main/stoc/source/corereflection/crenum.cxx         |   33 +-
 main/stoc/source/corereflection/criface.cxx        |   73 +-
 .../source/defaultregistry/defaultregistry.cxx     |  148 +--
 .../source/implementationregistration/implreg.cxx  |   36 +-
 main/stoc/source/inspect/introspection.cxx         |  183 +---
 main/stoc/source/invocation/invocation.cxx         |   94 +-
 .../source/invocation_adapterfactory/iafactory.cxx |   29 +-
 main/stoc/source/javaloader/javaloader.cxx         |   26 +-
 main/stoc/source/javavm/interact.cxx               |    7 +-
 main/stoc/source/javavm/interact.hxx               |    5 +-
 main/stoc/source/javavm/javavm.cxx                 |   31 +-
 main/stoc/source/javavm/javavm.hxx                 |   41 +-
 main/stoc/source/loader/dllcomponentloader.cxx     |   26 +-
 main/stoc/source/namingservice/namingservice.cxx   |   24 +-
 main/stoc/source/proxy_factory/proxyfac.cxx        |   21 +-
 main/stoc/source/registry_tdprovider/base.hxx      |  122 +--
 .../registry_tdprovider/methoddescription.cxx      |   12 +-
 .../registry_tdprovider/rdbtdp_tdenumeration.cxx   |   10 -
 .../registry_tdprovider/rdbtdp_tdenumeration.hxx   |   17 +-
 .../registry_tdprovider/structtypedescription.cxx  |   12 +-
 .../registry_tdprovider/structtypedescription.hxx  |   19 +-
 main/stoc/source/registry_tdprovider/td.cxx        |    2 -
 main/stoc/source/registry_tdprovider/tdcomp.cxx    |    9 +-
 main/stoc/source/registry_tdprovider/tdconsts.cxx  |    3 -
 main/stoc/source/registry_tdprovider/tdef.cxx      |    3 -
 main/stoc/source/registry_tdprovider/tdenum.cxx    |    5 -
 main/stoc/source/registry_tdprovider/tdiface.cxx   |   56 +-
 main/stoc/source/registry_tdprovider/tdmodule.cxx  |    3 -
 main/stoc/source/registry_tdprovider/tdprop.cxx    |    3 -
 .../stoc/source/registry_tdprovider/tdprovider.cxx |   46 +-
 main/stoc/source/registry_tdprovider/tdservice.cxx |   35 +-
 .../source/registry_tdprovider/tdsingleton.cxx     |    5 -
 main/stoc/source/security/access_controller.cxx    |   70 +-
 main/stoc/source/security/file_policy.cxx          |   64 +-
 main/stoc/source/security/permissions.cxx          |    3 -
 main/stoc/source/security/permissions.h            |    6 +-
 main/stoc/source/servicemanager/servicemanager.cxx |  218 ++--
 main/stoc/source/simpleregistry/simpleregistry.cxx |  206 +---
 .../stoc/source/simpleregistry/textualservices.cxx |  164 +--
 main/stoc/source/tdmanager/tdmgr.cxx               |   99 +-
 main/stoc/source/tdmanager/tdmgr_tdenumeration.cxx |    6 -
 main/stoc/source/tdmanager/tdmgr_tdenumeration.hxx |   12 +-
 main/stoc/source/typeconv/convert.cxx              |   31 +-
 .../uriproc/ExternalUriReferenceTranslator.cxx     |   20 +-
 .../uriproc/ExternalUriReferenceTranslator.hxx     |    3 +-
 main/stoc/source/uriproc/UriReference.cxx          |   31 +-
 main/stoc/source/uriproc/UriReference.hxx          |   39 +-
 main/stoc/source/uriproc/UriReferenceFactory.cxx   |   42 +-
 main/stoc/source/uriproc/UriReferenceFactory.hxx   |    3 +-
 .../UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx  |   41 +-
 .../UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx  |    3 +-
 .../UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx  |   54 +-
 .../UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx  |    3 +-
 .../uriproc/VndSunStarPkgUrlReferenceFactory.cxx   |   16 +-
 .../uriproc/VndSunStarPkgUrlReferenceFactory.hxx   |    3 +-
 main/stoc/test/excomp/excomp1.cxx                  |   13 +-
 main/stoc/test/excomp/excomp2.cxx                  |   22 +-
 .../javavm/jvm_interaction/interactionhandler.cxx  |    8 +-
 .../registry_tdprovider/testregistrytdprovider.cxx |    8 +-
 main/stoc/test/security/test_security.cxx          |   13 +-
 main/stoc/test/tdmanager/testtdmanager.cxx         |    8 +-
 main/stoc/test/testcorefl.cxx                      |    6 +-
 main/stoc/test/testiadapter.cxx                    |  109 +-
 main/stoc/test/testintrosp.cxx                     |  127 +--
 main/stoc/test/testloader.cxx                      |    2 -
 main/stoc/test/testproxyfac.cxx                    |   16 +-
 main/stoc/test/testregistry.cxx                    |    4 +-
 main/stoc/test/testsmgr_cpnt.cxx                   |    2 +-
 .../inc/svgio/svgreader/svgdocumenthandler.hxx     |   16 +-
 main/svgio/source/svgreader/svgdocumenthandler.cxx |   16 +-
 main/svgio/source/svguno/xsvgparser.cxx            |   16 +-
 main/svl/inc/svl/brdcst.hxx                        |    1 +
 main/svl/inc/svl/itemprop.hxx                      |   45 +-
 main/svl/inc/svl/lstner.hxx                        |    1 +
 main/svl/inc/svl/numuno.hxx                        |    9 +-
 main/svl/inc/svl/srchitem.hxx                      |    2 +-
 main/svl/inc/svl/strmadpt.hxx                      |   48 +-
 main/svl/inc/svl/style.hxx                         |    2 +-
 main/svl/inc/svl/urihelper.hxx                     |    3 +-
 .../complex/ConfigItems/helper/ConfigItemTest.cxx  |   20 +-
 main/svl/qa/test_URIHelper.cxx                     |   18 +-
 main/svl/source/config/itemholder2.cxx             |    1 -
 main/svl/source/config/itemholder2.hxx             |    3 +-
 main/svl/source/fsstor/fsfactory.cxx               |    7 -
 main/svl/source/fsstor/fsstorage.cxx               |  134 ---
 main/svl/source/fsstor/fsstorage.hxx               |  216 +---
 main/svl/source/fsstor/oinputstreamcontainer.cxx   |   32 -
 main/svl/source/fsstor/oinputstreamcontainer.hxx   |   35 +-
 main/svl/source/fsstor/ostreamcontainer.cxx        |   49 -
 main/svl/source/fsstor/ostreamcontainer.hxx        |   49 +-
 main/svl/source/inc/fsfactory.hxx                  |   10 +-
 main/svl/source/inc/passwordcontainer.hxx          |   90 +-
 main/svl/source/items/itemprop.cxx                 |   17 +-
 main/svl/source/items/srchitem.cxx                 |    2 +-
 main/svl/source/items/style.cxx                    |    2 +-
 main/svl/source/misc/strmadpt.cxx                  |   10 -
 main/svl/source/misc/urihelper.cxx                 |    1 -
 main/svl/source/numbers/numfmuno.cxx               |   70 +-
 main/svl/source/numbers/numfmuno.hxx               |  188 +---
 main/svl/source/numbers/numuno.cxx                 |    4 +-
 main/svl/source/numbers/supservs.cxx               |   22 +-
 main/svl/source/numbers/supservs.hxx               |   24 +-
 .../source/passwordcontainer/passwordcontainer.cxx |   61 +-
 main/svl/source/uno/pathservice.cxx                |    7 -
 main/svtools/inc/svtools/accessibleruler.hxx       |   79 +-
 .../inc/svtools/accessibletableprovider.hxx        |    3 +-
 main/svtools/inc/svtools/cliplistener.hxx          |    6 +-
 main/svtools/inc/svtools/dialogclosedlistener.hxx  |    4 +-
 main/svtools/inc/svtools/editsyntaxhighlighter.hxx |    2 +-
 main/svtools/inc/svtools/embedhlp.hxx              |    3 +-
 main/svtools/inc/svtools/framestatuslistener.hxx   |   14 +-
 .../inc/svtools/generictoolboxcontroller.hxx       |    6 +-
 main/svtools/inc/svtools/genericunodialog.hxx      |   22 +-
 main/svtools/inc/svtools/grfmgr.hxx                |   18 +-
 main/svtools/inc/svtools/javacontext.hxx           |    6 +-
 .../svtools/inc/svtools/javainteractionhandler.hxx |    6 +-
 .../inc/svtools/popupmenucontrollerbase.hxx        |   36 +-
 main/svtools/inc/svtools/popupwindowcontroller.hxx |   24 +-
 main/svtools/inc/svtools/statusbarcontroller.hxx   |   30 +-
 main/svtools/inc/svtools/textview.hxx              |   12 +-
 main/svtools/inc/svtools/toolbarmenu.hxx           |    2 +-
 main/svtools/inc/svtools/toolboxcontroller.hxx     |   32 +-
 main/svtools/inc/svtools/transfer.hxx              |   44 +-
 main/svtools/inc/svtools/unoevent.hxx              |   76 +-
 .../inc/svtools/vclxaccessibleheaderbar.hxx        |   10 +-
 .../inc/svtools/vclxaccessibleheaderbaritem.hxx    |   44 +-
 main/svtools/source/config/itemholder2.cxx         |    1 -
 main/svtools/source/config/itemholder2.hxx         |    3 +-
 main/svtools/source/control/accessibleruler.cxx    |   67 +-
 main/svtools/source/control/toolbarmenu.cxx        |   24 +-
 main/svtools/source/control/toolbarmenuacc.cxx     |  108 +-
 main/svtools/source/control/toolbarmenuimp.hxx     |  124 +--
 main/svtools/source/control/valueacc.cxx           |   58 +-
 main/svtools/source/control/valueimp.hxx           |  113 +-
 .../source/control/vclxaccessibleheaderbar.cxx     |    9 +-
 .../source/control/vclxaccessibleheaderbaritem.cxx |   42 +-
 main/svtools/source/dialogs/addresstemplate.cxx    |    4 +-
 main/svtools/source/edit/editsyntaxhighlighter.cxx |    2 +-
 main/svtools/source/edit/textview.cxx              |   28 +-
 main/svtools/source/filter/FilterConfigCache.cxx   |    1 -
 .../source/filter/SvFilterOptionsDialog.cxx        |   14 -
 .../source/filter/SvFilterOptionsDialog.hxx        |   29 +-
 main/svtools/source/filter/filter.cxx              |    4 +-
 main/svtools/source/graphic/descriptor.cxx         |   12 -
 main/svtools/source/graphic/descriptor.hxx         |   18 +-
 main/svtools/source/graphic/graphic.cxx            |   16 +-
 main/svtools/source/graphic/graphic.hxx            |   26 +-
 main/svtools/source/graphic/graphicunofactory.cxx  |   16 +-
 main/svtools/source/graphic/provider.cxx           |    8 -
 main/svtools/source/graphic/renderer.cxx           |   13 -
 main/svtools/source/graphic/transformer.cxx        |    1 -
 main/svtools/source/graphic/transformer.hxx        |    3 +-
 main/svtools/source/hatchwindow/documentcloser.cxx |    7 -
 main/svtools/source/hatchwindow/documentcloser.hxx |   14 +-
 main/svtools/source/hatchwindow/hatchwindow.cxx    |   11 +-
 main/svtools/source/hatchwindow/hatchwindow.hxx    |   18 +-
 .../source/hatchwindow/hatchwindowfactory.cxx      |    4 -
 .../source/hatchwindow/hatchwindowfactory.hxx      |    8 +-
 main/svtools/source/inc/provider.hxx               |   16 +-
 main/svtools/source/inc/renderer.hxx               |   20 +-
 main/svtools/source/inc/unoiface.hxx               |  214 ++--
 main/svtools/source/java/javacontext.cxx           |    3 +-
 .../svtools/source/java/javainteractionhandler.cxx |    3 +-
 main/svtools/source/misc/cliplistener.cxx          |    2 -
 main/svtools/source/misc/dialogclosedlistener.cxx  |    4 +-
 main/svtools/source/misc/embedhlp.cxx              |   30 +-
 main/svtools/source/misc/imageresourceaccess.cxx   |   20 +-
 main/svtools/source/misc/transfer.cxx              |   36 +-
 main/svtools/source/misc/transfer2.cxx             |   16 +-
 main/svtools/source/toolpanel/paneltabbarpeer.cxx  |    2 +-
 main/svtools/source/toolpanel/paneltabbarpeer.hxx  |    2 +-
 .../svtools/source/toolpanel/toolpaneldeckpeer.cxx |    2 +-
 .../svtools/source/toolpanel/toolpaneldeckpeer.hxx |    2 +-
 main/svtools/source/uno/addrtempuno.cxx            |   24 +-
 main/svtools/source/uno/contextmenuhelper.cxx      |    9 +-
 main/svtools/source/uno/framestatuslistener.cxx    |    7 -
 .../source/uno/generictoolboxcontroller.cxx        |    3 -
 main/svtools/source/uno/genericunodialog.cxx       |   20 +-
 .../svtools/source/uno/popupmenucontrollerbase.cxx |   26 +-
 main/svtools/source/uno/popupwindowcontroller.cxx  |   18 +-
 main/svtools/source/uno/statusbarcontroller.cxx    |   16 +-
 main/svtools/source/uno/svtxgridcontrol.cxx        |   52 +-
 main/svtools/source/uno/svtxgridcontrol.hxx        |   54 +-
 main/svtools/source/uno/toolboxcontroller.cxx      |   18 +-
 main/svtools/source/uno/treecontrolpeer.cxx        |   96 +-
 main/svtools/source/uno/treecontrolpeer.hxx        |   88 +-
 main/svtools/source/uno/unoevent.cxx               |   36 -
 main/svtools/source/uno/unogridcolumnfacade.cxx    |    8 +-
 main/svtools/source/uno/unoiface.cxx               |  192 ++--
 main/svtools/source/uno/unoimap.cxx                |   71 +-
 main/svtools/source/uno/unowizard.hxx              |   42 +-
 main/svtools/source/uno/wizard/unowizard.cxx       |   42 +-
 main/svtools/workben/treecontrol/treetest.cxx      |   32 +-
 main/svtools/workben/unodialog/unodialogsample.cxx |   24 +-
 main/svx/inc/sidebar/PanelFactory.hxx              |    6 +-
 main/svx/inc/svx/AccessibleControlShape.hxx        |   35 +-
 main/svx/inc/svx/AccessibleGraphicShape.hxx        |   29 +-
 main/svx/inc/svx/AccessibleOLEShape.hxx            |   35 +-
 main/svx/inc/svx/AccessibleShape.hxx               |  155 ++-
 .../svx/inc/svx/AccessibleSvxFindReplaceDialog.hxx |    4 +-
 main/svx/inc/svx/AccessibleTableShape.hxx          |  180 ++--
 main/svx/inc/svx/AccessibleTextHelper.hxx          |   20 +-
 main/svx/inc/svx/ChildrenManager.hxx               |    8 +-
 main/svx/inc/svx/IAccessibleParent.hxx             |    8 +-
 main/svx/inc/svx/ShapeTypeHandler.hxx              |    3 +-
 main/svx/inc/svx/SmartTagMgr.hxx                   |    6 +-
 main/svx/inc/svx/dbtoolsclient.hxx                 |    8 +-
 main/svx/inc/svx/fmdmod.hxx                        |    6 +-
 main/svx/inc/svx/fmdpage.hxx                       |   12 +-
 main/svx/inc/svx/fmgridif.hxx                      |  234 ++---
 main/svx/inc/svx/fmsrcimp.hxx                      |    4 +-
 main/svx/inc/svx/fmtools.hxx                       |   19 +-
 main/svx/inc/svx/gridctrl.hxx                      |    2 +-
 .../inc/svx/sdr/primitive2d/primitiveFactory2d.hxx |    6 +-
 .../svx/inc/svx/sidebar/SelectionChangeHandler.hxx |    9 +-
 main/svx/inc/svx/tbcontrl.hxx                      |    6 +-
 main/svx/inc/svx/tbxalign.hxx                      |    8 +-
 main/svx/inc/svx/tbxcustomshapes.hxx               |    8 +-
 main/svx/inc/svx/unomaster.hxx                     |   16 +-
 main/svx/inc/svx/unomod.hxx                        |    8 +-
 main/svx/inc/svx/unomodel.hxx                      |   26 +-
 main/svx/inc/svx/unopage.hxx                       |   28 +-
 main/svx/inc/svx/unopool.hxx                       |   28 +-
 main/svx/inc/svx/unoshape.hxx                      |  364 ++++---
 main/svx/inc/svx/unoshcol.hxx                      |   24 +-
 main/svx/inc/svx/xmleohlp.hxx                      |   12 +-
 main/svx/inc/svx/xmlgrhlp.hxx                      |   12 +-
 main/svx/inc/tbunocontroller.hxx                   |   22 +-
 main/svx/inc/tbunosearchcontrollers.hxx            |   70 +-
 main/svx/inc/unomlstr.hxx                          |    4 +-
 .../accessibility/AccessibleControlShape.cxx       |   35 +-
 .../accessibility/AccessibleFrameSelector.cxx      |   51 +-
 .../accessibility/AccessibleGraphicShape.cxx       |   10 -
 .../source/accessibility/AccessibleOLEShape.cxx    |   13 -
 main/svx/source/accessibility/AccessibleShape.cxx  |   77 +-
 .../AccessibleSvxFindReplaceDialog.cxx             |    4 +-
 .../source/accessibility/AccessibleTextHelper.cxx  |   88 +-
 main/svx/source/accessibility/ChildrenManager.cxx  |    4 -
 .../source/accessibility/ChildrenManagerImpl.cxx   |   13 +-
 .../source/accessibility/ChildrenManagerImpl.hxx   |   33 +-
 .../accessibility/GraphCtlAccessibleContext.cxx    |   75 +-
 main/svx/source/accessibility/ShapeTypeHandler.cxx |    1 -
 main/svx/source/accessibility/charmapacc.cxx       |   97 +-
 .../accessibility/svxpixelctlaccessiblecontext.cxx |  109 +-
 .../accessibility/svxrectctaccessiblecontext.cxx   |  160 ++-
 main/svx/source/core/coreservices.cxx              |   24 +-
 .../customshapes/EnhancedCustomShapeEngine.cxx     |   11 -
 .../customshapes/EnhancedCustomShapeEngine.hxx     |   33 +-
 .../customshapes/EnhancedCustomShapeHandle.cxx     |    3 -
 .../customshapes/EnhancedCustomShapeHandle.hxx     |    9 +-
 main/svx/source/customshapes/tbxcustomshapes.cxx   |    8 +-
 main/svx/source/dialog/docrecovery.cxx             |   10 -
 main/svx/source/dialog/rubydialog.cxx              |    8 +-
 main/svx/source/fmcomp/fmgridif.cxx                |  234 ++---
 main/svx/source/fmcomp/gridcell.cxx                |  214 ++--
 main/svx/source/fmcomp/gridctrl.cxx                |   16 +-
 main/svx/source/form/datalistener.cxx              |   12 +-
 main/svx/source/form/dbtoolsclient.cxx             |    4 +-
 main/svx/source/form/filtnav.cxx                   |   20 +-
 main/svx/source/form/fmcontrollayout.cxx           |    2 +-
 main/svx/source/form/fmdmod.cxx                    |    6 +-
 main/svx/source/form/fmdpage.cxx                   |   12 +-
 main/svx/source/form/fmexch.cxx                    |    2 +-
 main/svx/source/form/fmscriptingenv.cxx            |   12 +-
 main/svx/source/form/fmservs.cxx                   |    2 +-
 main/svx/source/form/fmshimp.cxx                   |   23 +-
 main/svx/source/form/fmsrcimp.cxx                  |    4 +-
 main/svx/source/form/fmtextcontrolfeature.cxx      |    4 +-
 main/svx/source/form/fmtextcontrolshell.cxx        |   32 +-
 main/svx/source/form/fmtools.cxx                   |    2 +-
 main/svx/source/form/fmundo.cxx                    |   24 +-
 main/svx/source/form/fmvwimp.cxx                   |   28 +-
 main/svx/source/form/formcontroller.cxx            |  208 ++--
 main/svx/source/form/formcontrolling.cxx           |    8 +-
 main/svx/source/form/formdispatchinterceptor.cxx   |   14 +-
 main/svx/source/form/formfeaturedispatcher.cxx     |    8 +-
 main/svx/source/form/legacyformcontroller.cxx      |   60 +-
 main/svx/source/form/navigatortreemodel.cxx        |   10 +-
 main/svx/source/form/sdbdatacolumn.cxx             |   88 +-
 main/svx/source/form/tabwin.cxx                    |    2 +-
 main/svx/source/form/xfm_addcondition.cxx          |    8 +-
 main/svx/source/gallery2/galbrws2.cxx              |    6 +-
 main/svx/source/inc/AccessibleFrameSelector.hxx    |   68 +-
 main/svx/source/inc/GraphCtlAccessibleContext.hxx  |   87 +-
 main/svx/source/inc/charmapacc.hxx                 |  140 ++-
 main/svx/source/inc/datalistener.hxx               |   12 +-
 main/svx/source/inc/docrecovery.hxx                |   30 +-
 main/svx/source/inc/fmexch.hxx                     |    2 +-
 main/svx/source/inc/fmexpl.hxx                     |   10 +-
 main/svx/source/inc/fmshimp.hxx                    |   22 +-
 main/svx/source/inc/fmtextcontrolfeature.hxx       |    4 +-
 main/svx/source/inc/fmundo.hxx                     |   16 +-
 main/svx/source/inc/fmvwimp.hxx                    |   28 +-
 main/svx/source/inc/formcontroller.hxx             |  203 ++--
 main/svx/source/inc/formcontrolling.hxx            |    8 +-
 main/svx/source/inc/formdispatchinterceptor.hxx    |   16 +-
 main/svx/source/inc/formfeaturedispatcher.hxx      |    8 +-
 main/svx/source/inc/gridcell.hxx                   |  250 ++---
 main/svx/source/inc/recoveryui.hxx                 |   21 +-
 main/svx/source/inc/sdbdatacolumn.hxx              |   90 +-
 .../source/inc/svxpixelctlaccessiblecontext.hxx    |  144 ++-
 main/svx/source/inc/svxrectctaccessiblecontext.hxx |  191 ++--
 main/svx/source/inc/tabwin.hxx                     |    2 +-
 main/svx/source/inc/unogalthemeprovider.hxx        |   28 +-
 main/svx/source/inc/unopolyhelper.hxx              |    3 +-
 main/svx/source/inc/xfm_addcondition.hxx           |    8 +-
 .../sdr/contact/viewobjectcontactofunocontrol.cxx  |   40 +-
 .../source/sdr/primitive2d/primitivefactory2d.cxx  |    6 +-
 main/svx/source/sidebar/PanelFactory.cxx           |    4 -
 main/svx/source/sidebar/SelectionChangeHandler.cxx |    3 -
 main/svx/source/smarttags/SmartTagMgr.cxx          |    6 +-
 main/svx/source/svdraw/svdoole2.cxx                |   79 +-
 main/svx/source/svdraw/svdouno.cxx                 |    3 +-
 main/svx/source/table/accessiblecell.cxx           |   48 +-
 main/svx/source/table/accessiblecell.hxx           |   48 +-
 main/svx/source/table/accessibletableshape.cxx     |  176 ++--
 main/svx/source/table/cell.cxx                     |  102 +-
 main/svx/source/table/cell.hxx                     |  102 +-
 main/svx/source/table/cellcursor.cxx               |   24 +-
 main/svx/source/table/cellcursor.hxx               |   24 +-
 main/svx/source/table/cellrange.cxx                |    6 +-
 main/svx/source/table/cellrange.hxx                |    6 +-
 main/svx/source/table/propertyset.cxx              |   32 +-
 main/svx/source/table/propertyset.hxx              |   36 +-
 main/svx/source/table/svdotable.cxx                |    8 +-
 main/svx/source/table/tablecolumn.cxx              |   16 +-
 main/svx/source/table/tablecolumn.hxx              |   16 +-
 main/svx/source/table/tablecolumns.cxx             |   14 +-
 main/svx/source/table/tablecolumns.hxx             |   14 +-
 main/svx/source/table/tablecontroller.cxx          |    8 +-
 main/svx/source/table/tabledesign.cxx              |  192 ++--
 main/svx/source/table/tablemodel.cxx               |   58 +-
 main/svx/source/table/tablemodel.hxx               |   58 +-
 main/svx/source/table/tablerow.cxx                 |   16 +-
 main/svx/source/table/tablerow.hxx                 |   16 +-
 main/svx/source/table/tablerows.cxx                |   14 +-
 main/svx/source/table/tablerows.hxx                |   14 +-
 main/svx/source/tbxctrls/extrusioncontrols.cxx     |   40 +-
 main/svx/source/tbxctrls/extrusioncontrols.hxx     |   24 +-
 main/svx/source/tbxctrls/fontworkgallery.cxx       |   32 +-
 main/svx/source/tbxctrls/tbcontrl.cxx              |    4 +-
 main/svx/source/tbxctrls/tbunocontroller.cxx       |   11 -
 .../svx/source/tbxctrls/tbunosearchcontrollers.cxx |   70 +-
 main/svx/source/tbxctrls/tbxalign.cxx              |    8 +-
 .../chinese_translation_unodialog.cxx              |   32 +-
 .../chinese_translation_unodialog.hxx              |   34 +-
 main/svx/source/unodraw/UnoGraphicExporter.cxx     |   27 +-
 main/svx/source/unodraw/UnoGraphicExporter.hxx     |    2 +-
 main/svx/source/unodraw/UnoNameItemTable.cxx       |    9 +-
 main/svx/source/unodraw/UnoNameItemTable.hxx       |   16 +-
 main/svx/source/unodraw/UnoNamespaceMap.cxx        |   29 +-
 main/svx/source/unodraw/XPropertyTable.cxx         |   90 +-
 main/svx/source/unodraw/gluepts.cxx                |   43 +-
 main/svx/source/unodraw/recoveryui.cxx             |    8 +-
 main/svx/source/unodraw/shapeimpl.hxx              |   28 +-
 main/svx/source/unodraw/tableshape.cxx             |    2 -
 main/svx/source/unodraw/unobtabl.cxx               |   10 +-
 main/svx/source/unodraw/unoctabl.cxx               |   39 +-
 main/svx/source/unodraw/unodtabl.cxx               |   10 +-
 main/svx/source/unodraw/unogtabl.cxx               |   10 +-
 main/svx/source/unodraw/unohtabl.cxx               |   10 +-
 main/svx/source/unodraw/unomlstr.cxx               |    4 +-
 main/svx/source/unodraw/unomod.cxx                 |   52 +-
 main/svx/source/unodraw/unomtabl.cxx               |   35 +-
 main/svx/source/unodraw/unopage.cxx                |   18 +-
 main/svx/source/unodraw/unopool.cxx                |   16 +-
 main/svx/source/unodraw/unoshap2.cxx               |  111 +-
 main/svx/source/unodraw/unoshap3.cxx               |   42 +-
 main/svx/source/unodraw/unoshap4.cxx               |   34 +-
 main/svx/source/unodraw/unoshape.cxx               |  123 +--
 main/svx/source/unodraw/unoshcol.cxx               |   20 +-
 main/svx/source/unodraw/unottabl.cxx               |   10 +-
 main/svx/source/unogallery/unogalitem.cxx          |   14 -
 main/svx/source/unogallery/unogalitem.hxx          |   20 +-
 main/svx/source/unogallery/unogaltheme.cxx         |   15 -
 main/svx/source/unogallery/unogaltheme.hxx         |   30 +-
 main/svx/source/unogallery/unogalthemeprovider.cxx |   14 -
 main/svx/source/xml/xmleohlp.cxx                   |   15 +-
 main/svx/source/xml/xmlgrhlp.cxx                   |   65 +-
 main/svx/workben/msview/xmlconfig.cxx              |   68 +-
 main/sw/inc/SwPanelFactory.hxx                     |    6 +-
 main/sw/inc/SwSmartTagMgr.hxx                      |    4 +-
 main/sw/inc/TextCursorHelper.hxx                   |    2 +-
 main/sw/inc/accmap.hxx                             |    8 +-
 main/sw/inc/dlelstnr.hxx                           |   10 +-
 main/sw/inc/unoatxt.hxx                            |  122 ++-
 main/sw/inc/unobookmark.hxx                        |  108 +-
 main/sw/inc/unochart.hxx                           |  122 +--
 main/sw/inc/unocoll.hxx                            |  142 +--
 main/sw/inc/unocrsrhelper.hxx                      |   40 +-
 main/sw/inc/unodraw.hxx                            |  103 +-
 main/sw/inc/unoevent.hxx                           |    9 +-
 main/sw/inc/unofield.hxx                           |  114 +--
 main/sw/inc/unoflatpara.hxx                        |   43 +-
 main/sw/inc/unofootnote.hxx                        |   96 +-
 main/sw/inc/unoframe.hxx                           |  161 ++-
 main/sw/inc/unoidx.hxx                             |  177 +---
 main/sw/inc/unomailmerge.hxx                       |   34 +-
 main/sw/inc/unomod.hxx                             |   66 +-
 main/sw/inc/unoparaframeenum.hxx                   |   17 +-
 main/sw/inc/unoparagraph.hxx                       |  155 +--
 main/sw/inc/unoport.hxx                            |   98 +-
 main/sw/inc/unoredline.hxx                         |   52 +-
 main/sw/inc/unoredlines.hxx                        |   26 +-
 main/sw/inc/unorefmark.hxx                         |   69 +-
 main/sw/inc/unosection.hxx                         |  110 +-
 main/sw/inc/unosett.hxx                            |  137 ++-
 main/sw/inc/unosrch.hxx                            |   42 +-
 main/sw/inc/unostyle.hxx                           |  212 ++--
 main/sw/inc/unotbl.hxx                             |  295 +++---
 main/sw/inc/unotext.hxx                            |  132 +--
 main/sw/inc/unotextbodyhf.hxx                      |   72 +-
 main/sw/inc/unotextcursor.hxx                      |  202 ++--
 main/sw/inc/unotextmarkup.hxx                      |   20 +-
 main/sw/inc/unotextrange.hxx                       |  127 +--
 main/sw/inc/unotxdoc.hxx                           |  233 +++--
 main/sw/source/core/access/acccell.cxx             |   20 -
 main/sw/source/core/access/acccell.hxx             |   62 +-
 main/sw/source/core/access/acccontext.cxx          |   27 -
 main/sw/source/core/access/acccontext.hxx          |   81 +-
 main/sw/source/core/access/accdoc.cxx              |   35 -
 main/sw/source/core/access/accdoc.hxx              |   91 +-
 main/sw/source/core/access/accembedded.cxx         |    6 -
 main/sw/source/core/access/accembedded.hxx         |   17 +-
 main/sw/source/core/access/accfield.cxx            |   25 -
 main/sw/source/core/access/accfield.hxx            |   72 +-
 main/sw/source/core/access/accfootnote.cxx         |    5 -
 main/sw/source/core/access/accfootnote.hxx         |   14 +-
 main/sw/source/core/access/accgraphic.cxx          |    5 -
 main/sw/source/core/access/accgraphic.hxx          |   13 +-
 main/sw/source/core/access/accheaderfooter.cxx     |    6 -
 main/sw/source/core/access/accheaderfooter.hxx     |   17 +-
 main/sw/source/core/access/acchyperlink.cxx        |    9 -
 main/sw/source/core/access/acchyperlink.hxx        |   32 +-
 main/sw/source/core/access/accmap.cxx              |   13 +-
 main/sw/source/core/access/accnotextframe.cxx      |   46 +-
 main/sw/source/core/access/accnotextframe.hxx      |   68 +-
 main/sw/source/core/access/accnotexthyperlink.cxx  |    9 -
 main/sw/source/core/access/accnotexthyperlink.hxx  |   32 +-
 main/sw/source/core/access/accpage.cxx             |    5 -
 main/sw/source/core/access/accpage.hxx             |   14 +-
 main/sw/source/core/access/accpara.cxx             |   85 +-
 main/sw/source/core/access/accpara.hxx             |  183 ++--
 main/sw/source/core/access/accpreview.cxx          |    8 +-
 main/sw/source/core/access/accpreview.hxx          |   15 +-
 main/sw/source/core/access/accselectionhelper.cxx  |   12 -
 main/sw/source/core/access/accselectionhelper.hxx  |   28 +-
 main/sw/source/core/access/acctable.cxx            |   55 +-
 main/sw/source/core/access/acctable.hxx            |  146 +--
 main/sw/source/core/access/acctextframe.cxx        |   15 -
 main/sw/source/core/access/acctextframe.hxx        |   48 +-
 main/sw/source/core/access/textmarkuphelper.cxx    |   10 -
 main/sw/source/core/access/textmarkuphelper.hxx    |   14 +-
 main/sw/source/core/bastyp/SwSmartTagMgr.cxx       |    4 +-
 main/sw/source/core/crsr/crbm.cxx                  |    1 +
 main/sw/source/core/docnode/cancellablejob.cxx     |    2 +-
 main/sw/source/core/docnode/cancellablejob.hxx     |    2 +-
 main/sw/source/core/docnode/finalthreadmanager.cxx |   21 +-
 main/sw/source/core/inc/SwXMLBlockImport.hxx       |    3 +-
 main/sw/source/core/inc/SwXTextDefaults.hxx        |   39 +-
 main/sw/source/core/inc/finalthreadmanager.hxx     |   20 +-
 main/sw/source/core/inc/unometa.hxx                |  150 +--
 main/sw/source/core/ole/ndole.cxx                  |   12 +-
 main/sw/source/core/swg/SwXMLBlockImport.cxx       |    1 -
 main/sw/source/core/unocore/SwXTextDefaults.cxx    |   14 -
 main/sw/source/core/unocore/TextCursorHelper.cxx   |    1 -
 main/sw/source/core/unocore/unobkm.cxx             |   43 +-
 main/sw/source/core/unocore/unochart.cxx           |   62 --
 main/sw/source/core/unocore/unocoll.cxx            |  140 ++-
 main/sw/source/core/unocore/unocrsrhelper.cxx      |    3 +-
 main/sw/source/core/unocore/unodraw.cxx            |  111 +-
 main/sw/source/core/unocore/unoevent.cxx           |    3 -
 main/sw/source/core/unocore/unofield.cxx           |   96 +-
 main/sw/source/core/unocore/unoflatpara.cxx        |   34 +-
 main/sw/source/core/unocore/unoframe.cxx           |  130 +--
 main/sw/source/core/unocore/unoftn.cxx             |   47 +-
 main/sw/source/core/unocore/unoidx.cxx             |  158 +--
 main/sw/source/core/unocore/unoobj.cxx             |  116 +--
 main/sw/source/core/unocore/unoobj2.cxx            |   82 +-
 main/sw/source/core/unocore/unoparagraph.cxx       |   85 +-
 main/sw/source/core/unocore/unoport.cxx            |   48 +-
 main/sw/source/core/unocore/unoportenum.cxx        |   15 +-
 main/sw/source/core/unocore/unoredline.cxx         |   36 +-
 main/sw/source/core/unocore/unoredlines.cxx        |   21 +-
 main/sw/source/core/unocore/unorefmk.cxx           |  116 +--
 main/sw/source/core/unocore/unosect.cxx            |   60 +-
 main/sw/source/core/unocore/unosett.cxx            |  108 +-
 main/sw/source/core/unocore/unosrch.cxx            |   41 +-
 main/sw/source/core/unocore/unostyle.cxx           |  151 +--
 main/sw/source/core/unocore/unotbl.cxx             |  260 ++---
 main/sw/source/core/unocore/unotext.cxx            |  101 +-
 main/sw/source/core/unocore/unotextmarkup.cxx      |   18 +-
 main/sw/source/filter/html/htmlform.cxx            |   24 +-
 main/sw/source/filter/ww8/docxexportfilter.cxx     |    2 +-
 main/sw/source/filter/ww8/rtfexportfilter.cxx      |    6 +-
 main/sw/source/filter/ww8/rtfexportfilter.hxx      |   12 +-
 main/sw/source/filter/ww8/rtfimportfilter.cxx      |    6 +-
 main/sw/source/filter/ww8/rtfimportfilter.hxx      |   12 +-
 main/sw/source/filter/ww8/writerhelper.cxx         |    1 +
 main/sw/source/filter/ww8/writerhelper.hxx         |   11 +-
 main/sw/source/filter/ww8/wrtww8.cxx               |    1 +
 main/sw/source/filter/xml/xmlexp.cxx               |   12 -
 main/sw/source/filter/xml/xmlexp.hxx               |    5 +-
 main/sw/source/filter/xml/xmlimp.cxx               |   10 -
 main/sw/source/filter/xml/xmlimp.hxx               |   13 +-
 main/sw/source/ui/dbui/dbmgr.cxx                   |    3 +-
 main/sw/source/ui/dbui/dbtree.cxx                  |   16 +-
 main/sw/source/ui/dbui/mailmergehelper.cxx         |   48 +-
 main/sw/source/ui/dochdl/swdtflvr.cxx              |    2 +-
 main/sw/source/ui/docvw/SidebarTxtControlAcc.cxx   |   16 +-
 main/sw/source/ui/docvw/SidebarWinAcc.cxx          |    4 +-
 main/sw/source/ui/envelp/mailmrge.cxx              |    8 +-
 main/sw/source/ui/inc/SwXFilterOptions.hxx         |   31 +-
 main/sw/source/ui/inc/mailmergehelper.hxx          |   74 +-
 main/sw/source/ui/inc/swdtflvr.hxx                 |    2 +-
 main/sw/source/ui/inc/uivwimp.hxx                  |    8 +-
 main/sw/source/ui/inc/unodispatch.hxx              |   26 +-
 main/sw/source/ui/inc/unotxvw.hxx                  |  150 ++-
 main/sw/source/ui/inc/workctrl.hxx                 |    2 +-
 main/sw/source/ui/ribbar/workctrl.cxx              |    2 +-
 main/sw/source/ui/sidebar/SwPanelFactory.cxx       |    4 -
 main/sw/source/ui/uiview/uivwimp.cxx               |    4 +-
 main/sw/source/ui/uno/SwXDocumentSettings.cxx      |   12 -
 main/sw/source/ui/uno/SwXDocumentSettings.hxx      |   34 +-
 main/sw/source/ui/uno/SwXFilterOptions.cxx         |   13 +-
 main/sw/source/ui/uno/dlelstnr.cxx                 |    5 -
 main/sw/source/ui/uno/swdetect.cxx                 |   10 +-
 main/sw/source/ui/uno/swdetect.hxx                 |    2 +-
 main/sw/source/ui/uno/unoatxt.cxx                  |   96 +-
 main/sw/source/ui/uno/unodispatch.cxx              |   21 +-
 main/sw/source/ui/uno/unodoc.cxx                   |    3 -
 main/sw/source/ui/uno/unofreg.cxx                  |   46 +-
 main/sw/source/ui/uno/unomailmerge.cxx             |   30 +-
 main/sw/source/ui/uno/unomod.cxx                   |   36 +-
 main/sw/source/ui/uno/unomodule.cxx                |   21 +-
 main/sw/source/ui/uno/unomodule.hxx                |   18 +-
 main/sw/source/ui/uno/unotxdoc.cxx                 |  172 +---
 main/sw/source/ui/uno/unotxvw.cxx                  |  127 +--
 main/sw/source/ui/vba/vbaaddin.cxx                 |   14 +-
 main/sw/source/ui/vba/vbaaddin.hxx                 |   14 +-
 main/sw/source/ui/vba/vbaaddins.cxx                |    6 +-
 main/sw/source/ui/vba/vbaaddins.hxx                |    6 +-
 main/sw/source/ui/vba/vbaapplication.cxx           |   34 +-
 main/sw/source/ui/vba/vbaapplication.hxx           |   34 +-
 main/sw/source/ui/vba/vbaautotextentry.cxx         |   10 +-
 main/sw/source/ui/vba/vbaautotextentry.hxx         |   10 +-
 main/sw/source/ui/vba/vbabookmark.cxx              |   14 +-
 main/sw/source/ui/vba/vbabookmark.hxx              |   14 +-
 main/sw/source/ui/vba/vbabookmarks.cxx             |   40 +-
 main/sw/source/ui/vba/vbabookmarks.hxx             |   20 +-
 main/sw/source/ui/vba/vbaborders.cxx               |   26 +-
 main/sw/source/ui/vba/vbaborders.hxx               |   10 +-
 main/sw/source/ui/vba/vbadialogs.cxx               |    2 +-
 main/sw/source/ui/vba/vbadialogs.hxx               |    2 +-
 main/sw/source/ui/vba/vbadocument.cxx              |   44 +-
 main/sw/source/ui/vba/vbadocument.hxx              |   44 +-
 main/sw/source/ui/vba/vbadocumentproperties.cxx    |  120 +--
 main/sw/source/ui/vba/vbadocumentproperties.hxx    |    8 +-
 main/sw/source/ui/vba/vbadocuments.cxx             |   14 +-
 main/sw/source/ui/vba/vbadocuments.hxx             |   10 +-
 main/sw/source/ui/vba/vbaeventshelper.cxx          |    8 +-
 main/sw/source/ui/vba/vbaeventshelper.hxx          |    8 +-
 main/sw/source/ui/vba/vbafield.cxx                 |   28 +-
 main/sw/source/ui/vba/vbafield.hxx                 |   12 +-
 main/sw/source/ui/vba/vbafind.cxx                  |   64 +-
 main/sw/source/ui/vba/vbafind.hxx                  |   64 +-
 main/sw/source/ui/vba/vbafont.cxx                  |   26 +-
 main/sw/source/ui/vba/vbafont.hxx                  |   22 +-
 main/sw/source/ui/vba/vbaglobals.cxx               |   26 +-
 main/sw/source/ui/vba/vbaglobals.hxx               |   26 +-
 main/sw/source/ui/vba/vbaheaderfooter.cxx          |   12 +-
 main/sw/source/ui/vba/vbaheaderfooter.hxx          |   12 +-
 main/sw/source/ui/vba/vbaheaderfooterhelper.cxx    |   16 +-
 main/sw/source/ui/vba/vbaheaderfooterhelper.hxx    |   16 +-
 main/sw/source/ui/vba/vbainformationhelper.cxx     |    6 +-
 main/sw/source/ui/vba/vbainformationhelper.hxx     |    6 +-
 main/sw/source/ui/vba/vbaoptions.cxx               |   56 +-
 main/sw/source/ui/vba/vbaoptions.hxx               |   56 +-
 main/sw/source/ui/vba/vbapagesetup.cxx             |   24 +-
 main/sw/source/ui/vba/vbapagesetup.hxx             |   24 +-
 main/sw/source/ui/vba/vbapalette.cxx               |    8 +-
 main/sw/source/ui/vba/vbapane.cxx                  |    6 +-
 main/sw/source/ui/vba/vbapane.hxx                  |    6 +-
 main/sw/source/ui/vba/vbapanes.cxx                 |   16 +-
 main/sw/source/ui/vba/vbapanes.hxx                 |    4 +-
 main/sw/source/ui/vba/vbaparagraph.cxx             |   24 +-
 main/sw/source/ui/vba/vbaparagraph.hxx             |   10 +-
 main/sw/source/ui/vba/vbaparagraphformat.cxx       |   66 +-
 main/sw/source/ui/vba/vbaparagraphformat.hxx       |   66 +-
 main/sw/source/ui/vba/vbarange.cxx                 |   50 +-
 main/sw/source/ui/vba/vbarange.hxx                 |   50 +-
 main/sw/source/ui/vba/vbarangehelper.cxx           |    8 +-
 main/sw/source/ui/vba/vbarangehelper.hxx           |    8 +-
 main/sw/source/ui/vba/vbareplacement.cxx           |    6 +-
 main/sw/source/ui/vba/vbareplacement.hxx           |    6 +-
 main/sw/source/ui/vba/vbasection.cxx               |   12 +-
 main/sw/source/ui/vba/vbasection.hxx               |   12 +-
 main/sw/source/ui/vba/vbasections.cxx              |   26 +-
 main/sw/source/ui/vba/vbasections.hxx              |    6 +-
 main/sw/source/ui/vba/vbaselection.cxx             |   74 +-
 main/sw/source/ui/vba/vbaselection.hxx             |   74 +-
 main/sw/source/ui/vba/vbastyle.cxx                 |   20 +-
 main/sw/source/ui/vba/vbastyle.hxx                 |   20 +-
 main/sw/source/ui/vba/vbastyles.cxx                |   24 +-
 main/sw/source/ui/vba/vbastyles.hxx                |    8 +-
 main/sw/source/ui/vba/vbasystem.cxx                |    6 +-
 main/sw/source/ui/vba/vbasystem.hxx                |    6 +-
 main/sw/source/ui/vba/vbatable.cxx                 |   14 +-
 main/sw/source/ui/vba/vbatable.hxx                 |   14 +-
 main/sw/source/ui/vba/vbatables.cxx                |   10 +-
 main/sw/source/ui/vba/vbatables.hxx                |    6 +-
 main/sw/source/ui/vba/vbatemplate.cxx              |    4 +-
 main/sw/source/ui/vba/vbatemplate.hxx              |    4 +-
 main/sw/source/ui/vba/vbavariable.cxx              |   12 +-
 main/sw/source/ui/vba/vbavariable.hxx              |   12 +-
 main/sw/source/ui/vba/vbavariables.cxx             |    8 +-
 main/sw/source/ui/vba/vbavariables.hxx             |    6 +-
 main/sw/source/ui/vba/vbaview.cxx                  |   22 +-
 main/sw/source/ui/vba/vbaview.hxx                  |   22 +-
 main/sw/source/ui/vba/vbawindow.cxx                |   14 +-
 main/sw/source/ui/vba/vbawindow.hxx                |   15 +-
 main/sw/source/ui/vba/vbawrapformat.cxx            |   30 +-
 main/sw/source/ui/vba/vbawrapformat.hxx            |   30 +-
 main/sw/source/ui/vba/wordvbahelper.cxx            |    6 +-
 main/sw/source/ui/vba/wordvbahelper.hxx            |    6 +-
 main/sysui/source/win32/misc/WinImplHelper.cxx     |    6 -
 main/sysui/source/win32/misc/WinImplHelper.hxx     |   18 +-
 main/testtools/source/bridgetest/bridgetest.cxx    |   13 +-
 .../source/bridgetest/cli/cli_cpp_bridgetest.cxx   |  445 ++++----
 main/testtools/source/bridgetest/cli/makefile.mk   |   50 +-
 main/testtools/source/bridgetest/constructors.cxx  |   27 +-
 main/testtools/source/bridgetest/cppobj.cxx        |  276 +++--
 .../source/bridgetest/currentcontextchecker.cxx    |    5 +-
 .../source/bridgetest/currentcontextchecker.hxx    |    3 +-
 main/testtools/source/bridgetest/idl/makefile.mk   |    9 +-
 main/testtools/source/bridgetest/multi.hxx         |   17 -
 main/testtools/source/performance/ubobject.cxx     |   99 +-
 main/testtools/source/performance/ubtest.cxx       |   20 +-
 main/testtools/util/makefile.pmk                   |    7 +
 .../toolkit/inc/toolkit/awt/animatedimagespeer.hxx |   22 +-
 .../inc/toolkit/awt/vclxaccessiblecomponent.hxx    |   44 +-
 main/toolkit/inc/toolkit/awt/vclxbitmap.hxx        |   14 +-
 main/toolkit/inc/toolkit/awt/vclxcontainer.hxx     |   18 +-
 main/toolkit/inc/toolkit/awt/vclxdevice.hxx        |   30 +-
 main/toolkit/inc/toolkit/awt/vclxfont.hxx          |   24 +-
 main/toolkit/inc/toolkit/awt/vclxgraphics.hxx      |   82 +-
 main/toolkit/inc/toolkit/awt/vclxmenu.hxx          |   90 +-
 main/toolkit/inc/toolkit/awt/vclxpointer.hxx       |   12 +-
 main/toolkit/inc/toolkit/awt/vclxprinter.hxx       |   94 +-
 main/toolkit/inc/toolkit/awt/vclxregion.hxx        |   32 +-
 main/toolkit/inc/toolkit/awt/vclxspinbutton.hxx    |   32 +-
 .../inc/toolkit/awt/vclxsystemdependentwindow.hxx  |    8 +-
 .../inc/toolkit/awt/vclxtabpagecontainer.hxx       |   30 +-
 main/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx  |   26 +-
 main/toolkit/inc/toolkit/awt/vclxtoolkit.hxx       |   66 +-
 main/toolkit/inc/toolkit/awt/vclxtopwindow.hxx     |   34 +-
 main/toolkit/inc/toolkit/awt/vclxwindow.hxx        |  130 +--
 main/toolkit/inc/toolkit/awt/vclxwindows.hxx       |  700 ++++++-------
 .../toolkit/controls/accessiblecontrolcontext.hxx  |   36 +-
 .../inc/toolkit/controls/animatedimages.hxx        |   58 +-
 .../toolkit/controls/controlmodelcontainerbase.hxx |  101 +-
 .../toolkit/inc/toolkit/controls/dialogcontrol.hxx |   46 +-
 .../inc/toolkit/controls/eventcontainer.hxx        |   40 +-
 .../inc/toolkit/controls/formattedcontrol.hxx      |   14 +-
 .../inc/toolkit/controls/geometrycontrolmodel.hxx  |   30 +-
 .../toolkit/controls/geometrycontrolmodel_impl.hxx |    2 +-
 .../inc/toolkit/controls/roadmapcontrol.hxx        |   50 +-
 main/toolkit/inc/toolkit/controls/roadmapentry.hxx |    9 +-
 .../inc/toolkit/controls/spinningprogress.hxx      |    8 +-
 .../inc/toolkit/controls/stdtabcontroller.hxx      |   26 +-
 .../inc/toolkit/controls/stdtabcontrollermodel.hxx |   30 +-
 .../inc/toolkit/controls/tabpagecontainer.hxx      |   54 +-
 main/toolkit/inc/toolkit/controls/tabpagemodel.hxx |   21 +-
 main/toolkit/inc/toolkit/controls/tkscrollbar.hxx  |   50 +-
 main/toolkit/inc/toolkit/controls/tkspinbutton.hxx |   48 +-
 main/toolkit/inc/toolkit/controls/unocontrol.hxx   |  114 +--
 .../inc/toolkit/controls/unocontrolcontainer.hxx   |   44 +-
 .../toolkit/controls/unocontrolcontainermodel.hxx  |    4 +-
 .../inc/toolkit/controls/unocontrolmodel.hxx       |   46 +-
 main/toolkit/inc/toolkit/controls/unocontrols.hxx  |  702 ++++++-------
 .../inc/toolkit/helper/listenermultiplexer.hxx     |  100 +-
 main/toolkit/inc/toolkit/helper/macros.hxx         |   34 +-
 .../toolkit/inc/toolkit/helper/unomemorystream.hxx |   18 +-
 .../inc/toolkit/helper/unopropertyarrayhelper.hxx  |    2 +-
 main/toolkit/inc/toolkit/helper/vclunohelper.hxx   |    4 +-
 main/toolkit/source/awt/animatedimagespeer.cxx     |   22 +-
 main/toolkit/source/awt/asynccallback.cxx          |   17 +-
 main/toolkit/source/awt/forward.hxx                |    6 +-
 main/toolkit/source/awt/stylesettings.cxx          |  220 ++--
 main/toolkit/source/awt/stylesettings.hxx          |  220 ++--
 .../toolkit/source/awt/vclxaccessiblecomponent.cxx |   44 +-
 main/toolkit/source/awt/vclxbitmap.cxx             |    8 +-
 main/toolkit/source/awt/vclxcontainer.cxx          |   14 +-
 main/toolkit/source/awt/vclxdevice.cxx             |   24 +-
 main/toolkit/source/awt/vclxdialog.cxx             |   19 +-
 main/toolkit/source/awt/vclxdialog.hxx             |   21 +-
 main/toolkit/source/awt/vclxfixedline.cxx          |    7 +-
 main/toolkit/source/awt/vclxfixedline.hxx          |    9 +-
 main/toolkit/source/awt/vclxfont.cxx               |   17 +-
 main/toolkit/source/awt/vclxgraphics.cxx           |   74 +-
 main/toolkit/source/awt/vclxmenu.cxx               |   44 -
 main/toolkit/source/awt/vclxplugin.cxx             |    3 +-
 main/toolkit/source/awt/vclxplugin.hxx             |    5 +-
 main/toolkit/source/awt/vclxpointer.cxx            |    6 +-
 main/toolkit/source/awt/vclxprinter.cxx            |   34 +-
 main/toolkit/source/awt/vclxregion.cxx             |   26 +-
 main/toolkit/source/awt/vclxscroller.cxx           |    8 +-
 main/toolkit/source/awt/vclxscroller.hxx           |   12 +-
 main/toolkit/source/awt/vclxspinbutton.cxx         |   32 +-
 main/toolkit/source/awt/vclxsplitter.cxx           |    9 +-
 main/toolkit/source/awt/vclxsplitter.hxx           |   17 +-
 .../source/awt/vclxsystemdependentwindow.cxx       |    4 +-
 main/toolkit/source/awt/vclxtabcontrol.cxx         |   33 +-
 main/toolkit/source/awt/vclxtabcontrol.hxx         |   40 +-
 main/toolkit/source/awt/vclxtabpage.cxx            |    4 +-
 main/toolkit/source/awt/vclxtabpage.hxx            |    8 +-
 main/toolkit/source/awt/vclxtabpagecontainer.cxx   |   30 +-
 main/toolkit/source/awt/vclxtabpagemodel.cxx       |   25 +-
 main/toolkit/source/awt/vclxtoolkit.cxx            |   43 +-
 main/toolkit/source/awt/vclxtopwindow.cxx          |   34 +-
 main/toolkit/source/awt/vclxwindow.cxx             |  128 +--
 main/toolkit/source/awt/vclxwindows.cxx            |  619 ++++++-----
 .../source/controls/accessiblecontrolcontext.cxx   |   36 +-
 main/toolkit/source/controls/animatedimages.cxx    |   58 +-
 .../source/controls/controlmodelcontainerbase.cxx  |   96 +-
 main/toolkit/source/controls/dialogcontrol.cxx     |   42 +-
 main/toolkit/source/controls/eventcontainer.cxx    |   12 +-
 main/toolkit/source/controls/formattedcontrol.cxx  |   14 +-
 .../source/controls/geometrycontrolmodel.cxx       |   22 +-
 .../controls/grid/defaultgridcolumnmodel.cxx       |   26 +-
 .../controls/grid/defaultgridcolumnmodel.hxx       |   26 +-
 .../source/controls/grid/defaultgriddatamodel.cxx  |   46 +-
 .../source/controls/grid/defaultgriddatamodel.hxx  |   46 +-
 main/toolkit/source/controls/grid/gridcolumn.cxx   |   56 +-
 main/toolkit/source/controls/grid/gridcolumn.hxx   |   56 +-
 main/toolkit/source/controls/grid/gridcontrol.cxx  |   42 +-
 main/toolkit/source/controls/grid/gridcontrol.hxx  |   42 +-
 .../source/controls/grid/grideventforwarder.cxx    |   16 +-
 .../source/controls/grid/grideventforwarder.hxx    |   16 +-
 .../source/controls/grid/sortablegriddatamodel.cxx |   70 +-
 .../source/controls/grid/sortablegriddatamodel.hxx |   70 +-
 main/toolkit/source/controls/roadmapcontrol.cxx    |   43 +-
 main/toolkit/source/controls/roadmapentry.cxx      |    7 +-
 main/toolkit/source/controls/spinningprogress.cxx  |    8 +-
 main/toolkit/source/controls/stdtabcontroller.cxx  |   20 +-
 .../source/controls/stdtabcontrollermodel.cxx      |   24 +-
 main/toolkit/source/controls/tabpagecontainer.cxx  |   48 +-
 main/toolkit/source/controls/tabpagemodel.cxx      |   18 +-
 main/toolkit/source/controls/tkscrollbar.cxx       |   42 +-
 main/toolkit/source/controls/tkspinbutton.cxx      |   46 +-
 main/toolkit/source/controls/tree/treecontrol.cxx  |   74 +-
 main/toolkit/source/controls/tree/treecontrol.hxx  |   70 +-
 .../toolkit/source/controls/tree/treedatamodel.cxx |  138 +--
 main/toolkit/source/controls/unocontrol.cxx        |  112 +-
 .../source/controls/unocontrolcontainer.cxx        |   50 +-
 .../source/controls/unocontrolcontainermodel.cxx   |    4 +-
 main/toolkit/source/controls/unocontrolmodel.cxx   |   42 +-
 main/toolkit/source/controls/unocontrols.cxx       |  622 +++++------
 main/toolkit/source/helper/formpdfexport.cxx       |    5 +-
 main/toolkit/source/helper/listenermultiplexer.cxx |    6 +-
 main/toolkit/source/helper/unomemorystream.cxx     |   12 +-
 .../source/helper/unopropertyarrayhelper.cxx       |    2 +-
 main/toolkit/source/helper/vclunohelper.cxx        |    4 +-
 main/toolkit/source/layout/core/bin.cxx            |   10 -
 main/toolkit/source/layout/core/bin.hxx            |   30 +-
 main/toolkit/source/layout/core/box-base.cxx       |    4 -
 main/toolkit/source/layout/core/box-base.hxx       |   12 +-
 main/toolkit/source/layout/core/box.cxx            |    5 +-
 main/toolkit/source/layout/core/box.hxx            |   14 +-
 main/toolkit/source/layout/core/container.cxx      |    3 +-
 main/toolkit/source/layout/core/container.hxx      |   43 +-
 .../source/layout/core/dialogbuttonhbox.cxx        |    2 -
 .../source/layout/core/dialogbuttonhbox.hxx        |    4 +-
 main/toolkit/source/layout/core/factory.cxx        |    7 -
 main/toolkit/source/layout/core/factory.hxx        |   10 +-
 main/toolkit/source/layout/core/flow.cxx           |    9 +-
 main/toolkit/source/layout/core/flow.hxx           |   28 +-
 main/toolkit/source/layout/core/helper.cxx         |    6 +-
 main/toolkit/source/layout/core/helper.hxx         |    9 +-
 main/toolkit/source/layout/core/import.cxx         |    9 -
 main/toolkit/source/layout/core/import.hxx         |   44 +-
 .../source/layout/core/localized-string.cxx        |    3 -
 .../source/layout/core/localized-string.hxx        |   24 +-
 main/toolkit/source/layout/core/root.cxx           |   14 +-
 main/toolkit/source/layout/core/root.hxx           |   20 +-
 main/toolkit/source/layout/core/table.cxx          |    4 +-
 main/toolkit/source/layout/core/table.hxx          |   11 +-
 main/toolkit/source/layout/core/timer.cxx          |    1 -
 main/toolkit/source/layout/core/timer.hxx          |    3 +-
 main/toolkit/source/layout/vcl/wbutton.cxx         |    9 -
 main/toolkit/source/layout/vcl/wfield.cxx          |   22 +-
 main/toolkit/source/layout/vcl/wrapper.cxx         |   15 +-
 main/toolkit/source/layout/vcl/wrapper.hxx         |    8 +-
 main/toolkit/workben/layout/uno.hxx                |    8 +-
 main/tools/inc/tools/inetdef.hxx                   |    9 +
 main/tools/source/fsys/dirent.cxx                  |    3 +
 main/tools/workben/urltest.cxx                     |    1 -
 main/ucb/source/cacher/cachedcontentresultset.cxx  |  116 +--
 main/ucb/source/cacher/cachedcontentresultset.hxx  |  210 +---
 .../source/cacher/cachedcontentresultsetstub.cxx   |   15 -
 .../source/cacher/cachedcontentresultsetstub.hxx   |   38 +-
 main/ucb/source/cacher/cacheddynamicresultset.cxx  |    3 -
 main/ucb/source/cacher/cacheddynamicresultset.hxx  |    6 +-
 .../source/cacher/cacheddynamicresultsetstub.cxx   |    5 -
 .../source/cacher/cacheddynamicresultsetstub.hxx   |   10 +-
 main/ucb/source/cacher/contentresultsetwrapper.cxx |  120 +--
 main/ucb/source/cacher/contentresultsetwrapper.hxx |  243 ++---
 main/ucb/source/cacher/dynamicresultsetwrapper.cxx |   14 +-
 main/ucb/source/cacher/dynamicresultsetwrapper.hxx |   47 +-
 main/ucb/source/core/cmdenv.cxx                    |    8 -
 main/ucb/source/core/cmdenv.hxx                    |   19 +-
 main/ucb/source/core/identify.cxx                  |    2 -
 main/ucb/source/core/identify.hxx                  |    6 +-
 main/ucb/source/core/provprox.cxx                  |   13 +-
 main/ucb/source/core/provprox.hxx                  |   21 +-
 main/ucb/source/core/ucb.cxx                       |   18 -
 main/ucb/source/core/ucb.hxx                       |   59 +-
 main/ucb/source/core/ucbcmds.cxx                   |   40 +-
 main/ucb/source/core/ucbprops.cxx                  |    3 -
 main/ucb/source/core/ucbprops.hxx                  |   10 +-
 main/ucb/source/core/ucbstore.cxx                  |   64 +-
 main/ucb/source/core/ucbstore.hxx                  |  113 +-
 main/ucb/source/sorter/sortdynres.cxx              |   15 -
 main/ucb/source/sorter/sortdynres.hxx              |   38 +-
 main/ucb/source/sorter/sortresult.cxx              |   86 +-
 main/ucb/source/sorter/sortresult.hxx              |  183 ++--
 main/ucb/source/ucp/expand/ucpexpand.cxx           |   21 +-
 main/ucb/source/ucp/ext/ucpext_content.cxx         |    9 +-
 main/ucb/source/ucp/ext/ucpext_content.hxx         |   16 +-
 main/ucb/source/ucp/ext/ucpext_datasupplier.cxx    |    2 +-
 main/ucb/source/ucp/ext/ucpext_datasupplier.hxx    |    2 +-
 main/ucb/source/ucp/ext/ucpext_provider.cxx        |    9 +-
 main/ucb/source/ucp/ext/ucpext_provider.hxx        |   10 +-
 main/ucb/source/ucp/file/bc.cxx                    |   35 -
 main/ucb/source/ucp/file/bc.hxx                    |   88 +-
 main/ucb/source/ucp/file/filcmd.cxx                |    8 -
 main/ucb/source/ucp/file/filcmd.hxx                |   20 +-
 main/ucb/source/ucp/file/filid.cxx                 |    5 -
 main/ucb/source/ucp/file/filid.hxx                 |   15 +-
 main/ucb/source/ucp/file/filinpstr.cxx             |   26 -
 main/ucb/source/ucp/file/filinpstr.hxx             |   44 +-
 main/ucb/source/ucp/file/filinsreq.cxx             |    4 -
 main/ucb/source/ucp/file/filinsreq.hxx             |   16 +-
 main/ucb/source/ucp/file/filprp.cxx                |    5 -
 main/ucb/source/ucp/file/filprp.hxx                |   13 +-
 main/ucb/source/ucp/file/filrow.cxx                |   41 -
 main/ucb/source/ucp/file/filrow.hxx                |   84 +-
 main/ucb/source/ucp/file/filrset.cxx               |   79 --
 main/ucb/source/ucp/file/filrset.hxx               |  201 +---
 main/ucb/source/ucp/file/filstr.cxx                |   44 -
 main/ucb/source/ucp/file/filstr.hxx                |   81 +-
 main/ucb/source/ucp/file/filtask.cxx               |    1 -
 main/ucb/source/ucp/file/filtask.hxx               |    3 +-
 main/ucb/source/ucp/file/prov.cxx                  |   51 +-
 main/ucb/source/ucp/file/prov.hxx                  |   69 +-
 main/ucb/source/ucp/file/shell.cxx                 |    6 -
 main/ucb/source/ucp/file/shell.hxx                 |   10 +-
 main/ucb/source/ucp/ftp/ftpcontent.cxx             |   13 -
 main/ucb/source/ucp/ftp/ftpcontent.hxx             |   27 +-
 main/ucb/source/ucp/ftp/ftpcontentidentifier.cxx   |   11 -
 main/ucb/source/ucp/ftp/ftpcontentidentifier.hxx   |   23 +-
 main/ucb/source/ucp/ftp/ftpcontentprovider.cxx     |    5 -
 main/ucb/source/ucp/ftp/ftpcontentprovider.hxx     |    7 +-
 main/ucb/source/ucp/ftp/ftpinpstr.cxx              |   25 -
 main/ucb/source/ucp/ftp/ftpinpstr.hxx              |   41 +-
 main/ucb/source/ucp/ftp/ftpintreq.cxx              |    7 -
 main/ucb/source/ucp/ftp/ftpintreq.hxx              |   21 +-
 main/ucb/source/ucp/ftp/ftpresultsetbase.cxx       |   74 --
 main/ucb/source/ucp/ftp/ftpresultsetbase.hxx       |  177 +---
 main/ucb/source/ucp/ftp/ftpurl.cxx                 |   16 -
 main/ucb/source/ucp/ftp/ftpurl.hxx                 |   31 +-
 main/ucb/source/ucp/ftp/test_activedatasink.cxx    |    2 +-
 main/ucb/source/ucp/ftp/test_activedatasink.hxx    |    5 +-
 .../ucb/source/ucp/ftp/test_interactionhandler.hxx |    6 +-
 main/ucb/source/ucp/ftp/test_multiservicefac.cxx   |   14 -
 main/ucb/source/ucp/ftp/test_multiservicefac.hxx   |   20 +-
 main/ucb/source/ucp/gio/gio_content.cxx            |   21 +-
 main/ucb/source/ucp/gio/gio_content.hxx            |   44 +-
 main/ucb/source/ucp/gio/gio_datasupplier.cxx       |    2 +-
 main/ucb/source/ucp/gio/gio_datasupplier.hxx       |    3 +-
 main/ucb/source/ucp/gio/gio_inputstream.cxx        |   10 +-
 main/ucb/source/ucp/gio/gio_inputstream.hxx        |   37 +-
 main/ucb/source/ucp/gio/gio_outputstream.cxx       |    8 +-
 main/ucb/source/ucp/gio/gio_outputstream.hxx       |   20 +-
 main/ucb/source/ucp/gio/gio_provider.cxx           |    2 -
 main/ucb/source/ucp/gio/gio_provider.hxx           |    4 +-
 main/ucb/source/ucp/gio/gio_seekable.cxx           |    8 +-
 main/ucb/source/ucp/gio/gio_seekable.hxx           |   20 +-
 main/ucb/source/ucp/gvfs/gvfs_content.cxx          |   20 -
 main/ucb/source/ucp/gvfs/gvfs_content.hxx          |   50 +-
 main/ucb/source/ucp/gvfs/gvfs_directory.cxx        |    1 -
 main/ucb/source/ucp/gvfs/gvfs_directory.hxx        |    3 +-
 main/ucb/source/ucp/gvfs/gvfs_provider.cxx         |    2 -
 main/ucb/source/ucp/gvfs/gvfs_provider.hxx         |    4 +-
 main/ucb/source/ucp/gvfs/gvfs_stream.cxx           |   45 -
 main/ucb/source/ucp/gvfs/gvfs_stream.hxx           |   88 +-
 main/ucb/source/ucp/hierarchy/hierarchycontent.cxx |   16 -
 main/ucb/source/ucp/hierarchy/hierarchycontent.hxx |   38 +-
 .../source/ucp/hierarchy/hierarchydatasource.cxx   |  109 +-
 .../source/ucp/hierarchy/hierarchydatasource.hxx   |   24 +-
 .../source/ucp/hierarchy/hierarchydatasupplier.cxx |    1 -
 .../source/ucp/hierarchy/hierarchydatasupplier.hxx |    3 +-
 .../ucb/source/ucp/hierarchy/hierarchyprovider.cxx |    2 -
 .../ucb/source/ucp/hierarchy/hierarchyprovider.hxx |    8 +-
 main/ucb/source/ucp/odma/odma_content.cxx          |   13 +-
 main/ucb/source/ucp/odma/odma_content.hxx          |   22 +-
 main/ucb/source/ucp/odma/odma_datasupplier.cxx     |    1 -
 main/ucb/source/ucp/odma/odma_datasupplier.hxx     |    3 +-
 main/ucb/source/ucp/odma/odma_inputstream.cxx      |   52 +-
 main/ucb/source/ucp/odma/odma_inputstream.hxx      |   70 +-
 main/ucb/source/ucp/odma/odma_provider.cxx         |    3 +-
 main/ucb/source/ucp/odma/odma_provider.hxx         |    6 +-
 main/ucb/source/ucp/package/pkgcontent.cxx         |   16 -
 main/ucb/source/ucp/package/pkgcontent.hxx         |   38 +-
 main/ucb/source/ucp/package/pkgdatasupplier.cxx    |    1 -
 main/ucb/source/ucp/package/pkgdatasupplier.hxx    |    3 +-
 main/ucb/source/ucp/package/pkgprovider.cxx        |    4 -
 main/ucb/source/ucp/package/pkgprovider.hxx        |    4 +-
 main/ucb/source/ucp/tdoc/tdoc_content.cxx          |   29 -
 main/ucb/source/ucp/tdoc/tdoc_content.hxx          |   57 +-
 main/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx     |    1 -
 main/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx     |    3 +-
 main/ucb/source/ucp/tdoc/tdoc_docmgr.cxx           |    6 -
 main/ucb/source/ucp/tdoc/tdoc_docmgr.hxx           |   16 +-
 .../ucp/tdoc/tdoc_documentcontentfactory.cxx       |    5 -
 .../ucp/tdoc/tdoc_documentcontentfactory.hxx       |   13 +-
 main/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx  |   24 +-
 main/ucb/source/ucp/tdoc/tdoc_provider.cxx         |    5 -
 main/ucb/source/ucp/tdoc/tdoc_provider.hxx         |   17 +-
 main/ucb/source/ucp/tdoc/tdoc_stgelems.cxx         |  158 ---
 main/ucb/source/ucp/tdoc/tdoc_stgelems.hxx         |  266 +----
 main/ucb/source/ucp/tdoc/tdoc_storage.cxx          |   41 -
 main/ucb/source/ucp/tdoc/tdoc_storage.hxx          |   57 +-
 main/ucb/source/ucp/webdav/CurlInputStream.cxx     |   26 -
 main/ucb/source/ucp/webdav/CurlInputStream.hxx     |   54 +-
 main/ucb/source/ucp/webdav/CurlRequest.cxx         |   32 +-
 main/ucb/source/ucp/webdav/CurlRequest.hxx         |   34 +-
 main/ucb/source/ucp/webdav/CurlSession.cxx         |   28 +-
 main/ucb/source/ucp/webdav/CurlSession.hxx         |   76 +-
 main/ucb/source/ucp/webdav/CurlUri.cxx             |    3 -
 main/ucb/source/ucp/webdav/CurlUri.hxx             |    6 +-
 main/ucb/source/ucp/webdav/DAVResourceAccess.cxx   |   25 -
 main/ucb/source/ucp/webdav/DAVResourceAccess.hxx   |   72 +-
 main/ucb/source/ucp/webdav/DAVSession.hxx          |   57 +-
 main/ucb/source/ucp/webdav/DAVSessionFactory.cxx   |    1 -
 main/ucb/source/ucp/webdav/DAVSessionFactory.hxx   |    3 +-
 main/ucb/source/ucp/webdav/webdavcontent.cxx       |   40 -
 main/ucb/source/ucp/webdav/webdavcontent.hxx       |   90 +-
 main/ucb/source/ucp/webdav/webdavdatasupplier.cxx  |    1 -
 main/ucb/source/ucp/webdav/webdavdatasupplier.hxx  |    3 +-
 main/ucb/source/ucp/webdav/webdavprovider.cxx      |    2 -
 main/ucb/source/ucp/webdav/webdavprovider.hxx      |    4 +-
 .../ucb/source/ucp/webdav/webdavresponseparser.cxx |   31 +-
 main/ucb/workben/ucb/ucbdemo.cxx                   |   46 +-
 main/ucbhelper/inc/ucbhelper/activedatasink.hxx    |    6 +-
 .../ucbhelper/inc/ucbhelper/activedatastreamer.hxx |    6 +-
 .../inc/ucbhelper/cancelcommandexecution.hxx       |    6 +-
 .../ucbhelper/inc/ucbhelper/commandenvironment.hxx |    6 +-
 .../inc/ucbhelper/commandenvironmentproxy.hxx      |    6 +-
 main/ucbhelper/inc/ucbhelper/content.hxx           |  217 +---
 main/ucbhelper/inc/ucbhelper/contenthelper.hxx     |   77 +-
 main/ucbhelper/inc/ucbhelper/contentidentifier.hxx |   15 +-
 main/ucbhelper/inc/ucbhelper/contentinfo.hxx       |   27 +-
 .../inc/ucbhelper/fileidentifierconverter.hxx      |    9 +-
 .../inc/ucbhelper/handleinteractionrequest.hxx     |    9 +-
 .../ucbhelper/inc/ucbhelper/interactionrequest.hxx |  144 +--
 .../inc/ucbhelper/interceptedinteraction.hxx       |    3 +-
 main/ucbhelper/inc/ucbhelper/macros.hxx            |   19 +-
 main/ucbhelper/inc/ucbhelper/propertyvalueset.hxx  |   84 +-
 main/ucbhelper/inc/ucbhelper/providerhelper.hxx    |   16 +-
 main/ucbhelper/inc/ucbhelper/registerucb.hxx       |    3 +-
 main/ucbhelper/inc/ucbhelper/resultset.hxx         |  216 +---
 main/ucbhelper/inc/ucbhelper/resultsethelper.hxx   |   26 +-
 main/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx |   84 +-
 main/ucbhelper/source/client/activedatasink.cxx    |    2 -
 .../ucbhelper/source/client/activedatastreamer.cxx |    2 -
 .../ucbhelper/source/client/commandenvironment.cxx |    2 -
 main/ucbhelper/source/client/content.cxx           |   76 +-
 .../source/client/fileidentifierconverter.cxx      |    3 -
 .../source/client/interceptedinteraction.cxx       |    1 -
 main/ucbhelper/source/client/proxydecider.cxx      |    8 +-
 .../source/provider/cancelcommandexecution.cxx     |    2 -
 .../source/provider/commandenvironmentproxy.cxx    |    2 -
 main/ucbhelper/source/provider/contenthelper.cxx   |   24 -
 .../source/provider/contentidentifier.cxx          |    5 -
 main/ucbhelper/source/provider/contentinfo.cxx     |   10 -
 .../source/provider/handleinteractionrequest.cxx   |    4 -
 .../source/provider/interactionrequest.cxx         |   48 -
 .../ucbhelper/source/provider/propertyvalueset.cxx |   21 -
 main/ucbhelper/source/provider/providerhelper.cxx  |    2 -
 main/ucbhelper/source/provider/registerucb.cxx     |    1 -
 main/ucbhelper/source/provider/resultset.cxx       |   79 +-
 main/ucbhelper/source/provider/resultsethelper.cxx |   12 -
 .../source/provider/resultsetmetadata.cxx          |   21 -
 main/ucbhelper/workben/myucp/myucp_content.cxx     |   11 -
 main/ucbhelper/workben/myucp/myucp_content.hxx     |   23 +-
 .../ucbhelper/workben/myucp/myucp_datasupplier.cxx |    1 -
 .../ucbhelper/workben/myucp/myucp_datasupplier.hxx |    3 +-
 main/ucbhelper/workben/myucp/myucp_provider.cxx    |    1 -
 main/ucbhelper/workben/myucp/myucp_provider.hxx    |    4 +-
 main/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx |   12 +-
 main/unodevtools/inc/unodevtools/options.hxx       |    3 +-
 .../source/skeletonmaker/cppcompskeleton.cxx       |  134 ++-
 .../source/skeletonmaker/cpptypemaker.cxx          |   32 +-
 .../source/skeletonmaker/skeletoncpp.hxx           |    7 -
 main/unodevtools/source/unodevtools/options.cxx    |    1 -
 main/unoil/util/makefile.pmk                       |    7 +
 .../inc/unotools/accessiblerelationsethelper.hxx   |   22 +-
 .../inc/unotools/accessiblestatesethelper.hxx      |   27 +-
 main/unotools/inc/unotools/eventcfg.hxx            |   28 +-
 main/unotools/inc/unotools/options.hxx             |    1 +
 main/unotools/inc/unotools/progresshandlerwrap.hxx |    9 +-
 main/unotools/inc/unotools/propertysethelper.hxx   |   42 +-
 main/unotools/inc/unotools/propertysetinfo.hxx     |    6 +-
 main/unotools/inc/unotools/streamhelper.hxx        |   24 +-
 main/unotools/inc/unotools/streamwrap.hxx          |   42 +-
 main/unotools/inc/unotools/unotunnelhelper.hxx     |    9 +-
 main/unotools/inc/unotools/xmlaccelcfg.hxx         |   30 +-
 .../accessibility/accessiblerelationsethelper.cxx  |   30 +-
 .../accessibility/accessiblestatesethelper.cxx     |   33 +-
 main/unotools/source/config/configitem.cxx         |    8 +-
 main/unotools/source/config/eventcfg.cxx           |   28 +-
 main/unotools/source/config/itemholder1.cxx        |    1 -
 main/unotools/source/config/itemholder1.hxx        |    3 +-
 main/unotools/source/config/pathoptions.cxx        |   28 +-
 main/unotools/source/config/useroptions.cxx        |    8 +-
 main/unotools/source/config/xmlaccelcfg.cxx        |   36 +-
 .../source/misc/desktopterminationobserver.cxx     |   12 +-
 main/unotools/source/misc/eventlisteneradapter.cxx |    4 +-
 main/unotools/source/misc/sharedunocomponent.cxx   |   12 +-
 .../unotools/source/property/propertysethelper.cxx |   38 +-
 main/unotools/source/property/propertysetinfo.cxx  |   10 +-
 main/unotools/source/streaming/streamhelper.cxx    |   14 +-
 main/unotools/source/streaming/streamwrap.cxx      |   41 +-
 main/unotools/source/ucbhelper/XTempFile.hxx       |   72 +-
 .../source/ucbhelper/progresshandlerwrap.cxx       |    3 -
 main/unotools/source/ucbhelper/ucblockbytes.cxx    |   90 +-
 main/unotools/source/ucbhelper/xtempfile.cxx       |   25 -
 main/unoxml/source/dom/attr.cxx                    |   12 +-
 main/unoxml/source/dom/attr.hxx                    |   47 +-
 main/unoxml/source/dom/attributesmap.cxx           |   11 +-
 main/unoxml/source/dom/attributesmap.hxx           |   23 +-
 main/unoxml/source/dom/cdatasection.cxx            |    4 +-
 main/unoxml/source/dom/cdatasection.hxx            |   40 +-
 main/unoxml/source/dom/characterdata.cxx           |   10 +-
 main/unoxml/source/dom/characterdata.hxx           |   47 +-
 main/unoxml/source/dom/childlist.cxx               |    3 +-
 main/unoxml/source/dom/childlist.hxx               |    5 +-
 main/unoxml/source/dom/comment.cxx                 |    4 +-
 main/unoxml/source/dom/comment.hxx                 |   39 +-
 main/unoxml/source/dom/document.cxx                |   33 +-
 main/unoxml/source/dom/document.hxx                |  102 +-
 main/unoxml/source/dom/documentbuilder.cxx         |   13 -
 main/unoxml/source/dom/documentbuilder.hxx         |   36 +-
 main/unoxml/source/dom/documentfragment.cxx        |    4 +-
 main/unoxml/source/dom/documentfragment.hxx        |   29 +-
 main/unoxml/source/dom/documenttype.cxx            |   16 +-
 main/unoxml/source/dom/documenttype.hxx            |   41 +-
 main/unoxml/source/dom/domimplementation.cxx       |    3 -
 main/unoxml/source/dom/domimplementation.hxx       |    9 +-
 main/unoxml/source/dom/element.cxx                 |   25 +-
 main/unoxml/source/dom/element.hxx                 |   84 +-
 main/unoxml/source/dom/elementlist.cxx             |    4 +-
 main/unoxml/source/dom/elementlist.hxx             |    8 +-
 main/unoxml/source/dom/entitiesmap.cxx             |   11 +-
 main/unoxml/source/dom/entitiesmap.hxx             |   20 +-
 main/unoxml/source/dom/entity.cxx                  |   10 +-
 main/unoxml/source/dom/entity.hxx                  |   35 +-
 main/unoxml/source/dom/entityreference.cxx         |    4 +-
 main/unoxml/source/dom/entityreference.hxx         |   29 +-
 main/unoxml/source/dom/node.cxx                    |   29 -
 main/unoxml/source/dom/node.hxx                    |   87 +-
 main/unoxml/source/dom/notation.cxx                |    8 +-
 main/unoxml/source/dom/notation.hxx                |   33 +-
 main/unoxml/source/dom/notationsmap.cxx            |   10 +-
 main/unoxml/source/dom/notationsmap.hxx            |   20 +-
 main/unoxml/source/dom/processinginstruction.cxx   |    9 +-
 main/unoxml/source/dom/processinginstruction.hxx   |   37 +-
 main/unoxml/source/dom/saxbuilder.cxx              |   19 +-
 main/unoxml/source/dom/saxbuilder.hxx              |   51 +-
 main/unoxml/source/dom/text.cxx                    |    3 +-
 main/unoxml/source/dom/text.hxx                    |   41 +-
 main/unoxml/source/events/event.cxx                |   20 +-
 main/unoxml/source/events/event.hxx                |   20 +-
 main/unoxml/source/events/mouseevent.cxx           |   47 +-
 main/unoxml/source/events/mouseevent.hxx           |   50 +-
 main/unoxml/source/events/mutationevent.cxx        |   32 +-
 main/unoxml/source/events/mutationevent.hxx        |   33 +-
 main/unoxml/source/events/testlistener.cxx         |    7 +-
 main/unoxml/source/events/testlistener.hxx         |   13 +-
 main/unoxml/source/events/uievent.cxx              |   26 +-
 main/unoxml/source/events/uievent.hxx              |   27 +-
 main/unoxml/source/rdf/CBlankNode.cxx              |   21 +-
 main/unoxml/source/rdf/CLiteral.cxx                |   33 +-
 main/unoxml/source/rdf/CURI.cxx                    |   29 +-
 main/unoxml/source/rdf/librdf_repository.cxx       |  173 +---
 main/unoxml/source/xpath/nodelist.cxx              |    3 +-
 main/unoxml/source/xpath/nodelist.hxx              |    5 +-
 main/unoxml/source/xpath/xpathapi.cxx              |   13 -
 main/unoxml/source/xpath/xpathapi.hxx              |   37 +-
 main/unoxml/source/xpath/xpathobject.cxx           |   20 +-
 main/unoxml/source/xpath/xpathobject.hxx           |   21 +-
 main/unoxml/test/domtest.cxx                       |   34 +-
 main/ure/source/uretest/cppmain.cc                 |    5 +-
 main/ure/source/uretest/cppserver.cc               |    2 -
 main/ure/source/uretest/cpptest.cc                 |    2 -
 main/uui/source/fltdlg.cxx                         |    2 +-
 main/uui/source/iahndl-authentication.cxx          |    9 -
 main/uui/source/iahndl-cookies.cxx                 |    3 -
 main/uui/source/iahndl-errorhandler.cxx            |    2 -
 main/uui/source/iahndl-filter.cxx                  |    7 -
 main/uui/source/iahndl-ioexceptions.cxx            |    1 -
 main/uui/source/iahndl-locking.cxx                 |    6 -
 main/uui/source/iahndl-ssl.cxx                     |    4 -
 main/uui/source/iahndl.cxx                         |   13 -
 main/uui/source/iahndl.hxx                         |   75 +-
 main/uui/source/interactionhandler.cxx             |    8 +-
 main/uui/source/interactionhandler.hxx             |   20 +-
 main/uui/source/mphndl.hxx                         |   24 +-
 main/uui/source/passwordcontainer.cxx              |    7 -
 main/uui/source/passwordcontainer.hxx              |   18 +-
 main/uui/source/requeststringresolver.cxx          |    5 -
 main/uui/source/requeststringresolver.hxx          |   15 +-
 main/vbahelper/inc/vbahelper/collectionbase.hxx    |   28 +-
 main/vbahelper/inc/vbahelper/vbaaccesshelper.hxx   |    2 +-
 .../vbahelper/inc/vbahelper/vbaapplicationbase.hxx |   36 +-
 main/vbahelper/inc/vbahelper/vbacollectionimpl.hxx |   58 +-
 main/vbahelper/inc/vbahelper/vbadialogbase.hxx     |    2 +-
 main/vbahelper/inc/vbahelper/vbadialogsbase.hxx    |    4 +-
 main/vbahelper/inc/vbahelper/vbadocumentbase.hxx   |   22 +-
 main/vbahelper/inc/vbahelper/vbadocumentsbase.hxx  |   12 +-
 .../inc/vbahelper/vbaeventshelperbase.hxx          |   32 +-
 main/vbahelper/inc/vbahelper/vbafontbase.hxx       |   46 +-
 main/vbahelper/inc/vbahelper/vbaglobalbase.hxx     |    6 +-
 main/vbahelper/inc/vbahelper/vbahelper.hxx         |   48 +-
 .../vbahelper/inc/vbahelper/vbahelperinterface.hxx |   12 +-
 main/vbahelper/inc/vbahelper/vbapagesetupbase.hxx  |   30 +-
 main/vbahelper/inc/vbahelper/vbapropvalue.hxx      |    6 +-
 main/vbahelper/inc/vbahelper/vbashape.hxx          |   88 +-
 main/vbahelper/inc/vbahelper/vbashaperange.hxx     |   56 +-
 main/vbahelper/inc/vbahelper/vbashapes.hxx         |   32 +-
 main/vbahelper/inc/vbahelper/vbatextframe.hxx      |   22 +-
 main/vbahelper/inc/vbahelper/vbawindowbase.hxx     |   34 +-
 main/vbahelper/source/msforms/vbabutton.cxx        |   26 +-
 main/vbahelper/source/msforms/vbabutton.hxx        |   26 +-
 main/vbahelper/source/msforms/vbacheckbox.cxx      |   10 +-
 main/vbahelper/source/msforms/vbacheckbox.hxx      |   12 +-
 main/vbahelper/source/msforms/vbacombobox.cxx      |   52 +-
 main/vbahelper/source/msforms/vbacombobox.hxx      |   54 +-
 main/vbahelper/source/msforms/vbacontrol.cxx       |   67 +-
 main/vbahelper/source/msforms/vbacontrol.hxx       |   62 +-
 main/vbahelper/source/msforms/vbacontrols.cxx      |   26 +-
 main/vbahelper/source/msforms/vbacontrols.hxx      |   10 +-
 main/vbahelper/source/msforms/vbaframe.cxx         |   16 +-
 main/vbahelper/source/msforms/vbaframe.hxx         |   16 +-
 main/vbahelper/source/msforms/vbalabel.cxx         |   10 +-
 main/vbahelper/source/msforms/vbalabel.hxx         |   12 +-
 main/vbahelper/source/msforms/vbalistbox.cxx       |   32 +-
 main/vbahelper/source/msforms/vbalistbox.hxx       |   34 +-
 .../source/msforms/vbalistcontrolhelper.cxx        |   12 +-
 .../source/msforms/vbalistcontrolhelper.hxx        |   12 +-
 main/vbahelper/source/msforms/vbamultipage.cxx     |   14 +-
 main/vbahelper/source/msforms/vbamultipage.hxx     |    8 +-
 main/vbahelper/source/msforms/vbanewfont.cxx       |   34 +-
 main/vbahelper/source/msforms/vbanewfont.hxx       |   34 +-
 main/vbahelper/source/msforms/vbapages.cxx         |    6 +-
 main/vbahelper/source/msforms/vbapages.hxx         |    6 +-
 main/vbahelper/source/msforms/vbaprogressbar.cxx   |    4 +-
 main/vbahelper/source/msforms/vbaprogressbar.hxx   |    6 +-
 main/vbahelper/source/msforms/vbaradiobutton.cxx   |   10 +-
 main/vbahelper/source/msforms/vbaradiobutton.hxx   |   12 +-
 main/vbahelper/source/msforms/vbascrollbar.cxx     |   20 +-
 main/vbahelper/source/msforms/vbascrollbar.hxx     |   20 +-
 main/vbahelper/source/msforms/vbaspinbutton.cxx    |   12 +-
 main/vbahelper/source/msforms/vbaspinbutton.hxx    |   12 +-
 .../source/msforms/vbasystemaxcontrol.cxx          |    6 -
 .../source/msforms/vbasystemaxcontrol.hxx          |   12 +-
 main/vbahelper/source/msforms/vbatextbox.cxx       |   28 +-
 main/vbahelper/source/msforms/vbatextbox.hxx       |   30 +-
 main/vbahelper/source/msforms/vbatogglebutton.cxx  |   30 +-
 main/vbahelper/source/msforms/vbatogglebutton.hxx  |   32 +-
 main/vbahelper/source/msforms/vbauserform.cxx      |   36 +-
 main/vbahelper/source/msforms/vbauserform.hxx      |   36 +-
 main/vbahelper/source/vbahelper/collectionbase.cxx |   62 +-
 .../source/vbahelper/vbaapplicationbase.cxx        |   28 +-
 main/vbahelper/source/vbahelper/vbacolorformat.cxx |    8 +-
 main/vbahelper/source/vbahelper/vbacolorformat.hxx |    8 +-
 main/vbahelper/source/vbahelper/vbacommandbar.cxx  |   44 +-
 main/vbahelper/source/vbahelper/vbacommandbar.hxx  |   44 +-
 .../source/vbahelper/vbacommandbarcontrol.cxx      |   34 +-
 .../source/vbahelper/vbacommandbarcontrol.hxx      |   40 +-
 .../source/vbahelper/vbacommandbarcontrols.cxx     |   32 +-
 .../source/vbahelper/vbacommandbarcontrols.hxx     |   20 +-
 .../source/vbahelper/vbacommandbarhelper.cxx       |   20 +-
 .../source/vbahelper/vbacommandbarhelper.hxx       |   26 +-
 main/vbahelper/source/vbahelper/vbacommandbars.cxx |   18 +-
 main/vbahelper/source/vbahelper/vbacommandbars.hxx |   12 +-
 main/vbahelper/source/vbahelper/vbadialogbase.cxx  |    2 +-
 main/vbahelper/source/vbahelper/vbadialogsbase.cxx |    4 +-
 .../vbahelper/source/vbahelper/vbadocumentbase.cxx |   22 +-
 .../source/vbahelper/vbadocumentsbase.cxx          |   34 +-
 .../source/vbahelper/vbaeventshelperbase.cxx       |   18 +-
 main/vbahelper/source/vbahelper/vbafillformat.cxx  |   20 +-
 main/vbahelper/source/vbahelper/vbafillformat.hxx  |   20 +-
 main/vbahelper/source/vbahelper/vbafontbase.cxx    |   46 +-
 main/vbahelper/source/vbahelper/vbaglobalbase.cxx  |    6 +-
 main/vbahelper/source/vbahelper/vbahelper.cxx      |   56 +-
 main/vbahelper/source/vbahelper/vbalineformat.cxx  |   50 +-
 main/vbahelper/source/vbahelper/vbalineformat.hxx  |   50 +-
 .../source/vbahelper/vbapagesetupbase.cxx          |   30 +-
 .../source/vbahelper/vbapictureformat.cxx          |   17 +-
 .../source/vbahelper/vbapictureformat.hxx          |   16 +-
 main/vbahelper/source/vbahelper/vbapropvalue.cxx   |    4 +-
 main/vbahelper/source/vbahelper/vbashape.cxx       |   88 +-
 main/vbahelper/source/vbahelper/vbashaperange.cxx  |   60 +-
 main/vbahelper/source/vbahelper/vbashapes.cxx      |   36 +-
 main/vbahelper/source/vbahelper/vbatextframe.cxx   |   22 +-
 main/vbahelper/source/vbahelper/vbawindowbase.cxx  |   32 +-
 main/vcl/Library_vcl.mk                            |    6 +-
 main/vcl/aqua/source/a11y/aqua11ylistener.cxx      |    4 +-
 .../vcl/aqua/source/a11y/documentfocuslistener.cxx |   13 +-
 .../vcl/aqua/source/a11y/documentfocuslistener.hxx |   21 +-
 main/vcl/aqua/source/dtrans/DragSource.cxx         |   10 +-
 main/vcl/aqua/source/dtrans/DragSource.hxx         |   17 +-
 main/vcl/aqua/source/dtrans/DragSourceContext.cxx  |    4 -
 main/vcl/aqua/source/dtrans/DragSourceContext.hxx  |   12 +-
 main/vcl/aqua/source/dtrans/DropTarget.cxx         |   27 +-
 main/vcl/aqua/source/dtrans/DropTarget.hxx         |   33 +-
 main/vcl/aqua/source/dtrans/OSXTransferable.cxx    |    3 -
 main/vcl/aqua/source/dtrans/OSXTransferable.hxx    |    9 +-
 main/vcl/aqua/source/dtrans/aqua_clipboard.cxx     |   16 +-
 main/vcl/aqua/source/dtrans/aqua_clipboard.hxx     |   29 +-
 main/vcl/inc/aqua/aqua11ylistener.hxx              |    6 +-
 main/vcl/inc/canvasbitmap.hxx                      |   66 +-
 main/vcl/inc/dndevdis.hxx                          |   30 +-
 main/vcl/inc/dndlcon.hxx                           |   28 +-
 main/vcl/inc/vcl/ImageListProvider.hxx             |    2 +-
 main/vcl/inc/vcl/dndhelp.hxx                       |   48 +-
 main/vcl/inc/vcl/edit.hxx                          |   12 +-
 main/vcl/inc/vcl/unohelp2.hxx                      |    8 +-
 main/vcl/source/app/dndhelp.cxx                    |   48 +-
 main/vcl/source/app/session.cxx                    |   24 +-
 main/vcl/source/app/svdata.cxx                     |    4 +-
 main/vcl/source/app/svmain.cxx                     |    5 +-
 main/vcl/source/app/unohelp2.cxx                   |    8 +-
 main/vcl/source/components/display.cxx             |  120 +--
 main/vcl/source/components/dtranscomp.cxx          |   47 +-
 main/vcl/source/components/fontident.cxx           |   20 +-
 main/vcl/source/components/stringmirror.cxx        |   14 +-
 main/vcl/source/control/edit.cxx                   |   12 +-
 main/vcl/source/gdi/bmpconv.cxx                    |   14 +-
 main/vcl/source/gdi/textlayout.cxx                 |    1 +
 main/vcl/source/helper/canvasbitmap.cxx            |   70 +-
 main/vcl/source/helper/canvastools.cxx             |   23 +-
 main/vcl/source/window/dndevdis.cxx                |   18 +-
 main/vcl/source/window/dndlcon.cxx                 |   19 +-
 main/vcl/source/window/window.cxx                  |    4 +-
 main/vcl/test/canvasbitmaptest.cxx                 |   85 +-
 main/vcl/test/dndtest.cxx                          |   57 +-
 main/vcl/unx/generic/dtrans/X11_clipboard.cxx      |   11 +-
 main/vcl/unx/generic/dtrans/X11_clipboard.hxx      |   29 +-
 main/vcl/unx/generic/dtrans/X11_droptarget.cxx     |    2 +-
 main/vcl/unx/generic/dtrans/X11_selection.cxx      |    7 +-
 main/vcl/unx/generic/dtrans/X11_selection.hxx      |   14 +-
 main/vcl/unx/generic/dtrans/X11_transferable.cxx   |    3 -
 main/vcl/unx/generic/dtrans/X11_transferable.hxx   |   12 +-
 main/vcl/unx/gtk/a11y/atkaction.cxx                |    2 +-
 main/vcl/unx/gtk/a11y/atkcomponent.cxx             |    2 +-
 main/vcl/unx/gtk/a11y/atkeditabletext.cxx          |    2 +-
 main/vcl/unx/gtk/a11y/atkhypertext.cxx             |    2 +-
 main/vcl/unx/gtk/a11y/atkimage.cxx                 |    2 +-
 main/vcl/unx/gtk/a11y/atklistener.cxx              |    4 +-
 main/vcl/unx/gtk/a11y/atklistener.hxx              |    6 +-
 main/vcl/unx/gtk/a11y/atkselection.cxx             |    2 +-
 main/vcl/unx/gtk/a11y/atktable.cxx                 |    2 +-
 main/vcl/unx/gtk/a11y/atktext.cxx                  |    8 +-
 main/vcl/unx/gtk/a11y/atktextattributes.cxx        |    2 +-
 main/vcl/unx/gtk/a11y/atkutil.cxx                  |   34 +-
 main/vcl/unx/gtk/a11y/atkvalue.cxx                 |    2 +-
 .../inc/AccComponentEventListener.hxx              |    2 +-
 .../inc/AccContainerEventListener.hxx              |    2 +-
 .../inc/AccDescendantManagerEventListener.hxx      |    2 +-
 .../inc/AccDialogEventListener.hxx                 |    2 +-
 main/winaccessibility/inc/AccEventListener.hxx     |    6 +-
 .../winaccessibility/inc/AccFrameEventListener.hxx |    2 +-
 main/winaccessibility/inc/AccListEventListener.hxx |    2 +-
 main/winaccessibility/inc/AccMenuEventListener.hxx |    2 +-
 .../inc/AccParagraphEventListener.hxx              |    2 +-
 .../winaccessibility/inc/AccTableEventListener.hxx |    2 +-
 main/winaccessibility/inc/AccTopWindowListener.hxx |   18 +-
 main/winaccessibility/inc/AccTreeEventListener.hxx |    2 +-
 .../inc/AccWindowEventListener.hxx                 |    2 +-
 .../source/service/AccComponentEventListener.cxx   |    1 -
 .../source/service/AccContainerEventListener.cxx   |    1 -
 .../service/AccDescendantManagerEventListener.cxx  |    1 -
 .../source/service/AccDialogEventListener.cxx      |    1 -
 .../source/service/AccEventListener.cxx            |    4 +-
 .../source/service/AccFrameEventListener.cxx       |    1 -
 .../source/service/AccListEventListener.cxx        |    2 +-
 .../source/service/AccMenuEventListener.cxx        |    1 -
 .../source/service/AccParagraphEventListener.cxx   |    1 -
 .../source/service/AccTableEventListener.cxx       |    1 -
 .../source/service/AccTopWindowListener.cxx        |   18 +-
 .../source/service/AccTreeEventListener.cxx        |    2 +-
 .../source/service/AccWindowEventListener.cxx      |    2 +-
 .../source/service/msaaservice_impl.cxx            |   28 +-
 .../source/dmapper/DomainMapper_Impl.cxx           |    1 -
 .../source/dmapper/DomainMapper_Impl.hxx           |    3 +-
 main/writerfilter/source/dmapper/GraphicImport.cxx |   18 +-
 .../source/dmapper/ModelEventListener.cxx          |    4 +-
 .../source/dmapper/ModelEventListener.hxx          |    4 +-
 main/writerfilter/source/filter/ImportFilter.cxx   |   20 +-
 main/writerfilter/source/filter/RtfFilter.cxx      |   18 +-
 main/writerfilter/source/filter/RtfFilter.hxx      |   33 +-
 main/writerfilter/source/filter/WriterFilter.hxx   |   36 +-
 .../source/filter/WriterFilterDetection.cxx        |   14 +-
 .../source/filter/WriterFilterDetection.hxx        |   24 +-
 .../source/ooxml/OOXMLFastContextHandler.cxx       |   37 -
 .../source/ooxml/OOXMLFastContextHandler.hxx       |  111 +-
 .../source/ooxml/OOXMLFastDocumentHandler.cxx      |   10 -
 .../source/ooxml/OOXMLFastDocumentHandler.hxx      |   30 +-
 .../source/ooxml/OOXMLFastTokenHandler.cxx         |    5 +-
 .../source/ooxml/OOXMLFastTokenHandler.hxx         |    8 +-
 main/writerfilter/source/ooxml/OOXMLStreamImpl.cxx |    5 +-
 main/writerfilter/source/ooxml/OOXMLStreamImpl.hxx |   11 +-
 .../debugservices/doctok/DocTokAnalyzeService.cxx  |    5 +-
 .../debugservices/doctok/DocTokAnalyzeService.hxx  |    6 +-
 .../debugservices/doctok/DocTokTestService.cxx     |    6 +-
 .../debugservices/doctok/DocTokTestService.hxx     |    6 +-
 .../debugservices/ooxml/OOXMLAnalyzeService.cxx    |    5 +-
 .../debugservices/ooxml/OOXMLAnalyzeService.hxx    |    6 +-
 .../debugservices/ooxml/OOXMLTestService.cxx       |    6 +-
 .../debugservices/ooxml/OOXMLTestService.hxx       |    6 +-
 .../debugservices/rtftok/ScannerTestService.cxx    |    6 +-
 .../debugservices/rtftok/ScannerTestService.hxx    |    6 +-
 .../debugservices/rtftok/XMLScanner.cxx            |    6 +-
 .../debugservices/rtftok/XMLScanner.hxx            |    6 +-
 .../xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx |    4 +-
 .../source/cxxhelp/inc/util/Decompressor.hxx       |    2 +-
 .../cxxhelp/provider/bufferedinputstream.cxx       |   27 +-
 .../cxxhelp/provider/bufferedinputstream.hxx       |   56 +-
 main/xmlhelp/source/cxxhelp/provider/content.cxx   |    9 -
 main/xmlhelp/source/cxxhelp/provider/content.hxx   |   17 +-
 .../source/cxxhelp/provider/inputstream.cxx        |   26 -
 .../source/cxxhelp/provider/inputstream.hxx        |   44 +-
 main/xmlhelp/source/cxxhelp/provider/provider.cxx  |    7 -
 main/xmlhelp/source/cxxhelp/provider/provider.hxx  |   15 +-
 .../source/cxxhelp/provider/resultsetbase.cxx      |   72 --
 .../source/cxxhelp/provider/resultsetbase.hxx      |  177 +---
 .../source/cxxhelp/provider/resultsetforquery.cxx  |    3 +
 .../source/cxxhelp/provider/urlparameter.cxx       |   70 +-
 .../source/cxxhelp/provider/urlparameter.hxx       |    5 +-
 main/xmlhelp/source/treeview/tvfactory.cxx         |    9 -
 main/xmlhelp/source/treeview/tvfactory.hxx         |   23 +-
 main/xmlhelp/source/treeview/tvread.cxx            |   17 -
 main/xmlhelp/source/treeview/tvread.hxx            |   64 +-
 main/xmloff/inc/MetaExportComponent.hxx            |    5 +-
 main/xmloff/inc/MetaImportComponent.hxx            |    6 +-
 main/xmloff/inc/SchXMLExport.hxx                   |    2 +-
 main/xmloff/inc/SchXMLImport.hxx                   |    4 +-
 main/xmloff/inc/StyleMap.hxx                       |    2 +-
 main/xmloff/inc/XMLBasicExportFilter.hxx           |   24 +-
 .../inc/xmloff/XMLEmbeddedObjectExportFilter.hxx   |   45 +-
 main/xmloff/inc/xmloff/attrlist.hxx                |   16 +-
 main/xmloff/inc/xmloff/unoatrcn.hxx                |   26 +-
 main/xmloff/inc/xmloff/xmlerror.hxx                |    3 +-
 main/xmloff/inc/xmloff/xmlexp.hxx                  |   20 +-
 main/xmloff/inc/xmloff/xmlimp.hxx                  |   53 +-
 main/xmloff/inc/xmloff/xmlmetae.hxx                |   32 +-
 main/xmloff/inc/xmlversion.hxx                     |    7 +-
 main/xmloff/source/chart/ColorPropertySet.cxx      |   39 +-
 main/xmloff/source/chart/ColorPropertySet.hxx      |   52 +-
 main/xmloff/source/chart/SchXMLExport.cxx          |   17 +-
 main/xmloff/source/chart/SchXMLImport.cxx          |   11 +-
 main/xmloff/source/chart/SchXMLSeriesHelper.cxx    |    4 +
 main/xmloff/source/chart/SchXMLTableContext.cxx    |    1 +
 main/xmloff/source/core/PropertySetMerger.cxx      |   56 +-
 main/xmloff/source/core/XMLBasicExportFilter.cxx   |    8 -
 .../source/core/XMLEmbeddedObjectExportFilter.cxx  |   17 -
 main/xmloff/source/core/attrlist.cxx               |   15 +-
 main/xmloff/source/core/facreg.cxx                 |    3 +-
 main/xmloff/source/core/unoatrcn.cxx               |   16 +-
 main/xmloff/source/core/xmlerror.cxx               |    1 -
 main/xmloff/source/core/xmlexp.cxx                 |   17 +-
 main/xmloff/source/core/xmlimp.cxx                 |   26 +-
 main/xmloff/source/draw/animationimport.cxx        |   22 +-
 main/xmloff/source/draw/sdxmlexp.cxx               |   33 +-
 main/xmloff/source/draw/sdxmlexp_impl.hxx          |    4 +-
 main/xmloff/source/draw/sdxmlimp.cxx               |    6 +-
 main/xmloff/source/draw/sdxmlimp_impl.hxx          |    6 +-
 main/xmloff/source/draw/ximppage.cxx               |   16 +-
 main/xmloff/source/forms/attriblistmerge.cxx       |   12 +-
 main/xmloff/source/forms/attriblistmerge.hxx       |   12 +-
 main/xmloff/source/forms/elementexport.cxx         |    2 +-
 main/xmloff/source/forms/elementexport.hxx         |    2 +-
 main/xmloff/source/forms/eventexport.cxx           |   12 +-
 main/xmloff/source/forms/eventexport.hxx           |   12 +-
 .../source/forms/gridcolumnproptranslator.cxx      |   36 +-
 .../source/forms/gridcolumnproptranslator.hxx      |   24 +-
 main/xmloff/source/meta/MetaExportComponent.cxx    |    4 +-
 main/xmloff/source/meta/MetaImportComponent.cxx    |    2 -
 main/xmloff/source/meta/xmlmetae.cxx               |    8 -
 main/xmloff/source/meta/xmlversion.cxx             |    4 -
 main/xmloff/source/style/StyleMap.cxx              |    1 -
 main/xmloff/source/text/XMLAutoTextEventExport.cxx |    3 -
 main/xmloff/source/text/XMLAutoTextEventExport.hxx |   11 +-
 main/xmloff/source/text/XMLAutoTextEventImport.cxx |    2 -
 main/xmloff/source/text/XMLAutoTextEventImport.hxx |    8 +-
 main/xmloff/source/text/txtparae.cxx               |    1 +
 main/xmloff/source/transform/MutableAttrList.cxx   |    8 -
 main/xmloff/source/transform/MutableAttrList.hxx   |   16 +-
 main/xmloff/source/transform/OOo2Oasis.cxx         |   15 +-
 main/xmloff/source/transform/OOo2Oasis.hxx         |   26 +-
 main/xmloff/source/transform/Oasis2OOo.cxx         |    5 -
 main/xmloff/source/transform/Oasis2OOo.hxx         |    8 +-
 main/xmloff/source/transform/TransformerBase.cxx   |   16 +-
 main/xmloff/source/transform/TransformerBase.hxx   |   39 +-
 .../source/transform/XMLFilterRegistration.cxx     |    2 +-
 main/xmlreader/inc/xmlreader/xmlreader.hxx         |    5 +-
 main/xmlreader/source/xmlreader.cxx                |    4 +-
 main/xmlscript/inc/xmlscript/xml_helper.hxx        |   18 +-
 main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx      |   12 +-
 main/xmlscript/inc/xmlscript/xmllib_imexp.hxx      |   12 +-
 main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx      |    6 +-
 main/xmlscript/source/misc/unoservices.cxx         |   15 +-
 main/xmlscript/source/xml_helper/xml_byteseq.cxx   |   32 +-
 main/xmlscript/source/xml_helper/xml_element.cxx   |    6 -
 main/xmlscript/source/xml_helper/xml_impctx.cxx    |   93 +-
 main/xmlscript/source/xmldlg_imexp/exp_share.hxx   |   68 +-
 main/xmlscript/source/xmldlg_imexp/imp_share.hxx   |  194 ++--
 .../source/xmldlg_imexp/xmldlg_addfunc.cxx         |    6 +-
 .../source/xmldlg_imexp/xmldlg_expmodels.cxx       |   22 -
 .../source/xmldlg_imexp/xmldlg_export.cxx          |    2 -
 .../source/xmldlg_imexp/xmldlg_impmodels.cxx       |   50 -
 .../source/xmldlg_imexp/xmldlg_import.cxx          |   16 -
 .../source/xmlflat_imexp/xmlbas_export.cxx         |   15 +-
 .../source/xmlflat_imexp/xmlbas_export.hxx         |   27 +-
 .../source/xmlflat_imexp/xmlbas_import.cxx         |   41 +-
 .../source/xmlflat_imexp/xmlbas_import.hxx         |  108 +-
 main/xmlscript/source/xmllib_imexp/imp_share.hxx   |   54 +-
 .../source/xmllib_imexp/xmllib_export.cxx          |    2 -
 .../source/xmllib_imexp/xmllib_import.cxx          |   20 -
 main/xmlscript/source/xmlmod_imexp/imp_share.hxx   |   42 +-
 .../source/xmlmod_imexp/xmlmod_export.cxx          |    1 -
 .../source/xmlmod_imexp/xmlmod_import.cxx          |   15 -
 .../source/component/certificatecontainer.cxx      |   12 +-
 .../source/component/certificatecontainer.hxx      |   22 +-
 .../source/component/documentdigitalsignatures.cxx |   45 +-
 .../source/component/documentdigitalsignatures.hxx |   51 +-
 .../xmlsecurity/source/framework/decryptorimpl.cxx |   12 -
 .../xmlsecurity/source/framework/decryptorimpl.hxx |   36 +-
 .../source/framework/encryptionengine.cxx          |    2 -
 .../source/framework/encryptionengine.hxx          |    7 +-
 .../xmlsecurity/source/framework/encryptorimpl.cxx |   14 -
 .../xmlsecurity/source/framework/encryptorimpl.hxx |   42 +-
 .../source/framework/saxeventkeeperimpl.cxx        |   33 -
 .../source/framework/saxeventkeeperimpl.hxx        |   99 +-
 .../source/framework/securityengine.cxx            |    3 -
 .../source/framework/securityengine.hxx            |   13 +-
 .../source/framework/signaturecreatorimpl.cxx      |   13 -
 .../source/framework/signaturecreatorimpl.hxx      |   39 +-
 .../source/framework/signatureengine.cxx           |    5 -
 .../source/framework/signatureengine.hxx           |   16 +-
 .../source/framework/signatureverifierimpl.cxx     |   12 -
 .../source/framework/signatureverifierimpl.hxx     |   36 +-
 .../source/framework/xmlencryptiontemplateimpl.cxx |   21 +-
 .../source/framework/xmlencryptiontemplateimpl.hxx |   27 +-
 .../source/framework/xmlsignaturetemplateimpl.cxx  |   20 +-
 .../source/framework/xmlsignaturetemplateimpl.hxx  |   32 +-
 .../source/helper/xmlsignaturehelper2.cxx          |   12 -
 .../source/helper/xmlsignaturehelper2.hxx          |   36 +-
 main/xmlsecurity/source/helper/xsecctl.cxx         |    5 -
 main/xmlsecurity/source/helper/xsecctl.hxx         |   15 +-
 main/xmlsecurity/source/helper/xsecparser.cxx      |    9 -
 main/xmlsecurity/source/helper/xsecparser.hxx      |   27 +-
 .../xmlsec/certificateextension_xmlsecimpl.cxx     |    6 +-
 .../xmlsec/certificateextension_xmlsecimpl.hxx     |    6 +-
 .../xmlsec/mscrypt/sanextension_mscryptimpl.cxx    |    8 +-
 .../xmlsec/mscrypt/sanextension_mscryptimpl.hxx    |    8 +-
 .../mscrypt/securityenvironment_mscryptimpl.cxx    |   72 +-
 .../mscrypt/securityenvironment_mscryptimpl.hxx    |   76 +-
 .../xmlsec/mscrypt/seinitializer_mscryptimpl.cxx   |    9 -
 .../xmlsec/mscrypt/seinitializer_mscryptimpl.hxx   |   27 +-
 .../xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |   32 +-
 .../xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |   43 +-
 .../xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx   |   18 +-
 .../xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx   |   18 +-
 .../mscrypt/xmlsecuritycontext_mscryptimpl.cxx     |   24 +-
 .../mscrypt/xmlsecuritycontext_mscryptimpl.hxx     |   37 +-
 .../xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx    |   19 +-
 .../xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx    |   19 +-
 .../source/xmlsec/nss/ciphercontext.cxx            |    2 -
 .../source/xmlsec/nss/ciphercontext.hxx            |    4 +-
 .../source/xmlsec/nss/digestcontext.cxx            |    2 -
 .../source/xmlsec/nss/digestcontext.hxx            |    4 +-
 .../source/xmlsec/nss/nssinitializer.cxx           |    9 -
 .../source/xmlsec/nss/nssinitializer.hxx           |   25 +-
 .../source/xmlsec/nss/sanextension_nssimpl.cxx     |    8 +-
 .../source/xmlsec/nss/sanextension_nssimpl.hxx     |    8 +-
 .../xmlsec/nss/securityenvironment_nssimpl.cxx     |   58 +-
 .../xmlsec/nss/securityenvironment_nssimpl.hxx     |   62 +-
 .../source/xmlsec/nss/seinitializer_nssimpl.cxx    |    9 -
 .../source/xmlsec/nss/seinitializer_nssimpl.hxx    |   27 +-
 .../source/xmlsec/nss/x509certificate_nssimpl.cxx  |   32 +-
 .../source/xmlsec/nss/x509certificate_nssimpl.hxx  |   43 +-
 .../source/xmlsec/nss/xmlencryption_nssimpl.cxx    |   18 +-
 .../source/xmlsec/nss/xmlencryption_nssimpl.hxx    |   18 +-
 .../xmlsec/nss/xmlsecuritycontext_nssimpl.cxx      |   24 +-
 .../xmlsec/nss/xmlsecuritycontext_nssimpl.hxx      |   29 +-
 .../source/xmlsec/nss/xmlsignature_nssimpl.cxx     |   19 +-
 .../source/xmlsec/nss/xmlsignature_nssimpl.hxx     |   19 +-
 main/xmlsecurity/source/xmlsec/saxhelper.cxx       |    8 -
 main/xmlsecurity/source/xmlsec/saxhelper.hxx       |   24 +-
 .../xmlsec/xmldocumentwrapper_xmlsecimpl.cxx       |   37 -
 .../xmlsec/xmldocumentwrapper_xmlsecimpl.hxx       |  111 +-
 .../source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx |    9 -
 .../source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx |   27 +-
 main/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx     |    6 +-
 main/xmlsecurity/tools/demo/performance.cxx        |   69 +-
 main/xmlsecurity/tools/standalone/csfit/helper.cxx |    2 +-
 main/xmlsecurity/tools/standalone/csfit/helper.hxx |   22 +-
 .../tools/standalone/mscsfit/helper.cxx            |    2 +-
 .../tools/standalone/mscsfit/helper.hxx            |   22 +-
 win10-msvc/README.md                               |  517 ++++++++++
 5229 files changed, 63273 insertions(+), 95328 deletions(-)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..e78b3dff18
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+# Patch files must never be end-of-line normalised.
+#
+# A patch is compared against its target byte for byte -- tg_ext.mk applies
+# these with `patch --binary' on Windows -- so a patch whose context lines came
+# from a CRLF file has to keep them.  Without this, git converts on the way in
+# or out depending on core.autocrlf, and the patch then fails to apply on some
+# machines and not others, which is a miserable thing to debug.
+#
+# ext_libraries/coinmp/coinmp-1.8.4-v10-sln-paths.patch is the case that
+# prompted this: it patches a Visual Studio .sln, which is CRLF throughout.
+# Existing patches are LF-only, so marking them changes none of their bytes.
+*.patch -text
+*.diff  -text
diff --git a/.gitignore b/.gitignore
index 975503fa1d..18754d0a0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 /main/Linux*Env.Set*
 /main/MacOS*Env.Set*
 /main/OS2*Env.Set*
+/main/win*Env.Set*
 /main/ant.properties
 /main/autom4te.cache
 /main/config.guess
@@ -50,6 +51,8 @@ CVS
 TAGS
 \#*
 /log
+/*.txt
+/**/*.out
 
 # id-utils, ctags, cscope
 /ID
diff --git a/ext_libraries/coinmp/coinmp-1.7.6-clang-1.8.patch b/ext_libraries/coinmp/coinmp-1.7.6-clang-1.8.patch
deleted file mode 100644
index 5dda7ea93d..0000000000
--- a/ext_libraries/coinmp/coinmp-1.7.6-clang-1.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/build/CoinMP-1.7.6/Cbc/src/Cbc_C_Interface.cpp	2013-04-10 18:58:16.000000000 +0200
-+++ misc/build/CoinMP-1.7.6/Cbc/src/Cbc_C_Interface.cpp	2017-02-06 20:39:00.267698261 +0200
-@@ -376,7 +376,7 @@
- 
-     char * result = model->information_;
- 
--    if (VERBOSE > 0) printf("%s return %p\n", prefix, result);
-+    if (VERBOSE > 0) printf("%s return %p\n", prefix, static_cast<void*>(result));
-     return result;
- }
- /* Copy in integer information */
diff --git a/ext_libraries/coinmp/coinmp-1.7.6-clang.patch b/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
deleted file mode 100644
index 3be51e4351..0000000000
--- a/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- misc/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp	2011-01-04 00:31:00.000000000 +0100
-+++ misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp	2015-09-28 10:45:02.000000000 +0200
-@@ -44,7 +44,11 @@
- //-----------------------------------------------------------------------------
- 
- #if defined(__FreeBSD__) && defined(__GNUC__)
--   typedef typeof(SIG_DFL) CoinSighandler_t;
-+   #if defined(__clang__)
-+     typedef __decltype(SIG_DFL) CoinSighandler_t;
-+   #else
-+     typedef typeof(SIG_DFL) CoinSighandler_t;
-+   #endif
- #  define CoinSighandler_t_defined
- #endif
- 
-@@ -95,7 +99,10 @@
- 
- //-----------------------------------------------------------------------------
- 
--#if defined(__MACH__) && defined(__GNUC__)
-+#if defined(__clang__) && !defined(CoinSighandler_t_defined)
-+   typedef void(*CoinSighandler_t)(int);
-+#  define CoinSighandler_t_defined
-+#elif defined(__MACH__) && defined(__GNUC__)
-    typedef typeof(SIG_DFL) CoinSighandler_t;
- #  define CoinSighandler_t_defined
- #endif
diff --git a/ext_libraries/coinmp/coinmp-1.7.6-nopedantic.patch b/ext_libraries/coinmp/coinmp-1.7.6-nopedantic.patch
deleted file mode 100644
index 5e150ed3de..0000000000
--- a/ext_libraries/coinmp/coinmp-1.7.6-nopedantic.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -ru misc/CoinMP-1.7.6/BuildTools/coin.m4 misc/build/CoinMP-1.7.6/BuildTools/coin.m4
---- misc/CoinMP-1.7.6/BuildTools/coin.m4	2013-12-04 01:55:24.000000000 +0100
-+++ misc/build/CoinMP-1.7.6/BuildTools/coin.m4	2024-01-14 21:07:37.956268347 +0100
-@@ -407,7 +407,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
-             ;;
-         esac
-     esac
-@@ -813,7 +812,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
-             ;;
-         esac
-     esac
-diff -ru misc/CoinMP-1.7.6/Cbc/configure misc/build/CoinMP-1.7.6/Cbc/configure
---- misc/CoinMP-1.7.6/Cbc/configure	2024-01-14 21:06:04.060145560 +0100
-+++ misc/build/CoinMP-1.7.6/Cbc/configure	2024-01-14 21:06:52.980202550 +0100
-@@ -2898,7 +2898,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
-             ;;
-         esac
-     esac
-@@ -3780,7 +3779,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
-             ;;
-         esac
-     esac
-diff -ru misc/CoinMP-1.7.6/Cgl/configure misc/build/CoinMP-1.7.6/Cgl/configure
---- misc/CoinMP-1.7.6/Cgl/configure	2024-01-14 21:06:04.068145568 +0100
-+++ misc/build/CoinMP-1.7.6/Cgl/configure	2024-01-14 21:07:21.892243444 +0100
-@@ -2868,7 +2868,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
-             ;;
-         esac
-     esac
-@@ -3750,7 +3749,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
-             ;;
-         esac
-     esac
-diff -ru misc/CoinMP-1.7.6/Clp/configure misc/build/CoinMP-1.7.6/Clp/configure
---- misc/CoinMP-1.7.6/Clp/configure	2024-01-14 21:06:04.072145571 +0100
-+++ misc/build/CoinMP-1.7.6/Clp/configure	2024-01-14 21:08:12.220326395 +0100
-@@ -2895,7 +2895,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
-             ;;
-         esac
-     esac
-@@ -3777,7 +3776,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
-             ;;
-         esac
-     esac
-diff -ru misc/CoinMP-1.7.6/CoinMP/configure misc/build/CoinMP-1.7.6/CoinMP/configure
---- misc/CoinMP-1.7.6/CoinMP/configure	2024-01-14 21:06:04.076145576 +0100
-+++ misc/build/CoinMP-1.7.6/CoinMP/configure	2024-01-14 21:08:41.532381126 +0100
-@@ -2837,7 +2837,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
-             ;;
-         esac
-     esac
-@@ -3719,7 +3718,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
-             ;;
-         esac
-     esac
-diff -ru misc/CoinMP-1.7.6/CoinUtils/configure misc/build/CoinMP-1.7.6/CoinUtils/configure
---- misc/CoinMP-1.7.6/CoinUtils/configure	2024-01-14 21:06:04.080145580 +0100
-+++ misc/build/CoinMP-1.7.6/CoinUtils/configure	2024-01-14 21:09:04.552427204 +0100
-@@ -2894,7 +2894,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
-             ;;
-         esac
-     esac
-@@ -3776,7 +3775,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
-             ;;
-         esac
-     esac
-diff -ru misc/CoinMP-1.7.6/Osi/configure misc/build/CoinMP-1.7.6/Osi/configure
---- misc/CoinMP-1.7.6/Osi/configure	2024-01-14 21:06:04.084145583 +0100
-+++ misc/build/CoinMP-1.7.6/Osi/configure	2024-01-14 21:10:01.032550992 +0100
-@@ -2866,7 +2866,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
-             ;;
-         esac
-     esac
-@@ -3748,7 +3747,6 @@
-           *-darwin*)
-             ;;
-           *)
--            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
-             ;;
-         esac
-     esac
diff --git a/ext_libraries/coinmp/coinmp-1.8.4-v10-sln-paths.patch b/ext_libraries/coinmp/coinmp-1.8.4-v10-sln-paths.patch
new file mode 100644
index 0000000000..c4f69a235c
--- /dev/null
+++ b/ext_libraries/coinmp/coinmp-1.8.4-v10-sln-paths.patch
@@ -0,0 +1,70 @@
+--- misc/CoinMP-1.8.4/CoinMP/MSVisualStudio/v10/CoinMP.sln
++++ misc/build/CoinMP-1.8.4/CoinMP/MSVisualStudio/v10/CoinMP.sln
+@@ -2,15 +2,15 @@
+ Microsoft Visual Studio Solution File, Format Version 11.00
+ # Visual Studio 2010
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libClp", "..\..\..\Clp\MSVisualStudio\v9\libClp\libClp.vcxproj", "{4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libClp", "..\..\..\Clp\MSVisualStudio\v10\libClp\libClp.vcxproj", "{4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v9\libCoinUtils\libCoinUtils.vcxproj", "{C4867F15-438D-4FF8-8388-62FBAAA9786C}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v10\libCoinUtils\libCoinUtils.vcxproj", "{C4867F15-438D-4FF8-8388-62FBAAA9786C}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCgl", "..\..\..\Cgl\MSVisualStudio\v9\libCgl\libCgl.vcxproj", "{DBEA3904-F0B8-408A-9E1A-6497FEBE8C42}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCgl", "..\..\..\Cgl\MSVisualStudio\v10\libCgl\libCgl.vcxproj", "{DBEA3904-F0B8-408A-9E1A-6497FEBE8C42}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbc", "..\..\..\Cbc\MSVisualStudio\v9\libCbc\libCbc.vcxproj", "{363BA154-FEC9-4E1E-BC23-93CEC58AB785}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbc", "..\..\..\Cbc\MSVisualStudio\v10\libCbc\libCbc.vcxproj", "{363BA154-FEC9-4E1E-BC23-93CEC58AB785}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsi", "..\..\..\Osi\MSVisualStudio\v9\libOsi\libOsi.vcxproj", "{7D98E2CB-876E-4F75-9F71-77D3FE87E149}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsi", "..\..\..\Osi\MSVisualStudio\v10\libOsi\libOsi.vcxproj", "{7D98E2CB-876E-4F75-9F71-77D3FE87E149}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsiClp", "..\..\..\Clp\MSVisualStudio\v9\libOsiClp\libOsiClp.vcxproj", "{02D45875-A8CF-41B9-990B-3699C0ECFE10}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsiClp", "..\..\..\Clp\MSVisualStudio\v10\libOsiClp\libOsiClp.vcxproj", "{02D45875-A8CF-41B9-990B-3699C0ECFE10}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoinMP", "CoinMP\CoinMP.vcxproj", "{175F0674-F0B9-479C-9C9D-76969C06D794}"
+@@ -18,5 +18,5 @@
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unitTest", "unitTest\unitTest.vcxproj", "{9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbcSolver", "..\..\..\Cbc\MSVisualStudio\v9\libCbcSolver\libCbcSolver.vcxproj", "{71DA4595-E8A7-4B21-A00A-D96D29D11E3E}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbcSolver", "..\..\..\Cbc\MSVisualStudio\v10\libCbcSolver\libCbcSolver.vcxproj", "{71DA4595-E8A7-4B21-A00A-D96D29D11E3E}"
+ EndProject
+ Global
+--- misc/CoinMP-1.8.4/CoinMP/MSVisualStudio/v10/CoinMP/CoinMP.vcxproj
++++ misc/build/CoinMP-1.8.4/CoinMP/MSVisualStudio/v10/CoinMP/CoinMP.vcxproj
+@@ -199,29 +199,29 @@
+   </ItemGroup>
+   <ItemGroup>
+-    <ProjectReference Include="..\..\..\..\Cbc\MSVisualStudio\v9\libCbcSolver\libCbcSolver.vcxproj">
++    <ProjectReference Include="..\..\..\..\Cbc\MSVisualStudio\v10\libCbcSolver\libCbcSolver.vcxproj">
+       <Project>{71da4595-e8a7-4b21-a00a-d96d29d11e3e}</Project>
+       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\..\Cbc\MSVisualStudio\v9\libCbc\libCbc.vcxproj">
++    <ProjectReference Include="..\..\..\..\Cbc\MSVisualStudio\v10\libCbc\libCbc.vcxproj">
+       <Project>{363ba154-fec9-4e1e-bc23-93cec58ab785}</Project>
+       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\..\Cgl\MSVisualStudio\v9\libCgl\libCgl.vcxproj">
++    <ProjectReference Include="..\..\..\..\Cgl\MSVisualStudio\v10\libCgl\libCgl.vcxproj">
+       <Project>{dbea3904-f0b8-408a-9e1a-6497febe8c42}</Project>
+       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\..\Clp\MSVisualStudio\v9\libClp\libClp.vcxproj">
++    <ProjectReference Include="..\..\..\..\Clp\MSVisualStudio\v10\libClp\libClp.vcxproj">
+       <Project>{4f8f7d1c-3a9e-444d-8ee9-77f33fa05994}</Project>
+       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\..\Clp\MSVisualStudio\v9\libOsiClp\libOsiClp.vcxproj">
++    <ProjectReference Include="..\..\..\..\Clp\MSVisualStudio\v10\libOsiClp\libOsiClp.vcxproj">
+       <Project>{02d45875-a8cf-41b9-990b-3699c0ecfe10}</Project>
+       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\..\CoinUtils\MSVisualStudio\v9\libCoinUtils\libCoinUtils.vcxproj">
++    <ProjectReference Include="..\..\..\..\CoinUtils\MSVisualStudio\v10\libCoinUtils\libCoinUtils.vcxproj">
+       <Project>{c4867f15-438d-4ff8-8388-62fbaaa9786c}</Project>
+       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\..\Osi\MSVisualStudio\v9\libOsi\libOsi.vcxproj">
++    <ProjectReference Include="..\..\..\..\Osi\MSVisualStudio\v10\libOsi\libOsi.vcxproj">
+       <Project>{7d98e2cb-876e-4f75-9f71-77d3fe87e149}</Project>
+       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/ext_libraries/coinmp/coinmp-1.7.6.patch b/ext_libraries/coinmp/coinmp-1.8.4.patch
similarity index 73%
rename from ext_libraries/coinmp/coinmp-1.7.6.patch
rename to ext_libraries/coinmp/coinmp-1.8.4.patch
index 454f6180cf..2d4ed85fa3 100644
--- a/ext_libraries/coinmp/coinmp-1.7.6.patch
+++ b/ext_libraries/coinmp/coinmp-1.8.4.patch
@@ -1,6 +1,7 @@
---- misc/CoinMP-1.7.6/Cbc/configure	2013-12-17 21:33:48.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/Cbc/configure	2014-02-01 02:02:10.574696821 -0300
-@@ -9151,7 +9151,7 @@ if test -z "$aix_libpath"; then aix_libp
+diff -ru misc/CoinMP-1.8.4/Cbc/configure misc/build/CoinMP-1.8.4/Cbc/configure
+--- misc/CoinMP-1.8.4/Cbc/configure	2026-08-21 07:21:46.169068900 +0200
++++ misc/build/CoinMP-1.8.4/Cbc/configure	2026-08-21 07:21:49.853246400 +0200
+@@ -9103,7 +9103,7 @@
        hardcode_shlibpath_var=no
        ;;
  
@@ -9,7 +10,7 @@
        ld_shlibs=no
        ;;
  
-@@ -9167,7 +9167,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9119,7 +9119,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -18,7 +19,7 @@
        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct=yes
        hardcode_minus_L=yes
-@@ -9763,7 +9763,7 @@ dgux*)
+@@ -9715,7 +9715,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -27,7 +28,7 @@
    dynamic_linker=no
    ;;
  
-@@ -9786,7 +9786,7 @@ freebsd* | dragonfly*)
+@@ -9738,7 +9738,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -36,7 +37,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -9804,7 +9804,7 @@ freebsd* | dragonfly*)
+@@ -9756,7 +9756,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -45,7 +46,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12238,7 +12238,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12190,7 +12190,7 @@
  	;;
      esac
      ;;
@@ -54,7 +55,7 @@
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -13723,7 +13723,7 @@ dgux*)
+@@ -13675,7 +13675,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -63,7 +64,7 @@
    dynamic_linker=no
    ;;
  
-@@ -13746,7 +13746,7 @@ freebsd* | dragonfly*)
+@@ -13698,7 +13698,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -72,7 +73,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -13764,7 +13764,7 @@ freebsd* | dragonfly*)
+@@ -13716,7 +13716,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -81,7 +82,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15698,7 +15698,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15650,7 +15650,7 @@
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -90,7 +91,7 @@
        ld_shlibs_F77=no
        ;;
  
-@@ -15714,7 +15714,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15666,7 +15666,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -99,7 +100,7 @@
        archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_F77=yes
        hardcode_minus_L_F77=yes
-@@ -16310,7 +16310,7 @@ dgux*)
+@@ -16262,7 +16262,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -108,7 +109,7 @@
    dynamic_linker=no
    ;;
  
-@@ -16333,7 +16333,7 @@ freebsd* | dragonfly*)
+@@ -16285,7 +16285,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -117,7 +118,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -16351,7 +16351,7 @@ freebsd* | dragonfly*)
+@@ -16303,7 +16303,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -126,7 +127,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18297,7 +18297,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18249,7 +18249,7 @@
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -135,7 +136,7 @@
        ld_shlibs_GCJ=no
        ;;
  
-@@ -18313,7 +18313,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18265,7 +18265,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -144,7 +145,7 @@
        archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_GCJ=yes
        hardcode_minus_L_GCJ=yes
-@@ -18909,7 +18909,7 @@ dgux*)
+@@ -18861,7 +18861,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -153,7 +154,7 @@
    dynamic_linker=no
    ;;
  
-@@ -18932,7 +18932,7 @@ freebsd* | dragonfly*)
+@@ -18884,7 +18884,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -162,7 +163,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -18950,7 +18950,7 @@ freebsd* | dragonfly*)
+@@ -18902,7 +18902,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -171,9 +172,10 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/CoinMP-1.7.6/Cbc/ltmain.sh	2010-06-13 14:52:10.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/Cbc/ltmain.sh	2014-02-01 02:02:10.563696910 -0300
-@@ -3186,12 +3186,12 @@ EOF
+diff -ru misc/CoinMP-1.8.4/Cbc/ltmain.sh misc/build/CoinMP-1.8.4/Cbc/ltmain.sh
+--- misc/CoinMP-1.8.4/Cbc/ltmain.sh	2026-08-21 07:21:46.574029800 +0200
++++ misc/build/CoinMP-1.8.4/Cbc/ltmain.sh	2026-08-21 07:21:50.008195800 +0200
+@@ -3186,12 +3186,12 @@
  	  # which has an extra 1 added just for fun
  	  #
  	  case $version_type in
@@ -188,7 +190,7 @@
  	    current="$number_major"
  	    revision="$number_minor"
  	    age="0"
-@@ -3267,8 +3267,8 @@ EOF
+@@ -3267,8 +3267,8 @@
  	  ;;
  
  	freebsd-elf)
@@ -199,9 +201,10 @@
  	  ;;
  
  	irix | nonstopux)
---- misc/CoinMP-1.7.6/Cbc/src/CbcSolver.cpp	2013-04-17 07:02:33.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/Cbc/src/CbcSolver.cpp	2014-02-01 02:02:10.561696926 -0300
-@@ -1709,10 +1709,6 @@ int CbcMain1 (int argc, const char *argv
+diff -ru misc/CoinMP-1.8.4/Cbc/src/CbcSolver.cpp misc/build/CoinMP-1.8.4/Cbc/src/CbcSolver.cpp
+--- misc/CoinMP-1.8.4/Cbc/src/CbcSolver.cpp	2026-08-21 07:21:46.472950100 +0200
++++ misc/build/CoinMP-1.8.4/Cbc/src/CbcSolver.cpp	2026-08-21 07:21:50.042502900 +0200
+@@ -1877,10 +1877,6 @@
  	    }
  	    sprintf(generalPrint + strlen(generalPrint),
  		    "Build Date: %s \n", __DATE__);
@@ -212,9 +215,10 @@
              generalMessageHandler->message(CLP_GENERAL, generalMessages)
              << generalPrint
              << CoinMessageEol;
---- misc/CoinMP-1.7.6/Cgl/configure	2013-12-17 20:54:48.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/Cgl/configure	2014-02-01 02:02:10.579696781 -0300
-@@ -9121,7 +9121,7 @@ if test -z "$aix_libpath"; then aix_libp
+diff -ru misc/CoinMP-1.8.4/Cgl/configure misc/build/CoinMP-1.8.4/Cgl/configure
+--- misc/CoinMP-1.8.4/Cgl/configure	2026-08-21 07:21:47.449038900 +0200
++++ misc/build/CoinMP-1.8.4/Cgl/configure	2026-08-21 07:21:50.059230700 +0200
+@@ -9069,7 +9069,7 @@
        hardcode_shlibpath_var=no
        ;;
  
@@ -223,7 +227,7 @@
        ld_shlibs=no
        ;;
  
-@@ -9137,7 +9137,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9085,7 +9085,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -232,7 +236,7 @@
        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct=yes
        hardcode_minus_L=yes
-@@ -9733,7 +9733,7 @@ dgux*)
+@@ -9681,7 +9681,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -241,7 +245,7 @@
    dynamic_linker=no
    ;;
  
-@@ -9756,7 +9756,7 @@ freebsd* | dragonfly*)
+@@ -9704,7 +9704,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -250,7 +254,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -9774,7 +9774,7 @@ freebsd* | dragonfly*)
+@@ -9722,7 +9722,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -259,7 +263,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12208,7 +12208,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12156,7 +12156,7 @@
  	;;
      esac
      ;;
@@ -268,7 +272,7 @@
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -13693,7 +13693,7 @@ dgux*)
+@@ -13641,7 +13641,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -277,7 +281,7 @@
    dynamic_linker=no
    ;;
  
-@@ -13716,7 +13716,7 @@ freebsd* | dragonfly*)
+@@ -13664,7 +13664,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -286,7 +290,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -13734,7 +13734,7 @@ freebsd* | dragonfly*)
+@@ -13682,7 +13682,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -295,7 +299,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15668,7 +15668,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15616,7 +15616,7 @@
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -304,7 +308,7 @@
        ld_shlibs_F77=no
        ;;
  
-@@ -15684,7 +15684,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15632,7 +15632,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -313,7 +317,7 @@
        archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_F77=yes
        hardcode_minus_L_F77=yes
-@@ -16280,7 +16280,7 @@ dgux*)
+@@ -16228,7 +16228,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -322,7 +326,7 @@
    dynamic_linker=no
    ;;
  
-@@ -16303,7 +16303,7 @@ freebsd* | dragonfly*)
+@@ -16251,7 +16251,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -331,7 +335,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -16321,7 +16321,7 @@ freebsd* | dragonfly*)
+@@ -16269,7 +16269,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -340,7 +344,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18267,7 +18267,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18215,7 +18215,7 @@
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -349,7 +353,7 @@
        ld_shlibs_GCJ=no
        ;;
  
-@@ -18283,7 +18283,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18231,7 +18231,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -358,7 +362,7 @@
        archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_GCJ=yes
        hardcode_minus_L_GCJ=yes
-@@ -18879,7 +18879,7 @@ dgux*)
+@@ -18827,7 +18827,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -367,7 +371,7 @@
    dynamic_linker=no
    ;;
  
-@@ -18902,7 +18902,7 @@ freebsd* | dragonfly*)
+@@ -18850,7 +18850,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -376,7 +380,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -18920,7 +18920,7 @@ freebsd* | dragonfly*)
+@@ -18868,7 +18868,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -385,9 +389,10 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/CoinMP-1.7.6/Cgl/ltmain.sh	2010-06-13 14:52:57.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/Cgl/ltmain.sh	2014-02-01 02:02:10.564696901 -0300
-@@ -3186,12 +3186,12 @@ EOF
+diff -ru misc/CoinMP-1.8.4/Cgl/ltmain.sh misc/build/CoinMP-1.8.4/Cgl/ltmain.sh
+--- misc/CoinMP-1.8.4/Cgl/ltmain.sh	2026-08-21 07:21:47.456037500 +0200
++++ misc/build/CoinMP-1.8.4/Cgl/ltmain.sh	2026-08-21 07:21:50.292745700 +0200
+@@ -3186,12 +3186,12 @@
  	  # which has an extra 1 added just for fun
  	  #
  	  case $version_type in
@@ -402,7 +407,7 @@
  	    current="$number_major"
  	    revision="$number_minor"
  	    age="0"
-@@ -3267,8 +3267,8 @@ EOF
+@@ -3267,8 +3267,8 @@
  	  ;;
  
  	freebsd-elf)
@@ -413,9 +418,10 @@
  	  ;;
  
  	irix | nonstopux)
---- misc/CoinMP-1.7.6/Clp/configure	2013-12-17 19:17:18.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/Clp/configure	2014-02-01 02:02:10.583696749 -0300
-@@ -9148,7 +9148,7 @@ if test -z "$aix_libpath"; then aix_libp
+diff -ru misc/CoinMP-1.8.4/Clp/configure misc/build/CoinMP-1.8.4/Clp/configure
+--- misc/CoinMP-1.8.4/Clp/configure	2026-08-21 07:21:45.724004400 +0200
++++ misc/build/CoinMP-1.8.4/Clp/configure	2026-08-21 07:21:50.326108400 +0200
+@@ -9099,7 +9099,7 @@
        hardcode_shlibpath_var=no
        ;;
  
@@ -424,7 +430,7 @@
        ld_shlibs=no
        ;;
  
-@@ -9164,7 +9164,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9115,7 +9115,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -433,7 +439,7 @@
        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct=yes
        hardcode_minus_L=yes
-@@ -9760,7 +9760,7 @@ dgux*)
+@@ -9711,7 +9711,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -442,7 +448,7 @@
    dynamic_linker=no
    ;;
  
-@@ -9783,7 +9783,7 @@ freebsd* | dragonfly*)
+@@ -9734,7 +9734,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -451,7 +457,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -9801,7 +9801,7 @@ freebsd* | dragonfly*)
+@@ -9752,7 +9752,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -460,7 +466,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12235,7 +12235,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12186,7 +12186,7 @@
  	;;
      esac
      ;;
@@ -469,7 +475,7 @@
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -13720,7 +13720,7 @@ dgux*)
+@@ -13671,7 +13671,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -478,7 +484,7 @@
    dynamic_linker=no
    ;;
  
-@@ -13743,7 +13743,7 @@ freebsd* | dragonfly*)
+@@ -13694,7 +13694,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -487,7 +493,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -13761,7 +13761,7 @@ freebsd* | dragonfly*)
+@@ -13712,7 +13712,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -496,7 +502,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15695,7 +15695,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15646,7 +15646,7 @@
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -505,7 +511,7 @@
        ld_shlibs_F77=no
        ;;
  
-@@ -15711,7 +15711,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15662,7 +15662,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -514,7 +520,7 @@
        archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_F77=yes
        hardcode_minus_L_F77=yes
-@@ -16307,7 +16307,7 @@ dgux*)
+@@ -16258,7 +16258,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -523,7 +529,7 @@
    dynamic_linker=no
    ;;
  
-@@ -16330,7 +16330,7 @@ freebsd* | dragonfly*)
+@@ -16281,7 +16281,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -532,7 +538,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -16348,7 +16348,7 @@ freebsd* | dragonfly*)
+@@ -16299,7 +16299,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -541,7 +547,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18294,7 +18294,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18245,7 +18245,7 @@
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -550,7 +556,7 @@
        ld_shlibs_GCJ=no
        ;;
  
-@@ -18310,7 +18310,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18261,7 +18261,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -559,7 +565,7 @@
        archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_GCJ=yes
        hardcode_minus_L_GCJ=yes
-@@ -18906,7 +18906,7 @@ dgux*)
+@@ -18857,7 +18857,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -568,7 +574,7 @@
    dynamic_linker=no
    ;;
  
-@@ -18929,7 +18929,7 @@ freebsd* | dragonfly*)
+@@ -18880,7 +18880,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -577,7 +583,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -18947,7 +18947,7 @@ freebsd* | dragonfly*)
+@@ -18898,7 +18898,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -586,9 +592,10 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/CoinMP-1.7.6/Clp/ltmain.sh	2010-06-13 14:53:25.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/Clp/ltmain.sh	2014-02-01 02:02:10.566696885 -0300
-@@ -3186,12 +3186,12 @@ EOF
+diff -ru misc/CoinMP-1.8.4/Clp/ltmain.sh misc/build/CoinMP-1.8.4/Clp/ltmain.sh
+--- misc/CoinMP-1.8.4/Clp/ltmain.sh	2026-08-21 07:21:45.732572600 +0200
++++ misc/build/CoinMP-1.8.4/Clp/ltmain.sh	2026-08-21 07:21:50.478544200 +0200
+@@ -3186,12 +3186,12 @@
  	  # which has an extra 1 added just for fun
  	  #
  	  case $version_type in
@@ -603,7 +610,7 @@
  	    current="$number_major"
  	    revision="$number_minor"
  	    age="0"
-@@ -3267,8 +3267,8 @@ EOF
+@@ -3267,8 +3267,8 @@
  	  ;;
  
  	freebsd-elf)
@@ -614,9 +621,10 @@
  	  ;;
  
  	irix | nonstopux)
---- misc/CoinMP-1.7.6/CoinMP/configure	2013-12-19 12:56:13.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/CoinMP/configure	2014-02-01 02:02:10.586696725 -0300
-@@ -9090,7 +9090,7 @@ if test -z "$aix_libpath"; then aix_libp
+diff -ru misc/CoinMP-1.8.4/CoinMP/configure misc/build/CoinMP-1.8.4/CoinMP/configure
+--- misc/CoinMP-1.8.4/CoinMP/configure	2026-08-21 07:21:46.723348400 +0200
++++ misc/build/CoinMP-1.8.4/CoinMP/configure	2026-08-21 07:21:50.509624700 +0200
+@@ -9038,7 +9038,7 @@
        hardcode_shlibpath_var=no
        ;;
  
@@ -625,7 +633,7 @@
        ld_shlibs=no
        ;;
  
-@@ -9106,7 +9106,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9054,7 +9054,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -634,7 +642,7 @@
        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct=yes
        hardcode_minus_L=yes
-@@ -9702,7 +9702,7 @@ dgux*)
+@@ -9650,7 +9650,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -643,7 +651,7 @@
    dynamic_linker=no
    ;;
  
-@@ -9725,7 +9725,7 @@ freebsd* | dragonfly*)
+@@ -9673,7 +9673,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -652,7 +660,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -9743,7 +9743,7 @@ freebsd* | dragonfly*)
+@@ -9691,7 +9691,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -661,7 +669,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12177,7 +12177,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12125,7 +12125,7 @@
  	;;
      esac
      ;;
@@ -670,7 +678,7 @@
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -13662,7 +13662,7 @@ dgux*)
+@@ -13610,7 +13610,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -679,7 +687,7 @@
    dynamic_linker=no
    ;;
  
-@@ -13685,7 +13685,7 @@ freebsd* | dragonfly*)
+@@ -13633,7 +13633,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -688,7 +696,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -13703,7 +13703,7 @@ freebsd* | dragonfly*)
+@@ -13651,7 +13651,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -697,7 +705,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15637,7 +15637,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15585,7 +15585,7 @@
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -706,7 +714,7 @@
        ld_shlibs_F77=no
        ;;
  
-@@ -15653,7 +15653,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15601,7 +15601,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -715,7 +723,7 @@
        archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_F77=yes
        hardcode_minus_L_F77=yes
-@@ -16249,7 +16249,7 @@ dgux*)
+@@ -16197,7 +16197,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -724,7 +732,7 @@
    dynamic_linker=no
    ;;
  
-@@ -16272,7 +16272,7 @@ freebsd* | dragonfly*)
+@@ -16220,7 +16220,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -733,7 +741,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -16290,7 +16290,7 @@ freebsd* | dragonfly*)
+@@ -16238,7 +16238,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -742,7 +750,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18236,7 +18236,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18184,7 +18184,7 @@
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -751,7 +759,7 @@
        ld_shlibs_GCJ=no
        ;;
  
-@@ -18252,7 +18252,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18200,7 +18200,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -760,7 +768,7 @@
        archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_GCJ=yes
        hardcode_minus_L_GCJ=yes
-@@ -18848,7 +18848,7 @@ dgux*)
+@@ -18796,7 +18796,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -769,7 +777,7 @@
    dynamic_linker=no
    ;;
  
-@@ -18871,7 +18871,7 @@ freebsd* | dragonfly*)
+@@ -18819,7 +18819,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -778,7 +786,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -18889,7 +18889,7 @@ freebsd* | dragonfly*)
+@@ -18837,7 +18837,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -787,9 +795,10 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/CoinMP-1.7.6/CoinMP/ltmain.sh	2011-08-07 12:09:46.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/CoinMP/ltmain.sh	2014-02-01 02:02:10.567696878 -0300
-@@ -3186,12 +3186,12 @@ EOF
+diff -ru misc/CoinMP-1.8.4/CoinMP/ltmain.sh misc/build/CoinMP-1.8.4/CoinMP/ltmain.sh
+--- misc/CoinMP-1.8.4/CoinMP/ltmain.sh	2026-08-21 07:21:46.755096500 +0200
++++ misc/build/CoinMP-1.8.4/CoinMP/ltmain.sh	2026-08-21 07:21:50.605938000 +0200
+@@ -3186,12 +3186,12 @@
  	  # which has an extra 1 added just for fun
  	  #
  	  case $version_type in
@@ -804,7 +813,7 @@
  	    current="$number_major"
  	    revision="$number_minor"
  	    age="0"
-@@ -3267,8 +3267,8 @@ EOF
+@@ -3267,8 +3267,8 @@
  	  ;;
  
  	freebsd-elf)
@@ -815,9 +824,10 @@
  	  ;;
  
  	irix | nonstopux)
---- misc/CoinMP-1.7.6/CoinUtils/configure	2013-12-17 18:22:26.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/CoinUtils/configure	2014-02-01 02:02:10.592696677 -0300
-@@ -10533,7 +10533,7 @@ if test -z "$aix_libpath"; then aix_libp
+diff -ru misc/CoinMP-1.8.4/CoinUtils/configure misc/build/CoinMP-1.8.4/CoinUtils/configure
+--- misc/CoinMP-1.8.4/CoinUtils/configure	2026-08-21 07:21:47.421023200 +0200
++++ misc/build/CoinMP-1.8.4/CoinUtils/configure	2026-08-21 07:21:50.642368300 +0200
+@@ -10471,7 +10471,7 @@
        hardcode_shlibpath_var=no
        ;;
  
@@ -826,7 +836,7 @@
        ld_shlibs=no
        ;;
  
-@@ -10549,7 +10549,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10487,7 +10487,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -835,7 +845,7 @@
        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct=yes
        hardcode_minus_L=yes
-@@ -11145,7 +11145,7 @@ dgux*)
+@@ -11083,7 +11083,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -844,7 +854,7 @@
    dynamic_linker=no
    ;;
  
-@@ -11168,7 +11168,7 @@ freebsd* | dragonfly*)
+@@ -11106,7 +11106,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -853,7 +863,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -11186,7 +11186,7 @@ freebsd* | dragonfly*)
+@@ -11124,7 +11124,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -862,7 +872,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -13692,7 +13692,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -13630,7 +13630,7 @@
  	;;
      esac
      ;;
@@ -871,7 +881,7 @@
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -15177,7 +15177,7 @@ dgux*)
+@@ -15115,7 +15115,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -880,7 +890,7 @@
    dynamic_linker=no
    ;;
  
-@@ -15200,7 +15200,7 @@ freebsd* | dragonfly*)
+@@ -15138,7 +15138,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -889,7 +899,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -15218,7 +15218,7 @@ freebsd* | dragonfly*)
+@@ -15156,7 +15156,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -898,7 +908,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -17152,7 +17152,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17090,7 +17090,7 @@
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -907,7 +917,7 @@
        ld_shlibs_F77=no
        ;;
  
-@@ -17168,7 +17168,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17106,7 +17106,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -916,7 +926,7 @@
        archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_F77=yes
        hardcode_minus_L_F77=yes
-@@ -17764,7 +17764,7 @@ dgux*)
+@@ -17702,7 +17702,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -925,7 +935,7 @@
    dynamic_linker=no
    ;;
  
-@@ -17787,7 +17787,7 @@ freebsd* | dragonfly*)
+@@ -17725,7 +17725,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -934,7 +944,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -17805,7 +17805,7 @@ freebsd* | dragonfly*)
+@@ -17743,7 +17743,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -943,7 +953,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -19767,7 +19767,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -19705,7 +19705,7 @@
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -952,7 +962,7 @@
        ld_shlibs_GCJ=no
        ;;
  
-@@ -19783,7 +19783,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -19721,7 +19721,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -961,7 +971,7 @@
        archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_GCJ=yes
        hardcode_minus_L_GCJ=yes
-@@ -20379,7 +20379,7 @@ dgux*)
+@@ -20317,7 +20317,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -970,7 +980,7 @@
    dynamic_linker=no
    ;;
  
-@@ -20402,7 +20402,7 @@ freebsd* | dragonfly*)
+@@ -20340,7 +20340,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -979,7 +989,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -20420,7 +20420,7 @@ freebsd* | dragonfly*)
+@@ -20358,7 +20358,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -988,9 +998,10 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/CoinMP-1.7.6/CoinUtils/ltmain.sh	2010-06-13 14:53:51.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/CoinUtils/ltmain.sh	2014-02-01 02:02:10.568696869 -0300
-@@ -3186,12 +3186,12 @@ EOF
+diff -ru misc/CoinMP-1.8.4/CoinUtils/ltmain.sh misc/build/CoinMP-1.8.4/CoinUtils/ltmain.sh
+--- misc/CoinMP-1.8.4/CoinUtils/ltmain.sh	2026-08-21 07:21:47.370618400 +0200
++++ misc/build/CoinMP-1.8.4/CoinUtils/ltmain.sh	2026-08-21 07:21:50.776568600 +0200
+@@ -3186,12 +3186,12 @@
  	  # which has an extra 1 added just for fun
  	  #
  	  case $version_type in
@@ -1005,7 +1016,7 @@
  	    current="$number_major"
  	    revision="$number_minor"
  	    age="0"
-@@ -3267,8 +3267,8 @@ EOF
+@@ -3267,8 +3267,8 @@
  	  ;;
  
  	freebsd-elf)
@@ -1016,9 +1027,10 @@
  	  ;;
  
  	irix | nonstopux)
---- misc/CoinMP-1.7.6/Osi/configure	2013-12-17 18:46:39.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/Osi/configure	2014-02-01 02:02:10.596696644 -0300
-@@ -9119,7 +9119,7 @@ if test -z "$aix_libpath"; then aix_libp
+diff -ru misc/CoinMP-1.8.4/Osi/configure misc/build/CoinMP-1.8.4/Osi/configure
+--- misc/CoinMP-1.8.4/Osi/configure	2026-08-21 07:21:47.143449500 +0200
++++ misc/build/CoinMP-1.8.4/Osi/configure	2026-08-21 07:21:50.810293800 +0200
+@@ -9067,7 +9067,7 @@
        hardcode_shlibpath_var=no
        ;;
  
@@ -1027,7 +1039,7 @@
        ld_shlibs=no
        ;;
  
-@@ -9135,7 +9135,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9083,7 +9083,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -1036,7 +1048,7 @@
        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct=yes
        hardcode_minus_L=yes
-@@ -9731,7 +9731,7 @@ dgux*)
+@@ -9679,7 +9679,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -1045,7 +1057,7 @@
    dynamic_linker=no
    ;;
  
-@@ -9754,7 +9754,7 @@ freebsd* | dragonfly*)
+@@ -9702,7 +9702,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -1054,7 +1066,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -9772,7 +9772,7 @@ freebsd* | dragonfly*)
+@@ -9720,7 +9720,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -1063,7 +1075,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12206,7 +12206,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12154,7 +12154,7 @@
  	;;
      esac
      ;;
@@ -1072,7 +1084,7 @@
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -13691,7 +13691,7 @@ dgux*)
+@@ -13639,7 +13639,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -1081,7 +1093,7 @@
    dynamic_linker=no
    ;;
  
-@@ -13714,7 +13714,7 @@ freebsd* | dragonfly*)
+@@ -13662,7 +13662,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -1090,7 +1102,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -13732,7 +13732,7 @@ freebsd* | dragonfly*)
+@@ -13680,7 +13680,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -1099,7 +1111,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15666,7 +15666,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15614,7 +15614,7 @@
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -1108,7 +1120,7 @@
        ld_shlibs_F77=no
        ;;
  
-@@ -15682,7 +15682,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15630,7 +15630,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -1117,7 +1129,7 @@
        archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_F77=yes
        hardcode_minus_L_F77=yes
-@@ -16278,7 +16278,7 @@ dgux*)
+@@ -16226,7 +16226,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -1126,7 +1138,7 @@
    dynamic_linker=no
    ;;
  
-@@ -16301,7 +16301,7 @@ freebsd* | dragonfly*)
+@@ -16249,7 +16249,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -1135,7 +1147,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -16319,7 +16319,7 @@ freebsd* | dragonfly*)
+@@ -16267,7 +16267,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -1144,7 +1156,7 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18265,7 +18265,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18213,7 +18213,7 @@
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -1153,7 +1165,7 @@
        ld_shlibs_GCJ=no
        ;;
  
-@@ -18281,7 +18281,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18229,7 +18229,7 @@
        ;;
  
      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -1162,7 +1174,7 @@
        archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        hardcode_direct_GCJ=yes
        hardcode_minus_L_GCJ=yes
-@@ -18877,7 +18877,7 @@ dgux*)
+@@ -18825,7 +18825,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -1171,7 +1183,7 @@
    dynamic_linker=no
    ;;
  
-@@ -18900,7 +18900,7 @@ freebsd* | dragonfly*)
+@@ -18848,7 +18848,7 @@
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -1180,7 +1192,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -18918,7 +18918,7 @@ freebsd* | dragonfly*)
+@@ -18866,7 +18866,7 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -1189,9 +1201,10 @@
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/CoinMP-1.7.6/Osi/ltmain.sh	2010-06-13 14:59:18.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/Osi/ltmain.sh	2014-02-01 02:02:10.569696861 -0300
-@@ -3186,12 +3186,12 @@ EOF
+diff -ru misc/CoinMP-1.8.4/Osi/ltmain.sh misc/build/CoinMP-1.8.4/Osi/ltmain.sh
+--- misc/CoinMP-1.8.4/Osi/ltmain.sh	2026-08-21 07:21:47.137444800 +0200
++++ misc/build/CoinMP-1.8.4/Osi/ltmain.sh	2026-08-21 07:21:50.962755500 +0200
+@@ -3186,12 +3186,12 @@
  	  # which has an extra 1 added just for fun
  	  #
  	  case $version_type in
@@ -1206,7 +1219,7 @@
  	    current="$number_major"
  	    revision="$number_minor"
  	    age="0"
-@@ -3267,8 +3267,8 @@ EOF
+@@ -3267,8 +3267,8 @@
  	  ;;
  
  	freebsd-elf)
diff --git a/ext_libraries/coinmp/makefile.mk b/ext_libraries/coinmp/makefile.mk
index 9184fa2572..c56d4f6bdc 100644
--- a/ext_libraries/coinmp/makefile.mk
+++ b/ext_libraries/coinmp/makefile.mk
@@ -42,18 +42,49 @@ all:
 
 .ELSE
 
-TARFILE_NAME=CoinMP-1.7.6
-TARFILE_MD5=1cce53bf4b40ae29790d2c5c9f8b1129
+TARFILE_NAME=CoinMP-1.8.4
+TARFILE_MD5=dd85ff540997a95ebb233bb5ae7bcc61
 
-PATCH_FILES=coinmp-1.7.6.patch coinmp-1.7.6-clang.patch coinmp-1.7.6-clang-1.8.patch coinmp-1.7.6-nopedantic.patch
+# Only one patch survives the move from 1.7.6: the libtool freebsd1*/freebsd2*
+# glob fix (FreeBSD 10 and up match the pattern for FreeBSD 1) plus dropping a
+# CBC_SVN_REV printf.  1.8.4 still ships the old libtool, so it is still
+# needed, and all 127 hunks still apply.
+#
+# The other three are gone because 1.8.4 already contains them:
+#   coinmp-1.7.6-clang.patch      CoinSignal.hpp now uses __decltype(SIG_DFL)
+#                                 throughout rather than bare typeof
+#   coinmp-1.7.6-clang-1.8.patch  Cbc_C_Interface.cpp now prints results as
+#                                 static_cast<const void*>
+#   coinmp-1.7.6-nopedantic.patch -pedantic-errors is no longer added by
+#                                 coin.m4 or by any generated configure
+# Upstream packaging bug in 1.8.4: the v10 solution names its dependency
+# projects under MSVisualStudio\v9\ but with the .vcxproj extension, and the
+# v9 directories hold .vcproj -- so all seven paths point at files that do
+# not exist (MSB3202), the libraries never build, and CoinMP.def then fails
+# to resolve the Clp symbols it exports.
+PATCH_FILES=coinmp-1.8.4.patch coinmp-1.8.4-v10-sln-paths.patch
 .IF "$(OS)"=="OS2"
 PATCH_FILES+=coinmp-1.6.0-os2.patch
 .ENDIF
 
+# vcbuild.exe reads .vcproj and shipped with VS2005 and VS2008 only.  VS2010
+# replaced it with MSBuild and changed the project format to .vcxproj at the
+# same time, so a modern toolset cannot use the v9 solution at all.  CoinMP
+# ships both: v9 for vcbuild, v10 for MSBuild.  Each toolset gets the pair it
+# can actually drive, which is also what keeps the VC9 command line identical
+# to what it has always been.
 .IF "$(COM)$(CPU)"=="MSCI"
+.IF "$(COMEX)"=="14"
+BUILD_ACTION=$(MSBUILD_PATH)$/MSBuild.exe CoinMP\\MSVisualStudio\\v10\\CoinMP.sln /p:Configuration=Release /p:Platform=Win32 /p:PlatformToolset=$(VCTOOLSET) /p:WindowsTargetPlatformVersion=$(WINDOWS_SDK_VERSION)
+.ELSE
 BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
+.ENDIF
 .ELIF "$(COM)$(CPU)"=="MSCX"
+.IF "$(COMEX)"=="14"
+BUILD_ACTION=$(MSBUILD_PATH)$/MSBuild.exe CoinMP\\MSVisualStudio\\v10\\CoinMP.sln /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=$(VCTOOLSET) /p:WindowsTargetPlatformVersion=$(WINDOWS_SDK_VERSION)
+.ELSE
 BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|x64"
+.ENDIF
 .ELSE
 CONFIGURE_ACTION=./configure
 #CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC) $(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)' CFLAGS='$(ARCH_FLAGS) -Wc,-arch -Wc,i386' CPPFLAGS='$(ARCH_FLAGS)' LDFLAGS='$(ARCH_FLAGS)' compiler_flags='$(ARCH_FLAGS)'
@@ -80,11 +111,21 @@ CONFIGURE_FLAGS+= --disable-shared --enable-static
 OUT2INC+=CoinMP$/src/CoinMP.h
 
 .IF "$(OS)$(CPU)"=="WNTI"
+.IF "$(COMEX)"=="14"
+OUT2BIN+=CoinMP$/MSVisualStudio$/v10$/Release$/CoinMP.dll
+OUT2LIB+=CoinMP$/MSVisualStudio$/v10$/Release$/CoinMP.lib
+.ELSE
 OUT2BIN+=CoinMP$/MSVisualStudio$/v9$/release$/CoinMP.dll
 OUT2LIB+=CoinMP$/MSVisualStudio$/v9$/release$/CoinMP.lib
+.ENDIF
 .ELIF "$(OS)$(CPU)"=="WNTX"
+.IF "$(COMEX)"=="14"
+OUT2BIN+=CoinMP$/MSVisualStudio$/v10$/x64$/Release$/CoinMP.dll
+OUT2LIB+=CoinMP$/MSVisualStudio$/v10$/x64$/Release$/CoinMP.lib
+.ELSE
 OUT2BIN+=CoinMP$/MSVisualStudio$/v9$/x64$/Release$/CoinMP.dll
 OUT2LIB+=CoinMP$/MSVisualStudio$/v9$/x64$/Release$/CoinMP.lib
+.ENDIF
 .ELIF "$(OS)"=="OS2"
 OUT2BIN+=CoinMP$/src$/CoinMP.dll
 OUT2LIB+=CoinMP$/src$/.libs/CoinMP.lib
diff --git a/ext_libraries/gtest/use-own-tuple.patch b/ext_libraries/gtest/use-own-tuple.patch
index de9aa2fc87..760c7481fc 100644
--- a/ext_libraries/gtest/use-own-tuple.patch
+++ b/ext_libraries/gtest/use-own-tuple.patch
@@ -1,12 +1,20 @@
---- misc/gtest-1.7.0/include/gtest/internal/gtest-port.h	2013-09-18 19:48:30.000000000 +0200
-+++ misc/build/gtest-1.7.0/include/gtest/internal/gtest-port.h	2014-06-03 15:14:03.000000000 +0200
-@@ -76,6 +76,9 @@
+--- misc/gtest-1.7.0/include/gtest/internal/gtest-port.h
++++ misc/build/gtest-1.7.0/include/gtest/internal/gtest-port.h
+@@ -76,6 +76,17 @@
  //                              Test's own tr1 tuple implementation should be
  //                              used.  Unused when the user sets
  //                              GTEST_HAS_TR1_TUPLE to 0.
 +
++/*  VS2008 ships its own <tr1/tuple> only in a Feature Pack that cannot be
++    assumed present, so Google Test has to use its bundled tuple there.
++    From VS2010 on the detection further down gets this right unaided, and
++    forcing the bundled one is actively wrong on a toolset that has no
++    std::tr1 at all: gtest-tuple.h then tries to define into a namespace
++    the standard library no longer owns (C2888), and collides with the
++    real <tuple>. */
++#if defined(_MSC_VER) && (_MSC_VER < 1600)
 +#define GTEST_USE_OWN_TR1_TUPLE 1
-+
++#endif
  //   GTEST_LANG_CXX11         - Define it to 1/0 to indicate that Google Test
  //                              is building in C++11/C++98 mode.
  //   GTEST_LINKED_AS_SHARED_LIBRARY
diff --git a/ext_libraries/gtest/win/Library_gtest.mk b/ext_libraries/gtest/win/Library_gtest.mk
index 21e27ae48f..59be484c51 100644
--- a/ext_libraries/gtest/win/Library_gtest.mk
+++ b/ext_libraries/gtest/win/Library_gtest.mk
@@ -35,8 +35,15 @@ $(eval $(call gb_Library_add_defs,gtest,\
 	-DGTEST_CREATE_SHARED_LIBRARY=1 \
 ))
 
+# Was the literal list "kernel32 msvcrt oldnames", which is exactly
+# gb_STDLIBS without uwinapi -- so say that instead, and the UCRT's extra CRT
+# pieces arrive here the same way they arrive everywhere else.  Without them
+# the link fails on memcpy/memset and on the POSIX names oldnames.lib
+# forwards (dup2, read, write), which moved into ucrt.lib and vcruntime.lib.
+# On VC9 gb_STDLIBS is "uwinapi kernel32 msvcrt oldnames", so this expands to
+# the identical list it had before.
 $(eval $(call gb_Library_add_linked_libs,gtest,\
-    kernel32 msvcrt oldnames \
+    $(filter-out uwinapi,$(gb_STDLIBS)) \
     $(gb_Library_STLLIBS) \
 ))
 
diff --git a/main/UnoControls/inc/basecontainercontrol.hxx b/main/UnoControls/inc/basecontainercontrol.hxx
index 1543c3f183..27e2fa6e91 100644
--- a/main/UnoControls/inc/basecontainercontrol.hxx
+++ b/main/UnoControls/inc/basecontainercontrol.hxx
@@ -151,7 +151,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType );
 
 	//________________________________________________________________________________________________________
 	//	XTypeProvider
@@ -170,7 +170,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes();
 
 	//________________________________________________________________________________________________________
 	//	XAggregation
@@ -189,7 +189,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType );
 
 	//________________________________________________________________________________________________________
 	//	XControl
@@ -209,7 +209,7 @@ public:
 	*/
 
 	virtual void SAL_CALL createPeer(	const	UNO3_REFERENCE< UNO3_XTOOLKIT >&	xToolkit	,
-										const	UNO3_REFERENCE< UNO3_XWINDOWPEER >&	xParent		) throw( UNO3_RUNTIMEEXCEPTION );
+										const	UNO3_REFERENCE< UNO3_XWINDOWPEER >&	xParent		);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -224,7 +224,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -239,7 +239,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel();
 
 	//________________________________________________________________________________________________________
 	//	XComponent
@@ -258,7 +258,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL dispose();
 
 	//________________________________________________________________________________________________________
 	//	XEventListener
@@ -277,7 +277,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL disposing( const UNO3_EVENTOBJECT& rEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL disposing( const UNO3_EVENTOBJECT& rEvent );
 
 	//________________________________________________________________________________________________________
 	//	XControlContainer
@@ -297,7 +297,7 @@ public:
 	*/
 
     virtual void SAL_CALL addControl(	const	UNO3_OUSTRING&						sName		,
-										const	UNO3_REFERENCE< UNO3_XCONTROL >&	xControl	) throw( UNO3_RUNTIMEEXCEPTION	);
+										const	UNO3_REFERENCE< UNO3_XCONTROL >&	xControl	);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -312,7 +312,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual	void SAL_CALL addContainerListener( const UNO3_REFERENCE< UNO3_XCONTAINERLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual	void SAL_CALL addContainerListener( const UNO3_REFERENCE< UNO3_XCONTAINERLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -327,7 +327,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL removeControl( const UNO3_REFERENCE< UNO3_XCONTROL >& xControl ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeControl( const UNO3_REFERENCE< UNO3_XCONTROL >& xControl );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -342,7 +342,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL removeContainerListener( const UNO3_REFERENCE< UNO3_XCONTAINERLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeContainerListener( const UNO3_REFERENCE< UNO3_XCONTAINERLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -357,7 +357,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setStatusText( const UNO3_OUSTRING& sStatusText ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setStatusText( const UNO3_OUSTRING& sStatusText );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -372,7 +372,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XCONTROL > SAL_CALL getControl( const UNO3_OUSTRING& sName) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XCONTROL > SAL_CALL getControl( const UNO3_OUSTRING& sName);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -387,7 +387,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XCONTROL > > SAL_CALL getControls() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XCONTROL > > SAL_CALL getControls();
 
 	//________________________________________________________________________________________________________
 	//	XUnoControlContainer
@@ -406,7 +406,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL addTabController( const UNO3_REFERENCE< UNO3_XTABCONTROLLER >& xTabController ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addTabController( const UNO3_REFERENCE< UNO3_XTABCONTROLLER >& xTabController );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -421,7 +421,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL removeTabController( const UNO3_REFERENCE< UNO3_XTABCONTROLLER >& xTabController ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeTabController( const UNO3_REFERENCE< UNO3_XTABCONTROLLER >& xTabController );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -436,7 +436,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setTabControllers( const UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > >& xTabControllers ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setTabControllers( const UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > >& xTabControllers );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -451,7 +451,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > > SAL_CALL getTabControllers() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > > SAL_CALL getTabControllers();
 
 	//________________________________________________________________________________________________________
 	//	XWindow
@@ -470,7 +470,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL setVisible( sal_Bool bVisible );
 
 //____________________________________________________________________________________________________________
 //	protected methods
diff --git a/main/UnoControls/inc/basecontrol.hxx b/main/UnoControls/inc/basecontrol.hxx
index 811480a7fa..e4aad0cc96 100644
--- a/main/UnoControls/inc/basecontrol.hxx
+++ b/main/UnoControls/inc/basecontrol.hxx
@@ -223,7 +223,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType );
 
 	/**_______________________________________________________________________________________________________
 		@short		increment refcount
@@ -274,7 +274,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes();
 
 	/**_______________________________________________________________________________________________________
 		@short		get implementation id
@@ -290,7 +290,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_SEQUENCE< sal_Int8 > SAL_CALL getImplementationId() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_SEQUENCE< sal_Int8 > SAL_CALL getImplementationId();
 
 	//________________________________________________________________________________________________________
 	//	XAggregation
@@ -309,7 +309,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL setDelegator( const UNO3_REFERENCE< UNO3_XINTERFACE >& xDelegator ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL setDelegator( const UNO3_REFERENCE< UNO3_XINTERFACE >& xDelegator );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -324,7 +324,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType );
 
 	//________________________________________________________________________________________________________
 	//	XServiceInfo
@@ -343,7 +343,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual sal_Bool SAL_CALL supportsService( const UNO3_OUSTRING& sServiceName ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual sal_Bool SAL_CALL supportsService( const UNO3_OUSTRING& sServiceName );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -358,7 +358,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual UNO3_OUSTRING SAL_CALL getImplementationName() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_OUSTRING SAL_CALL getImplementationName();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -373,7 +373,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual UNO3_SEQUENCE< UNO3_OUSTRING > SAL_CALL getSupportedServiceNames() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_SEQUENCE< UNO3_OUSTRING > SAL_CALL getSupportedServiceNames();
 
 	//________________________________________________________________________________________________________
 	//	XComponent
@@ -392,7 +392,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL dispose();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -407,7 +407,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL addEventListener( const UNO3_REFERENCE< UNO3_XEVENTLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL addEventListener( const UNO3_REFERENCE< UNO3_XEVENTLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -422,7 +422,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL removeEventListener( const UNO3_REFERENCE< UNO3_XEVENTLISTENER >& xListener	) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL removeEventListener( const UNO3_REFERENCE< UNO3_XEVENTLISTENER >& xListener	);
 
 	//________________________________________________________________________________________________________
 	//	XControl
@@ -441,7 +441,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL createPeer( const UNO3_REFERENCE< UNO3_XTOOLKIT >& xToolkit, const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL createPeer( const UNO3_REFERENCE< UNO3_XTOOLKIT >& xToolkit, const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -456,7 +456,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setContext( const UNO3_REFERENCE< UNO3_XINTERFACE >& xContext ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setContext( const UNO3_REFERENCE< UNO3_XINTERFACE >& xContext );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -471,7 +471,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION ) = 0 ;
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) = 0 ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -486,7 +486,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setDesignMode( sal_Bool bOn );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -501,7 +501,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XINTERFACE > SAL_CALL getContext() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XINTERFACE > SAL_CALL getContext();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -516,7 +516,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION ) = 0;
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() = 0;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -531,7 +531,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XWINDOWPEER > SAL_CALL getPeer() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XWINDOWPEER > SAL_CALL getPeer();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -546,7 +546,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XVIEW > SAL_CALL getView() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XVIEW > SAL_CALL getView();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -561,7 +561,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual sal_Bool SAL_CALL isDesignMode() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL isDesignMode();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -576,7 +576,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual sal_Bool SAL_CALL isTransparent() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL isTransparent();
 
 	//________________________________________________________________________________________________________
 	//	XWindow
@@ -599,7 +599,7 @@ public:
 										sal_Int32	nY		,
 										sal_Int32	nWidth	,
 										sal_Int32	nHeight	,
-										sal_Int16	nFlags	) throw( UNO3_RUNTIMEEXCEPTION );
+										sal_Int16	nFlags	);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -614,7 +614,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setVisible( sal_Bool bVisible );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -629,7 +629,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setEnable( sal_Bool bEnable );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -644,7 +644,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setFocus() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setFocus();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -659,7 +659,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_RECTANGLE SAL_CALL getPosSize() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_RECTANGLE SAL_CALL getPosSize();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -674,7 +674,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL addWindowListener( const UNO3_REFERENCE< UNO3_XWINDOWLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addWindowListener( const UNO3_REFERENCE< UNO3_XWINDOWLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -689,7 +689,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL addFocusListener( const UNO3_REFERENCE< UNO3_XFOCUSLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addFocusListener( const UNO3_REFERENCE< UNO3_XFOCUSLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -704,7 +704,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL addKeyListener( const UNO3_REFERENCE< UNO3_XKEYLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addKeyListener( const UNO3_REFERENCE< UNO3_XKEYLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -719,7 +719,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL addMouseListener( const UNO3_REFERENCE< UNO3_XMOUSELISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addMouseListener( const UNO3_REFERENCE< UNO3_XMOUSELISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -734,7 +734,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL addMouseMotionListener( const UNO3_REFERENCE< UNO3_XMOUSEMOTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addMouseMotionListener( const UNO3_REFERENCE< UNO3_XMOUSEMOTIONLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -749,7 +749,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL addPaintListener( const UNO3_REFERENCE< UNO3_XPAINTLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addPaintListener( const UNO3_REFERENCE< UNO3_XPAINTLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -764,7 +764,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL removeWindowListener( const UNO3_REFERENCE< UNO3_XWINDOWLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeWindowListener( const UNO3_REFERENCE< UNO3_XWINDOWLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -779,7 +779,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL removeFocusListener( const UNO3_REFERENCE< UNO3_XFOCUSLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeFocusListener( const UNO3_REFERENCE< UNO3_XFOCUSLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -794,7 +794,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL removeKeyListener( const UNO3_REFERENCE< UNO3_XKEYLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeKeyListener( const UNO3_REFERENCE< UNO3_XKEYLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -809,7 +809,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL removeMouseListener( const UNO3_REFERENCE< UNO3_XMOUSELISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeMouseListener( const UNO3_REFERENCE< UNO3_XMOUSELISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -824,7 +824,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL removeMouseMotionListener( const UNO3_REFERENCE< UNO3_XMOUSEMOTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeMouseMotionListener( const UNO3_REFERENCE< UNO3_XMOUSEMOTIONLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -839,7 +839,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL removePaintListener( const UNO3_REFERENCE< UNO3_XPAINTLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removePaintListener( const UNO3_REFERENCE< UNO3_XPAINTLISTENER >& xListener );
 
 	//________________________________________________________________________________________________________
 	//	XView
@@ -859,7 +859,7 @@ public:
 	*/
 
     virtual void SAL_CALL draw(	sal_Int32	nX	,
-								sal_Int32	nY	) throw( UNO3_RUNTIMEEXCEPTION );
+								sal_Int32	nY	);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -874,7 +874,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual sal_Bool SAL_CALL setGraphics( const UNO3_REFERENCE< UNO3_XGRAPHICS >& xDevice ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL setGraphics( const UNO3_REFERENCE< UNO3_XGRAPHICS >& xDevice );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -890,7 +890,7 @@ public:
 	*/
 
 	virtual void SAL_CALL setZoom(	float	fZoomX	,
-									float	fZoomY	) throw( UNO3_RUNTIMEEXCEPTION );
+									float	fZoomY	);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -905,7 +905,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XGRAPHICS > SAL_CALL getGraphics() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XGRAPHICS > SAL_CALL getGraphics();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -920,7 +920,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_SIZE SAL_CALL getSize() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_SIZE SAL_CALL getSize();
 
 	//________________________________________________________________________________________________________
 	//	UNO3_XEVENTLISTENER
@@ -939,7 +939,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL disposing( const UNO3_EVENTOBJECT& rSource	) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL disposing( const UNO3_EVENTOBJECT& rSource	);
 
 	//________________________________________________________________________________________________________
 	//	XPaintListener
@@ -958,7 +958,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowPaint( const UNO3_PAINTEVENT& rEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL windowPaint( const UNO3_PAINTEVENT& rEvent );
 
 	//________________________________________________________________________________________________________
 	//	XWindowListener
@@ -977,10 +977,10 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowResized( const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
-    virtual void SAL_CALL windowMoved( const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
-    virtual void SAL_CALL windowShown( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
-    virtual void SAL_CALL windowHidden( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL windowResized( const UNO3_WINDOWEVENT& aEvent );
+    virtual void SAL_CALL windowMoved( const UNO3_WINDOWEVENT& aEvent );
+    virtual void SAL_CALL windowShown( const UNO3_EVENTOBJECT& aEvent );
+    virtual void SAL_CALL windowHidden( const UNO3_EVENTOBJECT& aEvent );
 
 	//________________________________________________________________________________________________________
 	//	impl but public method to register service
diff --git a/main/UnoControls/inc/multiplexer.hxx b/main/UnoControls/inc/multiplexer.hxx
index 5527667275..f4a8773d8f 100644
--- a/main/UnoControls/inc/multiplexer.hxx
+++ b/main/UnoControls/inc/multiplexer.hxx
@@ -175,7 +175,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType );
 
 	/**_______________________________________________________________________________________________________
 		@short		increment refcount
@@ -327,7 +327,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL disposing(const UNO3_EVENTOBJECT& aSource) throw( UNO3_RUNTIMEEXCEPTION ) ;
+	virtual void SAL_CALL disposing(const UNO3_EVENTOBJECT& aSource) ;
 
 	//________________________________________________________________________________________________________
 	//	XFocusListener
@@ -347,7 +347,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL focusGained(const UNO3_FOCUSEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL focusGained(const UNO3_FOCUSEVENT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -363,7 +363,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL focusLost(const UNO3_FOCUSEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL focusLost(const UNO3_FOCUSEVENT& aEvent ) ;
 
 	//________________________________________________________________________________________________________
 	//	XWindowListener
@@ -383,7 +383,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowResized(const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowResized(const UNO3_WINDOWEVENT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -399,7 +399,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowMoved(const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowMoved(const UNO3_WINDOWEVENT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -415,7 +415,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowShown(const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowShown(const UNO3_EVENTOBJECT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -431,7 +431,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowHidden(const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowHidden(const UNO3_EVENTOBJECT& aEvent ) ;
 
 	//________________________________________________________________________________________________________
 	//	XKeyListener
@@ -451,7 +451,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL keyPressed( const UNO3_KEYEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL keyPressed( const UNO3_KEYEVENT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -467,7 +467,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL keyReleased( const UNO3_KEYEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL keyReleased( const UNO3_KEYEVENT& aEvent ) ;
 
 	//________________________________________________________________________________________________________
 	//	XMouseListener
@@ -487,7 +487,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL mousePressed(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mousePressed(const UNO3_MOUSEEVENT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -503,7 +503,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL mouseReleased(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseReleased(const UNO3_MOUSEEVENT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -519,7 +519,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL mouseEntered(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseEntered(const UNO3_MOUSEEVENT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -535,7 +535,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL mouseExited(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseExited(const UNO3_MOUSEEVENT& aEvent ) ;
 
 	//________________________________________________________________________________________________________
 	//	XMouseMotionListener
@@ -555,7 +555,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL mouseDragged(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseDragged(const UNO3_MOUSEEVENT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -571,7 +571,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL mouseMoved(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseMoved(const UNO3_MOUSEEVENT& aEvent ) ;
 
 	//________________________________________________________________________________________________________
 	//	XPaintListener
@@ -591,7 +591,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowPaint(const UNO3_PAINTEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowPaint(const UNO3_PAINTEVENT& aEvent ) ;
 
 	//________________________________________________________________________________________________________
 	//	XTopWindowListener
@@ -611,7 +611,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL windowOpened( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+	virtual void SAL_CALL windowOpened( const UNO3_EVENTOBJECT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -627,7 +627,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL windowClosing( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+	virtual void SAL_CALL windowClosing( const UNO3_EVENTOBJECT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -643,7 +643,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowClosed( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowClosed( const UNO3_EVENTOBJECT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -659,7 +659,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL windowMinimized( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+	virtual void SAL_CALL windowMinimized( const UNO3_EVENTOBJECT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -675,7 +675,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL windowNormalized( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+	virtual void SAL_CALL windowNormalized( const UNO3_EVENTOBJECT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -691,7 +691,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowActivated( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowActivated( const UNO3_EVENTOBJECT& aEvent ) ;
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -707,7 +707,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL windowDeactivated( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowDeactivated( const UNO3_EVENTOBJECT& aEvent ) ;
 
 //____________________________________________________________________________________________________________
 //	protected methods
diff --git a/main/UnoControls/source/base/basecontainercontrol.cxx b/main/UnoControls/source/base/basecontainercontrol.cxx
index 619e2edfd4..68975cb600 100644
--- a/main/UnoControls/source/base/basecontainercontrol.cxx
+++ b/main/UnoControls/source/base/basecontainercontrol.cxx
@@ -71,7 +71,7 @@ BaseContainerControl::~BaseContainerControl()
 //	XInterface
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType )
 {
 	// Attention:
 	//	Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -96,7 +96,7 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru
 //	XTypeProvider
 //____________________________________________________________________________________________________________
 
-Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL BaseContainerControl::getTypes()
 {
 	// Optimize this method !
 	// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -128,7 +128,7 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti
 //	XAggregation
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType )
 {
 	// Ask for my own supported interfaces ...
 	// Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -156,7 +156,7 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw(
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::createPeer(	const	Reference< XToolkit >&		xToolkit	,
-												const	Reference< XWindowPeer >&	xParent		) throw( RuntimeException )
+												const	Reference< XWindowPeer >&	xParent		)
 {
 	if ( getPeer().is() == sal_False )
 	{
@@ -188,7 +188,7 @@ void SAL_CALL BaseContainerControl::createPeer(	const	Reference< XToolkit >&		xT
 //	XControl
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException )
+sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& )
 {
 	// This object has NO model.
 	return sal_False ;
@@ -198,7 +198,7 @@ sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel
 //	XControl
 //____________________________________________________________________________________________________________
 
-Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException )
+Reference< XControlModel > SAL_CALL BaseContainerControl::getModel()
 {
 	// This object has NO model.
 	// return (XControlModel*)this ;
@@ -209,7 +209,7 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt
 //	XComponent
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
+void SAL_CALL BaseContainerControl::dispose()
 {
 	// Zuerst der Welt mitteilen, da� der Container wegfliegt. Dieses ist um einiges
 	// schneller wenn die Welt sowohl an den Controls als auch am Container horcht
@@ -251,7 +251,7 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
 //	XEventListener
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent )
 {
 	Reference< XControl > xControl( rEvent.Source, UNO_QUERY );
 
@@ -263,7 +263,7 @@ void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw
 //	XControlContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl )
 {
 	if ( !rControl.is () )
         return;
@@ -322,7 +322,7 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
 //	XControlContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XContainerListener > & rListener )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -334,7 +334,7 @@ void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XCon
 //	XControlContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl )
 {
 	if ( rControl.is() )
 	{
@@ -385,7 +385,7 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
 //	XControlContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< XContainerListener > & rListener )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -397,7 +397,7 @@ void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< X
 //	XControlContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText )
 {
 	// go down to each parent
 	Reference< XControlContainer > 	xContainer ( getContext(), UNO_QUERY ) ;
@@ -412,7 +412,7 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText
 //	XControlContainer
 //____________________________________________________________________________________________________________
 
-Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName	) throw( RuntimeException )
+Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName	)
 {
 	// Ready for multithreading
 	MutexGuard	aGuard ( Mutex::getGlobalMutex() ) ;
@@ -441,7 +441,7 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString
 //	XControlContainer
 //____________________________________________________________________________________________________________
 
-Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException )
+Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls ()
 {
 	// Ready for multithreading
 	MutexGuard	aGuard ( Mutex::getGlobalMutex() ) ;
@@ -466,7 +466,7 @@ Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls ()
 //	XUnoControlContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabController > & rTabController )
 {
 	// Ready for multithreading
 	MutexGuard aGuard (m_aMutex) ;
@@ -492,7 +492,7 @@ void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabCont
 //	XUnoControlContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabController > & rTabController )
 {
 	// Ready for multithreading
 	MutexGuard aGuard (m_aMutex) ;
@@ -516,7 +516,7 @@ void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabC
 //	XUnoControlContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::setTabControllers ( const Sequence< Reference< XTabController >  >& rTabControllers ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::setTabControllers ( const Sequence< Reference< XTabController >  >& rTabControllers )
 {
 	// Ready for multithreading
 	MutexGuard aGuard (m_aMutex) ;
@@ -524,7 +524,7 @@ void SAL_CALL BaseContainerControl::setTabControllers ( const Sequence< Referenc
 	m_xTabControllerList = rTabControllers ;
 }
 
-Sequence<Reference< XTabController > > SAL_CALL BaseContainerControl::getTabControllers () throw( RuntimeException )
+Sequence<Reference< XTabController > > SAL_CALL BaseContainerControl::getTabControllers ()
 {
 	// Ready for multithreading
 	MutexGuard aGuard (m_aMutex) ;
@@ -536,7 +536,7 @@ Sequence<Reference< XTabController > > SAL_CALL BaseContainerControl::getTabCont
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible )
 {
 	// override baseclass definition
 	BaseControl::setVisible ( bVisible ) ;
diff --git a/main/UnoControls/source/base/basecontrol.cxx b/main/UnoControls/source/base/basecontrol.cxx
index 1044603eb2..976899bab2 100644
--- a/main/UnoControls/source/base/basecontrol.cxx
+++ b/main/UnoControls/source/base/basecontrol.cxx
@@ -95,7 +95,7 @@ BaseControl::~BaseControl()
 //	XInterface
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL BaseControl::queryInterface( const Type& rType )
 {
 	Any aReturn ;
 	if ( m_xDelegator.is() == sal_True )
@@ -143,7 +143,7 @@ void SAL_CALL BaseControl::release() throw()
 //	XTypeProvider
 //____________________________________________________________________________________________________________
 
-Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL BaseControl::getTypes()
 {
 	// Optimize this method !
 	// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -180,7 +180,7 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
 //	XTypeProvider
 //____________________________________________________________________________________________________________
 
-Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException )
+Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId()
 {
 	// Create one Id for all instances of this class.
 	// Use ethernet address to do this! (sal_True)
@@ -212,7 +212,7 @@ Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeE
 //	XAggregation
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException )
+void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -223,7 +223,7 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t
 //	XAggregation
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL BaseControl::queryAggregation( const Type& aType )
 {
 	// Ask for my own supported interfaces ...
 	// Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -254,7 +254,7 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx
 //	XServiceInfo
 //____________________________________________________________________________________________________________
 
-OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException )
+OUString SAL_CALL BaseControl::getImplementationName()
 {
 	return impl_getStaticImplementationName();
 }
@@ -263,7 +263,7 @@ OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException )
 //	XServiceInfo
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException )
+sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName )
 {
     Sequence< OUString >	seqServiceNames	=	getSupportedServiceNames();
     const OUString*			pArray			=	seqServiceNames.getConstArray();
@@ -281,7 +281,7 @@ sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) t
 //	XServiceInfo
 //____________________________________________________________________________________________________________
 
-Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames()
 {
 	return impl_getStaticSupportedServiceNames();
 }
@@ -290,7 +290,7 @@ Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( Run
 //	XComponent
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::dispose() throw( RuntimeException )
+void SAL_CALL BaseControl::dispose()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -319,7 +319,7 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException )
 //	XComponent
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -330,7 +330,7 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >&
 //	XComponent
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -342,7 +342,7 @@ void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::createPeer(	const	Reference< XToolkit >&		xToolkit	,
-										const	Reference< XWindowPeer >&	xParentPeer	) throw( RuntimeException )
+										const	Reference< XWindowPeer >&	xParentPeer	)
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -405,7 +405,7 @@ void SAL_CALL BaseControl::createPeer(	const	Reference< XToolkit >&		xToolkit	,
 //	XControl
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException )
+void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -416,7 +416,7 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext )
 //	XControl
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException )
+void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -427,7 +427,7 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException
 //	XControl
 //____________________________________________________________________________________________________________
 
-Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException )
+Reference< XInterface > SAL_CALL BaseControl::getContext()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -438,7 +438,7 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti
 //	XControl
 //____________________________________________________________________________________________________________
 
-Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException )
+Reference< XWindowPeer > SAL_CALL BaseControl::getPeer()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -449,7 +449,7 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException
 //	XControl
 //____________________________________________________________________________________________________________
 
-Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException )
+Reference< XView > SAL_CALL BaseControl::getView()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -460,7 +460,7 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException )
 //	XControl
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException )
+sal_Bool SAL_CALL BaseControl::isDesignMode()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -471,7 +471,7 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException )
 //	XControl
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException )
+sal_Bool SAL_CALL BaseControl::isTransparent()
 {
 	return sal_False ;
 }
@@ -484,7 +484,7 @@ void SAL_CALL BaseControl::setPosSize(	sal_Int32	nX		,
 										sal_Int32	nY		,
 										sal_Int32	nWidth	,
 										sal_Int32	nHeight	,
-										sal_Int16	nFlags	) throw( RuntimeException )
+										sal_Int16	nFlags	)
 {
 	// - change size and position of window and save the values
 	// - "nFlags" declared in <stardiv/uno/awt/window.hxx> ("#define PosSize_X .....")
@@ -524,7 +524,7 @@ void SAL_CALL BaseControl::setPosSize(	sal_Int32	nX		,
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException )
+void SAL_CALL BaseControl::setVisible( sal_Bool bVisible )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -543,7 +543,7 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException )
+void SAL_CALL BaseControl::setEnable( sal_Bool bEnable )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -562,7 +562,7 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::setFocus() throw( RuntimeException )
+void SAL_CALL BaseControl::setFocus()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -577,7 +577,7 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException )
 //	XWindow
 //____________________________________________________________________________________________________________
 
-Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException )
+Rectangle SAL_CALL BaseControl::getPosSize()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -588,7 +588,7 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException )
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener )
 {
 	impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
 }
@@ -597,7 +597,7 @@ void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener )
 {
 	impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
 }
@@ -606,7 +606,7 @@ void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >&
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener )
 {
 	impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
 }
@@ -615,7 +615,7 @@ void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xLis
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener )
 {
 	impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
 }
@@ -624,7 +624,7 @@ void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >&
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener )
 {
 	impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
 }
@@ -633,7 +633,7 @@ void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotion
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener )
 {
 	impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
 }
@@ -642,7 +642,7 @@ void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >&
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener )
 {
 	impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
 }
@@ -651,7 +651,7 @@ void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListene
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener )
 {
 	impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
 }
@@ -660,7 +660,7 @@ void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener )
 {
 	impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
 }
@@ -669,7 +669,7 @@ void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& x
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener )
 {
 	impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
 }
@@ -678,7 +678,7 @@ void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
+void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener )
 {
 	impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
 }
@@ -687,7 +687,7 @@ void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMo
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener )
 {
 	impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
 }
@@ -697,7 +697,7 @@ void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::draw(	sal_Int32	nX	,
-									sal_Int32	nY	) throw( RuntimeException )
+									sal_Int32	nY	)
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -712,7 +712,7 @@ void SAL_CALL BaseControl::draw(	sal_Int32	nX	,
 //	XView
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException )
+sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice )
 {
 	// - set the graphics for an view
 	// - in this class exist 2 graphics-member ... one for peer[_xGraphicsPeer] and one for view[_xGraphicsView]
@@ -735,7 +735,7 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::setZoom(	float	/*fZoomX*/	,
-									float	/*fZoomY*/	) throw( RuntimeException )
+									float	/*fZoomY*/	)
 {
 	// Not implemented yet
 }
@@ -744,7 +744,7 @@ void SAL_CALL BaseControl::setZoom(	float	/*fZoomX*/	,
 //	XView
 //____________________________________________________________________________________________________________
 
-Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException )
+Reference< XGraphics > SAL_CALL BaseControl::getGraphics()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -755,7 +755,7 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti
 //	XView
 //____________________________________________________________________________________________________________
 
-Size SAL_CALL BaseControl::getSize() throw( RuntimeException )
+Size SAL_CALL BaseControl::getSize()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -766,7 +766,7 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException )
 //	XEventListener
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
+void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -790,7 +790,7 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru
 //	XPaintListener
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -805,7 +805,7 @@ void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( Ru
 //	XWindowListener
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -822,7 +822,7 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run
 //	XWindowListener
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -839,7 +839,7 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti
 //	XWindowListener
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ )
 {
 }
 
@@ -847,7 +847,7 @@ void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( R
 //	XWindowListener
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ )
 {
 }
 
diff --git a/main/UnoControls/source/base/multiplexer.cxx b/main/UnoControls/source/base/multiplexer.cxx
index d1623109e9..a9a9e9637e 100644
--- a/main/UnoControls/source/base/multiplexer.cxx
+++ b/main/UnoControls/source/base/multiplexer.cxx
@@ -114,7 +114,7 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper()
 //	XInterface
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType )
 {
 	// Attention:
 	//	Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -274,7 +274,7 @@ void OMRCListenerMultiplexerHelper::unadvise(	const	Type&						aType		,
 //	XEventListener
 //____________________________________________________________________________________________________________
 
-void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
+void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ )
 {
 	MutexGuard aGuard( m_aMutex );
 	// peer is disposed, clear the reference
@@ -285,7 +285,7 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo
 //	XFcousListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent )
 {
 /*
 	OInterfaceContainerHelper * pCont = aListenerHolder.getContainer( ::getCppuType((const Reference< XFocusListener >*)0) );
@@ -321,7 +321,7 @@ void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw
 //	XFcousListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent )
 {
 	MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent )
 }
@@ -330,7 +330,7 @@ void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw(
 //	XWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent )
 {
 	MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent )
 }
@@ -339,7 +339,7 @@ void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) th
 //	XWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent )
 {
 	MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent )
 }
@@ -348,7 +348,7 @@ void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) thro
 //	XWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent )
 {
 	MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent )
 }
@@ -357,7 +357,7 @@ void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) thro
 //	XWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent )
 {
 	MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent )
 }
@@ -366,7 +366,7 @@ void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) thr
 //	XKeyListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent)
 {
 	MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent )
 }
@@ -375,7 +375,7 @@ void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( UN
 //	XKeyListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent)
 {
 	MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent )
 }
@@ -384,7 +384,7 @@ void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( U
 //	XMouseListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent)
 {
 	MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent )
 }
@@ -393,7 +393,7 @@ void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw
 //	XMouseListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent)
 {
 	MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent )
 }
@@ -402,7 +402,7 @@ void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) thro
 //	XMouseListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent)
 {
 	MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent )
 }
@@ -411,7 +411,7 @@ void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw
 //	XMouseListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent)
 {
 	MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent )
 }
@@ -420,7 +420,7 @@ void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw(
 //	XMouseMotionListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent)
 {
 	MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent )
 }
@@ -429,7 +429,7 @@ void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw
 //	XMouseMotionListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent)
 {
 	MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent )
 }
@@ -438,7 +438,7 @@ void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw(
 //	XPaintListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent)
 {
 	MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent )
 }
@@ -447,7 +447,7 @@ void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw(
 //	XTopWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent)
 {
 	MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent )
 }
@@ -456,7 +456,7 @@ void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) thro
 //	XTopWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent )
 {
 	MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent )
 }
@@ -465,7 +465,7 @@ void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) t
 //	XTopWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent )
 {
 	MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent )
 }
@@ -474,7 +474,7 @@ void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) th
 //	XTopWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent )
 {
 	MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent )
 }
@@ -483,7 +483,7 @@ void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent )
 //	XTopWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent )
 {
 	MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent )
 }
@@ -492,7 +492,7 @@ void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent
 //	XTopWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent )
 {
 	MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent )
 }
@@ -501,7 +501,7 @@ void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent )
 //	XTopWindowListener
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent )
 {
 	MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent )
 }
diff --git a/main/UnoControls/source/base/registercontrols.cxx b/main/UnoControls/source/base/registercontrols.cxx
index 25dbb0f7b3..2eda7ee1ed 100644
--- a/main/UnoControls/source/base/registercontrols.cxx
+++ b/main/UnoControls/source/base/registercontrols.cxx
@@ -82,7 +82,7 @@ using namespace ::com::sun::star::registry						;
 //******************************************************************************************************************************
 #define	CREATEINSTANCE(CLASS)																												\
 																																			\
-	static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception )	\
+	static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager )	\
 	{																																		\
 		AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" )																							\
 		return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) );													\
diff --git a/main/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/main/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
index 634945cf8b..33b01611cf 100644
--- a/main/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+++ b/main/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -66,7 +66,7 @@ OConnectionPointContainerHelper::~OConnectionPointContainerHelper()
 //	XInterface
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType )
 {
 	// Attention:
 	//	Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -117,7 +117,7 @@ void SAL_CALL OConnectionPointContainerHelper::release() throw()
 //	XConnectionPointContainer
 //______________________________________________________________________________________________________________
 
-Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes()
 {
 	// Container is threadsafe himself !
 	return m_aMultiTypeContainer.getContainedTypes();
@@ -127,7 +127,7 @@ Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTyp
 //	XConnectionPointContainer
 //______________________________________________________________________________________________________________
 
-Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException )
+Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType )
 {
 	// Set default return value, if method failed.
 	Reference< XConnectionPoint > xConnectionPoint = Reference< XConnectionPoint >();
@@ -151,7 +151,7 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon
 //______________________________________________________________________________________________________________
 
 void SAL_CALL OConnectionPointContainerHelper::advise(	const	Type&	   					aType		,
-														const	Reference< XInterface >&	xListener	) throw( RuntimeException )
+														const	Reference< XInterface >&	xListener	)
 {
 	// Container is threadsafe himself !
 	m_aMultiTypeContainer.addInterface( aType, xListener );
@@ -162,7 +162,7 @@ void SAL_CALL OConnectionPointContainerHelper::advise(	const	Type&	   					aType
 //______________________________________________________________________________________________________________
 
 void SAL_CALL OConnectionPointContainerHelper::unadvise(	const	Type&	   					aType		,
-															const	Reference< XInterface >&	xListener	) throw( RuntimeException )
+															const	Reference< XInterface >&	xListener	)
 {
 	// Container is threadsafe himself !
 	m_aMultiTypeContainer.removeInterface( aType, xListener );
diff --git a/main/UnoControls/source/controls/OConnectionPointHelper.cxx b/main/UnoControls/source/controls/OConnectionPointHelper.cxx
index 697a898749..1c2a067a7f 100644
--- a/main/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/main/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -70,7 +70,7 @@ OConnectionPointHelper::~OConnectionPointHelper()
 //	XInterface
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType )
 {
 	// Attention:
 	//	Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -121,7 +121,7 @@ void SAL_CALL OConnectionPointHelper::release() throw()
 //	XConnectionPoint
 //______________________________________________________________________________________________________________
 
-Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException )
+Type SAL_CALL OConnectionPointHelper::getConnectionType()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aSharedMutex );
@@ -145,7 +145,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio
 //	XConnectionPoint
 //______________________________________________________________________________________________________________
 
-Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException )
+Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aSharedMutex );
@@ -157,9 +157,7 @@ Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConne
 //	XConnectionPoint
 //______________________________________________________________________________________________________________
 
-void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw(	ListenerExistException		,
-																								InvalidListenerException	,
-																								RuntimeException			)
+void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aSharedMutex );
@@ -192,7 +190,7 @@ void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xLi
 //	XConnectionPoint
 //______________________________________________________________________________________________________________
 
-void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException )
+void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aSharedMutex );
@@ -213,7 +211,7 @@ void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& x
 //	XConnectionPoint
 //______________________________________________________________________________________________________________
 
-Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException )
+Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aSharedMutex );
diff --git a/main/UnoControls/source/controls/framecontrol.cxx b/main/UnoControls/source/controls/framecontrol.cxx
index 758d9edbac..25f1603a1e 100644
--- a/main/UnoControls/source/controls/framecontrol.cxx
+++ b/main/UnoControls/source/controls/framecontrol.cxx
@@ -78,7 +78,7 @@ FrameControl::~FrameControl()
 //	XInterface
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL FrameControl::queryInterface( const Type& rType )
 {
 	// Attention:
 	//	Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -129,7 +129,7 @@ void SAL_CALL FrameControl::release() throw()
 //	XTypeProvider
 //____________________________________________________________________________________________________________
 
-Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL FrameControl::getTypes()
 {
 	// Optimize this method !
 	// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -162,7 +162,7 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException )
 //	XAggregation
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL FrameControl::queryAggregation( const Type& aType )
 {
 	// Ask for my own supported interfaces ...
 	// Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -191,7 +191,7 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE
 //____________________________________________________________________________________________________________
 
 void SAL_CALL FrameControl::createPeer(	const	Reference< XToolkit >&		xToolkit	,
-										const	Reference< XWindowPeer >&	xParentPeer	) throw( RuntimeException )
+										const	Reference< XWindowPeer >&	xParentPeer	)
 {
 	BaseControl::createPeer( xToolkit, xParentPeer );
 	if ( impl_getPeerWindow().is() )
@@ -207,7 +207,7 @@ void SAL_CALL FrameControl::createPeer(	const	Reference< XToolkit >&		xToolkit	,
 //	XControl
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException )
+sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ )
 {
 	// We have no model.
 	return sal_False ;
@@ -217,7 +217,7 @@ sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xM
 //	XControl
 //____________________________________________________________________________________________________________
 
-Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException )
+Reference< XControlModel > SAL_CALL FrameControl::getModel()
 {
 	// We have no model.
 	return Reference< XControlModel >();
@@ -227,7 +227,7 @@ Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeExcep
 //	XControl
 //____________________________________________________________________________________________________________
 
-void SAL_CALL FrameControl::dispose() throw( RuntimeException )
+void SAL_CALL FrameControl::dispose()
 {
 	impl_deleteFrame();
 	BaseControl::dispose();
@@ -237,7 +237,7 @@ void SAL_CALL FrameControl::dispose() throw( RuntimeException )
 //	XView
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException )
+sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ )
 {
 	// it is not possible to print this control
 	return sal_False ;
@@ -247,7 +247,7 @@ sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDe
 //	XView
 //____________________________________________________________________________________________________________
 
-Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException )
+Reference< XGraphics > SAL_CALL FrameControl::getGraphics()
 {
 	// when it's not possible to set graphics ! then it's possible to return null
 	return Reference< XGraphics >();
@@ -257,7 +257,7 @@ Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeExcept
 //	XConnectionPointContainer
 //____________________________________________________________________________________________________________
 
-Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes()
 {
 	// Forwarded to helper class
 	return m_aConnectionPointContainer.getConnectionPointTypes();
@@ -267,7 +267,7 @@ Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( Runtime
 //	XConnectionPointContainer
 //____________________________________________________________________________________________________________
 
-Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException )
+Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType )
 {
 	// Forwarded to helper class
 	return m_aConnectionPointContainer.queryConnectionPoint( aType );
@@ -278,7 +278,7 @@ Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const
 //____________________________________________________________________________________________________________
 
 void SAL_CALL FrameControl::advise(	const	Type&						aType		,
-									const	Reference< XInterface >&	xListener	) throw( RuntimeException )
+									const	Reference< XInterface >&	xListener	)
 {
 	// Forwarded to helper class
 	m_aConnectionPointContainer.advise( aType, xListener );
@@ -289,7 +289,7 @@ void SAL_CALL FrameControl::advise(	const	Type&						aType		,
 //____________________________________________________________________________________________________________
 
 void SAL_CALL FrameControl::unadvise(	const	Type&						aType		,
-										const	Reference< XInterface >&	xListener	) throw( RuntimeException )
+										const	Reference< XInterface >&	xListener	)
 {
 	// Forwarded to helper class
 	m_aConnectionPointContainer.unadvise( aType, xListener );
@@ -323,7 +323,7 @@ const OUString FrameControl::impl_getStaticImplementationName()
 sal_Bool FrameControl::convertFastPropertyValue(		Any&		rConvertedValue	,
 														Any&		rOldValue		,
 														sal_Int32	nHandle			,
-												const	Any&		rValue			) throw( IllegalArgumentException )
+												const	Any&		rValue			)
 {
 	sal_Bool bReturn = sal_False ;
 	switch (nHandle)
@@ -353,7 +353,6 @@ sal_Bool FrameControl::convertFastPropertyValue(		Any&		rConvertedValue	,
 
 void FrameControl::setFastPropertyValue_NoBroadcast(			sal_Int32	nHandle	,
 														const	Any&		rValue	)
-														throw ( ::com::sun::star::uno::Exception )
 {
 	// this method only set the value
 	MutexGuard	aGuard (m_aMutex) ;
@@ -446,7 +445,7 @@ Uik* FrameControl::getConnectionPointUiks ( sal_Int32* pCount ) const
 //	OPropertySetHelper
 //____________________________________________________________________________________________________________
 
-Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( RuntimeException )
+Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo()
 {
 	// Optimize this method !
 	// We initialize a static variable only one time. And we don't must use a mutex at every call!
diff --git a/main/UnoControls/source/controls/progressbar.cxx b/main/UnoControls/source/controls/progressbar.cxx
index 072efe45b6..16b31989eb 100644
--- a/main/UnoControls/source/controls/progressbar.cxx
+++ b/main/UnoControls/source/controls/progressbar.cxx
@@ -81,7 +81,7 @@ ProgressBar::~ProgressBar()
 //	XInterface
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL ProgressBar::queryInterface( const Type& rType )
 {
 	// Attention:
 	//	Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -132,7 +132,7 @@ void SAL_CALL ProgressBar::release() throw()
 //	XTypeProvider
 //____________________________________________________________________________________________________________
 
-Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL ProgressBar::getTypes()
 {
 	// Optimize this method !
 	// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -164,7 +164,7 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException )
 //	XAggregation
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL ProgressBar::queryAggregation( const Type& aType )
 {
 	// Ask for my own supported interfaces ...
 	// Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -188,7 +188,7 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException )
+void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor )
 {
 	// Ready for multithreading
 	MutexGuard	aGuard (m_aMutex) ;
@@ -204,7 +204,7 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( Runtime
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException )
+void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor )
 {
 	// Ready for multithreading
 	MutexGuard	aGuard (m_aMutex) ;
@@ -220,7 +220,7 @@ void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( Runtim
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException )
+void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue )
 {
 	// This method is defined for follow things:
 	//		1) Values >= _nMinRange
@@ -251,7 +251,7 @@ void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException )
+void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax )
 {
 	// This method is defined for follow things:
 	//		1) All values of sal_Int32
@@ -295,7 +295,7 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException )
+sal_Int32 SAL_CALL ProgressBar::getValue ()
 {
 	// Ready for multithreading
 	MutexGuard aGuard (m_aMutex) ;
@@ -307,7 +307,7 @@ sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException )
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressBar::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException )
+void SAL_CALL ProgressBar::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags )
 {
 	// Take old size BEFORE you set the new values at baseclass!
 	// You will control changes. At the other way, the values are the same!
@@ -329,7 +329,7 @@ void SAL_CALL ProgressBar::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nW
 //	XControl
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException )
+sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ )
 {
 	// A model is not possible for this control.
 	return sal_False ;
@@ -339,7 +339,7 @@ sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xMo
 //	XControl
 //____________________________________________________________________________________________________________
 
-Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException )
+Reference< XControlModel > SAL_CALL ProgressBar::getModel()
 {
 	// A model is not possible for this control.
 	return Reference< XControlModel >();
diff --git a/main/UnoControls/source/controls/progressmonitor.cxx b/main/UnoControls/source/controls/progressmonitor.cxx
index 107f2f74a1..2c906219ba 100644
--- a/main/UnoControls/source/controls/progressmonitor.cxx
+++ b/main/UnoControls/source/controls/progressmonitor.cxx
@@ -129,7 +129,7 @@ ProgressMonitor::~ProgressMonitor()
 //	XInterface
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType )
 {
 	// Attention:
 	//	Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -180,7 +180,7 @@ void SAL_CALL ProgressMonitor::release() throw()
 //	XTypeProvider
 //____________________________________________________________________________________________________________
 
-Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL ProgressMonitor::getTypes()
 {
 	// Optimize this method !
 	// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -213,7 +213,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException )
 //	XAggregation
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType )
 {
 	// Ask for my own supported interfaces ...
 	// Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -238,7 +238,7 @@ Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( Runti
 //	XProgressMonitor
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::addText( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::addText( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress )
 {
 	// Safe impossible cases
 	// Check valid call of this method.
@@ -283,7 +283,7 @@ void SAL_CALL ProgressMonitor::addText( const OUString& rTopic, const OUString&
 //	XProgressMonitor
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress )
 {
 	// Safe impossible cases
 	// Check valid call of this method.
@@ -319,7 +319,7 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe
 //	XProgressMonitor
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::updateText ( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::updateText ( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress )
 {
 	// Safe impossible cases
 	// Check valid call of this method.
@@ -346,7 +346,7 @@ void SAL_CALL ProgressMonitor::updateText ( const OUString& rTopic, const OUStri
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -361,7 +361,7 @@ void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( Ru
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -376,7 +376,7 @@ void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( Ru
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -391,7 +391,7 @@ void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeExcep
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -406,7 +406,7 @@ void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw
 //	XProgressBar
 //____________________________________________________________________________________________________________
 
-sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException )
+sal_Int32 SAL_CALL ProgressMonitor::getValue ()
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -423,7 +423,7 @@ sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException )
 //	XButton
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::addActionListener ( const Reference< XActionListener > & rListener ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::addActionListener ( const Reference< XActionListener > & rListener )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -438,7 +438,7 @@ void SAL_CALL ProgressMonitor::addActionListener ( const Reference< XActionListe
 //	XButton
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::removeActionListener ( const Reference< XActionListener > & rListener ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::removeActionListener ( const Reference< XActionListener > & rListener )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -453,7 +453,7 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const Reference< XActionLi
 //	XButton
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -468,7 +468,7 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim
 //	XButton
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand )
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -483,7 +483,7 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr
 //	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
-Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException )
+Size SAL_CALL ProgressMonitor::getMinimumSize ()
 {
 	return Size (DEFAULT_WIDTH, DEFAULT_HEIGHT) ;
 }
@@ -492,7 +492,7 @@ Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException )
 //	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
-Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
+Size SAL_CALL ProgressMonitor::getPreferredSize ()
 {
 	// Ready for multithreading
 	ClearableMutexGuard aGuard ( m_aMutex ) ;
@@ -543,7 +543,7 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
 //	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
-Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException )
+Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ )
 {
 	return getPreferredSize () ;
 }
@@ -552,7 +552,7 @@ Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) thr
 //	XControl
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::createPeer ( const Reference< XToolkit > & rToolkit, const Reference< XWindowPeer > & rParent	) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::createPeer ( const Reference< XToolkit > & rToolkit, const Reference< XWindowPeer > & rParent	)
 {
 	if (!getPeer().is())
 	{
@@ -570,7 +570,7 @@ void SAL_CALL ProgressMonitor::createPeer ( const Reference< XToolkit > & rToolk
 //	XControl
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL ProgressMonitor::setModel ( const Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException )
+sal_Bool SAL_CALL ProgressMonitor::setModel ( const Reference< XControlModel > & /*rModel*/ )
 {
 	// We have no model.
 	return sal_False ;
@@ -580,7 +580,7 @@ sal_Bool SAL_CALL ProgressMonitor::setModel ( const Reference< XControlModel > &
 //	XControl
 //____________________________________________________________________________________________________________
 
-Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException )
+Reference< XControlModel > SAL_CALL ProgressMonitor::getModel ()
 {
 	// We have no model.
 	// return (XControlModel*)this ;
@@ -591,7 +591,7 @@ Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeE
 //	XComponent
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException )
+void SAL_CALL ProgressMonitor::dispose ()
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -627,7 +627,7 @@ void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException )
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags )
 {
 	Rectangle	aBasePosSize = getPosSize () ;
 	BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
diff --git a/main/UnoControls/source/controls/statusindicator.cxx b/main/UnoControls/source/controls/statusindicator.cxx
index 3d6e8c02c3..af4788bde4 100644
--- a/main/UnoControls/source/controls/statusindicator.cxx
+++ b/main/UnoControls/source/controls/statusindicator.cxx
@@ -98,7 +98,7 @@ StatusIndicator::~StatusIndicator()
 //	XInterface
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL StatusIndicator::queryInterface( const Type& rType )
 {
 	// Attention:
 	//	Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -149,7 +149,7 @@ void SAL_CALL StatusIndicator::release() throw()
 //	XTypeProvider
 //____________________________________________________________________________________________________________
 
-Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL StatusIndicator::getTypes()
 {
 	// Optimize this method !
 	// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -181,7 +181,7 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException )
 //	XAggregation
 //____________________________________________________________________________________________________________
 
-Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType )
 {
 	// Ask for my own supported interfaces ...
 	// Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -205,7 +205,7 @@ Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( Runti
 //	XStatusIndicator
 //____________________________________________________________________________________________________________
 
-void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) throw( RuntimeException )
+void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -221,7 +221,7 @@ void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange )
 //	XStatusIndicator
 //____________________________________________________________________________________________________________
 
-void SAL_CALL StatusIndicator::end() throw( RuntimeException )
+void SAL_CALL StatusIndicator::end()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -236,7 +236,7 @@ void SAL_CALL StatusIndicator::end() throw( RuntimeException )
 //	XStatusIndicator
 //____________________________________________________________________________________________________________
 
-void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException )
+void SAL_CALL StatusIndicator::setText( const OUString& sText )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -249,7 +249,7 @@ void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeEx
 //	XStatusIndicator
 //____________________________________________________________________________________________________________
 
-void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException )
+void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue )
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -262,7 +262,7 @@ void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeExcept
 //	XStatusIndicator
 //____________________________________________________________________________________________________________
 
-void SAL_CALL StatusIndicator::reset() throw( RuntimeException )
+void SAL_CALL StatusIndicator::reset()
 {
 	// Ready for multithreading
 	MutexGuard aGuard( m_aMutex );
@@ -277,7 +277,7 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException )
 //	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
-Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException )
+Size SAL_CALL StatusIndicator::getMinimumSize ()
 {
 	return Size (DEFAULT_WIDTH, DEFAULT_HEIGHT) ;
 }
@@ -286,7 +286,7 @@ Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException )
 //	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
-Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
+Size SAL_CALL StatusIndicator::getPreferredSize ()
 {
 	// Ready for multithreading
 	ClearableMutexGuard aGuard ( m_aMutex ) ;
@@ -319,7 +319,7 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
 //	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
-Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException )
+Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ )
 {
 	return getPreferredSize () ;
 }
@@ -328,7 +328,7 @@ Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) thr
 //	XControl
 //____________________________________________________________________________________________________________
 
-void SAL_CALL StatusIndicator::createPeer ( const Reference< XToolkit > & rToolkit, const Reference< XWindowPeer > & rParent	) throw( RuntimeException )
+void SAL_CALL StatusIndicator::createPeer ( const Reference< XToolkit > & rToolkit, const Reference< XWindowPeer > & rParent	)
 {
 	if( getPeer().is() == sal_False )
 	{
@@ -346,7 +346,7 @@ void SAL_CALL StatusIndicator::createPeer ( const Reference< XToolkit > & rToolk
 //	XControl
 //____________________________________________________________________________________________________________
 
-sal_Bool SAL_CALL StatusIndicator::setModel ( const Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException )
+sal_Bool SAL_CALL StatusIndicator::setModel ( const Reference< XControlModel > & /*rModel*/ )
 {
 	// We have no model.
 	return sal_False ;
@@ -356,7 +356,7 @@ sal_Bool SAL_CALL StatusIndicator::setModel ( const Reference< XControlModel > &
 //	XControl
 //____________________________________________________________________________________________________________
 
-Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException )
+Reference< XControlModel > SAL_CALL StatusIndicator::getModel ()
 {
 	// We have no model.
 	// return (XControlModel*)this ;
@@ -367,7 +367,7 @@ Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeE
 //	XComponent
 //____________________________________________________________________________________________________________
 
-void SAL_CALL StatusIndicator::dispose () throw( RuntimeException )
+void SAL_CALL StatusIndicator::dispose ()
 {
 	// Ready for multithreading
 	MutexGuard aGuard ( m_aMutex ) ;
@@ -390,7 +390,7 @@ void SAL_CALL StatusIndicator::dispose () throw( RuntimeException )
 //	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL StatusIndicator::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException )
+void SAL_CALL StatusIndicator::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags )
 {
 	Rectangle	aBasePosSize = getPosSize () ;
 	BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
diff --git a/main/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/main/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index bd8723e2b4..5e05331edf 100644
--- a/main/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/main/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -127,7 +127,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType );
 
 	/**_______________________________________________________________________________________________________
 		@short		increment refcount
@@ -178,7 +178,7 @@ public:
 		@onerror
 	*/
 
-    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes();
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -193,7 +193,7 @@ public:
 		@onerror
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -209,7 +209,7 @@ public:
 	*/
 
     virtual void SAL_CALL advise(	const	UNO3_TYPE&							aType		,
-									const	UNO3_REFERENCE< UNO3_XINTERFACE >&	xListener	) throw( UNO3_RUNTIMEEXCEPTION );
+									const	UNO3_REFERENCE< UNO3_XINTERFACE >&	xListener	);
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -225,7 +225,7 @@ public:
 	*/
 
     virtual void SAL_CALL unadvise(	const	UNO3_TYPE&							aType		,
-									const	UNO3_REFERENCE< UNO3_XINTERFACE >&	xListener	) throw( UNO3_RUNTIMEEXCEPTION );
+									const	UNO3_REFERENCE< UNO3_XINTERFACE >&	xListener	);
 
 	/**_________________________________________________________________________________________________________
 		@short
diff --git a/main/UnoControls/source/inc/OConnectionPointHelper.hxx b/main/UnoControls/source/inc/OConnectionPointHelper.hxx
index 778db5cac5..2580d40d7d 100644
--- a/main/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/main/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -131,7 +131,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType );
 
 	/**_______________________________________________________________________________________________________
 		@short		increment refcount
@@ -182,7 +182,7 @@ public:
 		@onerror
 	*/
 
-    virtual UNO3_TYPE SAL_CALL getConnectionType() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_TYPE SAL_CALL getConnectionType();
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -197,7 +197,7 @@ public:
 		@onerror
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINTCONTAINER > SAL_CALL getConnectionPointContainer() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINTCONTAINER > SAL_CALL getConnectionPointContainer();
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -212,9 +212,7 @@ public:
 		@onerror
 	*/
 
-    virtual void SAL_CALL advise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw(	UNO3_LISTENEREXISTEXCEPTION		,
-																								UNO3_INVALIDLISTENEREXCEPTION	,
-																								UNO3_RUNTIMEEXCEPTION			);
+    virtual void SAL_CALL advise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -229,7 +227,7 @@ public:
 		@onerror
 	*/
 
-    virtual void SAL_CALL unadvise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL unadvise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -244,7 +242,7 @@ public:
 		@onerror
 	*/
 
-    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XINTERFACE > > SAL_CALL getConnections() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XINTERFACE > > SAL_CALL getConnections();
 
 //______________________________________________________________________________________________________________
 //	private methods
diff --git a/main/UnoControls/source/inc/framecontrol.hxx b/main/UnoControls/source/inc/framecontrol.hxx
index 8b7e8a8d80..5ad3d8bc27 100644
--- a/main/UnoControls/source/inc/framecontrol.hxx
+++ b/main/UnoControls/source/inc/framecontrol.hxx
@@ -157,7 +157,7 @@ public:
 		@onerror
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType );
 
 	/**_______________________________________________________________________________________________________
 		@short		increment refcount
@@ -208,7 +208,7 @@ public:
 		@onerror
 	*/
 
-	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes();
 
 	//__________________________________________________________________________________________________________
 	//	XAggregation
@@ -227,7 +227,7 @@ public:
 		@onerror
 	*/
 
-	UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType );
 
 	//__________________________________________________________________________________________________________
 	//	XControl
@@ -247,7 +247,7 @@ public:
 	*/
 
     virtual void SAL_CALL createPeer(	const	UNO3_REFERENCE< UNO3_XTOOLKIT >&	xToolkit	,
-										const	UNO3_REFERENCE< UNO3_XWINDOWPEER >&	xParent		) throw( UNO3_RUNTIMEEXCEPTION );
+										const	UNO3_REFERENCE< UNO3_XWINDOWPEER >&	xParent		);
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -262,7 +262,7 @@ public:
 		@onerror
 	*/
 
-    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -277,7 +277,7 @@ public:
 		@onerror
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel();
 
 	//__________________________________________________________________________________________________________
     //	XComponent
@@ -296,7 +296,7 @@ public:
 		@onerror
 	*/
 
-    virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL dispose();
 
 	//__________________________________________________________________________________________________________
 	//	XView
@@ -315,7 +315,7 @@ public:
 		@onerror
 	*/
 
-    virtual sal_Bool SAL_CALL setGraphics( const UNO3_REFERENCE< UNO3_XGRAPHICS >& xDevice ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL setGraphics( const UNO3_REFERENCE< UNO3_XGRAPHICS >& xDevice );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -330,7 +330,7 @@ public:
 		@onerror
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XGRAPHICS > SAL_CALL getGraphics() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XGRAPHICS > SAL_CALL getGraphics();
 
 	//__________________________________________________________________________________________________________
 	//	XConnectionPointContainer
@@ -349,7 +349,7 @@ public:
 		@onerror
 	*/
 
-	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes();
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -364,7 +364,7 @@ public:
 		@onerror
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -380,7 +380,7 @@ public:
 	*/
 
     virtual void SAL_CALL advise(	const	UNO3_TYPE&							aType		,
-									const	UNO3_REFERENCE< UNO3_XINTERFACE >&	xListener	) throw( UNO3_RUNTIMEEXCEPTION );
+									const	UNO3_REFERENCE< UNO3_XINTERFACE >&	xListener	);
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -396,7 +396,7 @@ public:
 	*/
 
     virtual void SAL_CALL unadvise(	const	UNO3_TYPE&							aType		,
-									const	UNO3_REFERENCE< UNO3_XINTERFACE >&	xListener	) throw( UNO3_RUNTIMEEXCEPTION );
+									const	UNO3_REFERENCE< UNO3_XINTERFACE >&	xListener	);
 
 	//__________________________________________________________________________________________________________
 	//	impl but public methods to register service!
@@ -458,7 +458,7 @@ protected:
 	virtual sal_Bool SAL_CALL convertFastPropertyValue(			UNO3_ANY&	rConvertedValue	,
 																UNO3_ANY&	rOldValue		,
 																sal_Int32	nHandle			,
-														const	UNO3_ANY&	rValue			) throw( UNO3_ILLEGALARGUMENTEXCEPTION );
+														const	UNO3_ANY&	rValue			);
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -474,7 +474,7 @@ protected:
 	*/
 
 	virtual void SAL_CALL setFastPropertyValue_NoBroadcast(			sal_Int32	nHandle	,
-						  									const	UNO3_ANY&	rValue	) throw ( ::com::sun::star::uno::Exception );
+						  									const	UNO3_ANY&	rValue	);
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -524,7 +524,7 @@ protected:
 		@onerror
 	*/
 
-	UNO3_REFERENCE< UNO3_XPROPERTYSETINFO > SAL_CALL getPropertySetInfo() throw( UNO3_RUNTIMEEXCEPTION );
+	UNO3_REFERENCE< UNO3_XPROPERTYSETINFO > SAL_CALL getPropertySetInfo();
 
 	//__________________________________________________________________________________________________________
 	//	BaseControl
diff --git a/main/UnoControls/source/inc/progressbar.hxx b/main/UnoControls/source/inc/progressbar.hxx
index b8ff41b603..941165f43b 100644
--- a/main/UnoControls/source/inc/progressbar.hxx
+++ b/main/UnoControls/source/inc/progressbar.hxx
@@ -138,7 +138,7 @@ public:
 		@onerror
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType );
 
 	/**_______________________________________________________________________________________________________
 		@short		increment refcount
@@ -189,7 +189,7 @@ public:
 		@onerror
 	*/
 
-	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes();
 
 	//__________________________________________________________________________________________________________
 	//	XAggregation
@@ -208,7 +208,7 @@ public:
 		@onerror
 	*/
 
-	UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType );
 
 	//________________________________________________________________________________________________________
 	//	XProgressBar
@@ -227,7 +227,7 @@ public:
 		@onerror
 	*/
 
-    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -242,7 +242,7 @@ public:
 		@onerror
 	*/
 
-    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -257,7 +257,7 @@ public:
 		@onerror
 	*/
 
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setValue( sal_Int32 nValue );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -273,7 +273,7 @@ public:
 	*/
 
     virtual void SAL_CALL setRange(	sal_Int32	nMin	,
-									sal_Int32	nMax	) throw( UNO3_RUNTIMEEXCEPTION );
+									sal_Int32	nMax	);
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -288,7 +288,7 @@ public:
 		@onerror
 	*/
 
-    virtual sal_Int32 SAL_CALL getValue() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Int32 SAL_CALL getValue();
 
 	//__________________________________________________________________________________________________________
 	//	XWindow
@@ -311,7 +311,7 @@ public:
 										sal_Int32	nY		,
 										sal_Int32	nWidth	,
 										sal_Int32	nHeight	,
-										sal_Int16	nFlags	) throw( UNO3_RUNTIMEEXCEPTION );
+										sal_Int16	nFlags	);
 
 	//__________________________________________________________________________________________________________
 	//	XControl
@@ -330,7 +330,7 @@ public:
 		@onerror
 	*/
 
-    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel );
 
 	/**_________________________________________________________________________________________________________
 		@short
@@ -345,7 +345,7 @@ public:
 		@onerror
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel();
 
 	//__________________________________________________________________________________________________________
 	//	BaseControl
diff --git a/main/UnoControls/source/inc/progressmonitor.hxx b/main/UnoControls/source/inc/progressmonitor.hxx
index fc17db5a87..a411976302 100644
--- a/main/UnoControls/source/inc/progressmonitor.hxx
+++ b/main/UnoControls/source/inc/progressmonitor.hxx
@@ -208,7 +208,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType );
 
 	/**_______________________________________________________________________________________________________
 		@short		increment refcount
@@ -259,7 +259,7 @@ public:
 		@onerror	A RuntimeException is thrown.
 	*/
 
-	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes();
 
 	//________________________________________________________________________________________________________
 	//	XAggregation
@@ -278,7 +278,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType );
 
 	//________________________________________________________________________________________________________
 	//	XProgressMonitor
@@ -306,7 +306,7 @@ public:
 
 	virtual void SAL_CALL addText(	const	UNO3_OUSTRING&	sTopic			,
 									const	UNO3_OUSTRING&	sText			,
-											sal_Bool		bbeforeProgress	) throw( UNO3_RUNTIMEEXCEPTION );
+											sal_Bool		bbeforeProgress	);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -322,7 +322,7 @@ public:
 	*/
 
 	virtual void SAL_CALL removeText(	const	UNO3_OUSTRING&	sTopic			,
-												sal_Bool		bbeforeProgress	) throw( UNO3_RUNTIMEEXCEPTION );
+												sal_Bool		bbeforeProgress	);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -339,7 +339,7 @@ public:
 
 	virtual void SAL_CALL updateText(	const	UNO3_OUSTRING&	sTopic			,
 										const	UNO3_OUSTRING&	sText			,
-												sal_Bool		bbeforeProgress	) throw( UNO3_RUNTIMEEXCEPTION );
+												sal_Bool		bbeforeProgress	);
 
 	//________________________________________________________________________________________________________
 	//	XProgressBar
@@ -358,7 +358,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -373,7 +373,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -388,7 +388,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setValue( sal_Int32 nValue );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -404,7 +404,7 @@ public:
 	*/
 
     virtual void SAL_CALL setRange(	sal_Int32	nMin	,
-									sal_Int32	nMax	) throw( UNO3_RUNTIMEEXCEPTION );
+									sal_Int32	nMax	);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -419,7 +419,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual sal_Int32 SAL_CALL getValue() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Int32 SAL_CALL getValue();
 
 	//________________________________________________________________________________________________________
 	//	XButton
@@ -438,7 +438,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL addActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL addActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -453,7 +453,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL removeActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL removeActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -468,7 +468,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL setLabel( const UNO3_OUSTRING& sLabel ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL setLabel( const UNO3_OUSTRING& sLabel );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -483,7 +483,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual	void SAL_CALL setActionCommand( const UNO3_OUSTRING& sCommand ) throw( UNO3_RUNTIMEEXCEPTION );
+	virtual	void SAL_CALL setActionCommand( const UNO3_OUSTRING& sCommand );
 
 	//________________________________________________________________________________________________________
 	// 	XLayoutConstrains
@@ -502,7 +502,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_SIZE SAL_CALL getMinimumSize() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_SIZE SAL_CALL getMinimumSize();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -517,7 +517,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_SIZE SAL_CALL getPreferredSize() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_SIZE SAL_CALL getPreferredSize();
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -532,7 +532,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize );
 
 	//________________________________________________________________________________________________________
 	//	XControl
@@ -552,7 +552,7 @@ public:
 	*/
 
     virtual void SAL_CALL createPeer(	const	UNO3_REFERENCE< UNO3_XTOOLKIT >&	xToolkit	,
-										const	UNO3_REFERENCE< UNO3_XWINDOWPEER >&	xParent		) throw( UNO3_RUNTIMEEXCEPTION );
+										const	UNO3_REFERENCE< UNO3_XWINDOWPEER >&	xParent		);
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -567,7 +567,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel );
 
 	/**_______________________________________________________________________________________________________
 		@short		-
@@ -582,7 +582,7 @@ public:
 		@onerror	-
 	*/
 
-    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel();
 
 	//________________________________________________________________________________________________________
 	//	XComponent
@@ -601,7 +601,7 @@ public:
 		@onerror	-
 	*/
 
-	virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+	virtual void SAL_CALL dispose();
 
 	//________________________________________________________________________________________________________
 	//	XWindow
@@ -624,7 +624,7 @@ public:
 										sal_Int32	nY		,
 										sal_Int32	nWidth	,
 										sal_Int32	nHeight	,
-										sal_Int16	nFlags	) throw( UNO3_RUNTIMEEXCEPTION );
+										sal_Int16	nFlags	);
 
 	//________________________________________________________________________________________________________
 	//	BaseControl
diff --git a/main/UnoControls/source/inc/statusindicator.hxx b/main/UnoControls/source/inc/statusindicator.hxx
index c5af8dcbe2..446e081857 100644
--- a/main/UnoControls/source/inc/statusindicator.hxx
+++ b/main/UnoControls/source/inc/statusindicator.hxx
@@ -159,7 +159,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	A RuntimeException is thrown.
 		*/
 
-		virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+		virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType );
 
 		/**_______________________________________________________________________________________________________
 			@short		increment refcount
@@ -210,7 +210,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	A RuntimeException is thrown.
 		*/
 
-		virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+		virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes();
 
 		//---------------------------------------------------------------------------------------------------------
 		//	XAggregation
@@ -229,7 +229,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
 		*/
 
-		virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+		virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType );
 
 		//---------------------------------------------------------------------------------------------------------
 		//	XStatusIndicator
@@ -249,7 +249,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 		*//*-*****************************************************************************************************/
 
 		virtual void SAL_CALL start(	const	UNO3_OUSTRING&	sText	,
-												sal_Int32		nRange	) throw( UNO3_RUNTIMEEXCEPTION );
+												sal_Int32		nRange	);
 
 		/*-****************************************************************************************************//**
 			@short		-
@@ -264,7 +264,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
 		*//*-*****************************************************************************************************/
 
-    	virtual void SAL_CALL end() throw( UNO3_RUNTIMEEXCEPTION );
+    	virtual void SAL_CALL end();
 
 		/*-****************************************************************************************************//**
 			@short		-
@@ -279,7 +279,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
 		*//*-*****************************************************************************************************/
 
-    	virtual void SAL_CALL reset() throw( UNO3_RUNTIMEEXCEPTION );
+    	virtual void SAL_CALL reset();
 
 		/*-****************************************************************************************************//**
 			@short		-
@@ -294,7 +294,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
 		*//*-*****************************************************************************************************/
 
-    	virtual void SAL_CALL setText( const UNO3_OUSTRING& sText ) throw( UNO3_RUNTIMEEXCEPTION );
+    	virtual void SAL_CALL setText( const UNO3_OUSTRING& sText );
 
 		/*-****************************************************************************************************//**
 			@short		-
@@ -309,7 +309,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
 		*//*-*****************************************************************************************************/
 
-    	virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+    	virtual void SAL_CALL setValue( sal_Int32 nValue );
 
 		//---------------------------------------------------------------------------------------------------------
 		// 	XLayoutConstrains
@@ -328,7 +328,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
 		*/
 
-    	virtual UNO3_SIZE SAL_CALL getMinimumSize() throw( UNO3_RUNTIMEEXCEPTION );
+    	virtual UNO3_SIZE SAL_CALL getMinimumSize();
 
 		/**_______________________________________________________________________________________________________
 			@short		-
@@ -343,7 +343,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
 		*/
 
-    	virtual UNO3_SIZE SAL_CALL getPreferredSize() throw( UNO3_RUNTIMEEXCEPTION );
+    	virtual UNO3_SIZE SAL_CALL getPreferredSize();
 
 		/**_______________________________________________________________________________________________________
 			@short		-
@@ -358,7 +358,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
 		*/
 
-    	virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize ) throw( UNO3_RUNTIMEEXCEPTION );
+    	virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize );
 
 		//---------------------------------------------------------------------------------------------------------
 		//	XControl
@@ -378,7 +378,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 		*/
 
     	virtual void SAL_CALL createPeer(	const	UNO3_REFERENCE< UNO3_XTOOLKIT >&	xToolkit	,
-											const	UNO3_REFERENCE< UNO3_XWINDOWPEER >&	xParent		) throw( UNO3_RUNTIMEEXCEPTION );
+											const	UNO3_REFERENCE< UNO3_XWINDOWPEER >&	xParent		);
 
 		/**_______________________________________________________________________________________________________
 			@short		-
@@ -393,7 +393,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
 		*/
 
-    	virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+    	virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel );
 
 		/**_______________________________________________________________________________________________________
 			@short		-
@@ -408,7 +408,7 @@ class StatusIndicator	: public UNO3_XLAYOUTCONSTRAINS
 			@onerror	-
... 484014 lines suppressed ...