You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/07/24 14:05:50 UTC

(openoffice) branch AOO42X updated: pre-commit auto remove trailing whitespace from h files (#385)

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

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


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 2dc1ed49f7 pre-commit auto remove trailing whitespace from h files (#385)
2dc1ed49f7 is described below

commit 2dc1ed49f71f02afe7422e4ad2f275204af2462e
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Fri Jul 25 00:04:10 2025 +1000

    pre-commit auto remove trailing whitespace from h files (#385)
    
    Another big auto clean up by pre-commit similar to the others
    
    (cherry picked from commit 5d328669834268fa077da8fd0d9b44cc5ce2793b)
---
 .../inc/accessibility/helper/accessibilitydllapi.h |  12 +-
 main/apple_remote/inc/AppleRemote.h                |  10 +-
 main/apple_remote/inc/GlobalKeyboardDevice.h       |  12 +-
 main/apple_remote/inc/HIDRemoteControlDevice.h     |  14 +-
 main/apple_remote/inc/KeyspanFrontRowControl.h     |   8 +-
 main/apple_remote/inc/MultiClickRemoteBehavior.h   |  22 +-
 main/apple_remote/inc/RemoteControl.h              |  26 +-
 main/apple_remote/inc/RemoteControlContainer.h     |   8 +-
 main/apple_remote/inc/RemoteMainController.h       |   8 +-
 main/autodoc/inc/cosv/csv_precomp.h                |   8 +-
 main/autodoc/source/cosv/inc/precomp.h             |   8 +-
 main/autodoc/source/inc/precomp.h                  |   8 +-
 main/autodoc/source/udm/inc/precomp.h              |   8 +-
 main/automation/inc/automation/automationdllapi.h  |  10 +-
 main/avmedia/inc/avmedia/avmediadllapi.h           |  10 +-
 main/basegfx/inc/basegfx/basegfxdllapi.h           |   8 +-
 main/basic/inc/basic/basicdllapi.h                 |  12 +-
 main/bridges/source/jni_uno/jni_base.h             |  36 +-
 main/bridges/source/jni_uno/jni_bridge.h           |  24 +-
 main/bridges/source/jni_uno/jni_helper.h           |   8 +-
 main/bridges/source/jni_uno/jni_info.h             |  42 +-
 main/bridges/test/inter_libs_exc/share.h           |   8 +-
 main/bridges/test/testcomp.h                       |  20 +-
 main/canvas/inc/canvas/canvastoolsdllapi.h         |   8 +-
 main/cli_ure/source/climaker/climaker_share.h      |  36 +-
 main/cli_ure/source/native/native_share.h          |  12 +-
 main/cli_ure/source/uno_bridge/cli_base.h          |  18 +-
 main/cli_ure/source/uno_bridge/cli_bridge.h        |  20 +-
 main/cli_ure/source/uno_bridge/cli_environment.h   |  16 +-
 main/cli_ure/source/uno_bridge/cli_proxy.h         |  34 +-
 main/comphelper/inc/comphelper/comphelperdllapi.h  |  14 +-
 main/comphelper/inc/comphelper/fileformat.h        |   8 +-
 .../source/drivers/ado/ado_post_sys_include.h      |   8 +-
 .../source/drivers/ado/ado_pre_sys_include.h       |   8 +-
 main/connectivity/source/drivers/evoab2/EApi.h     |  10 +-
 main/connectivity/source/inc/diagnose_ex.h         |   8 +-
 .../source/inc/hsqldb/HStorageAccess.h             |   8 +-
 .../source/inc/hsqldb/StorageFileAccess.h          |   8 +-
 .../source/inc/hsqldb/StorageNativeInputStream.h   |   8 +-
 main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h     |  10 +-
 main/cppu/inc/com/sun/star/uno/Any.h               | 108 ++--
 main/cppu/inc/com/sun/star/uno/Reference.h         | 142 ++---
 main/cppu/inc/com/sun/star/uno/Sequence.h          |  96 ++--
 main/cppu/inc/com/sun/star/uno/Type.h              | 150 ++---
 main/cppu/inc/com/sun/star/uno/genfunc.h           |  22 +-
 main/cppu/inc/typelib/typeclass.h                  |   8 +-
 main/cppu/inc/typelib/typedescription.h            | 120 ++--
 main/cppu/inc/typelib/uik.h                        |   8 +-
 main/cppu/inc/uno/any2.h                           |  24 +-
 main/cppu/inc/uno/cuno.h                           |   8 +-
 main/cppu/inc/uno/current_context.h                |  12 +-
 main/cppu/inc/uno/data.h                           |  40 +-
 main/cppu/inc/uno/dispatcher.h                     |  16 +-
 main/cppu/inc/uno/environment.h                    | 100 ++--
 main/cppu/inc/uno/lbnames.h                        |   8 +-
 main/cppu/inc/uno/mapping.h                        |  28 +-
 main/cppu/inc/uno/sequence2.h                      |  24 +-
 main/cppu/inc/uno/threadpool.h                     |  46 +-
 main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h  |  12 +-
 main/cppuhelper/inc/cppuhelper/findsofficepath.h   |   8 +-
 .../cppuhelper/inc/cppuhelper/interfacecontainer.h | 104 ++--
 main/cppuhelper/inc/cppuhelper/proptypehlp.h       |  18 +-
 main/crashrep/source/win32/base64.h                |   8 +-
 main/crashrep/source/win32/resource.h              |  10 +-
 main/cui/source/tabpages/chardlg.h                 |   8 +-
 main/dbaccess/inc/dbaccessdllapi.h                 |  14 +-
 main/desktop/source/app/sofficemain.h              |   8 +-
 main/desktop/source/deployment/gui/dp_gui.h        |   8 +-
 main/desktop/source/deployment/inc/dp_interact.h   |  20 +-
 main/desktop/source/deployment/inc/dp_misc.h       |  20 +-
 main/desktop/source/deployment/inc/dp_persmap.h    |  10 +-
 main/desktop/source/deployment/inc/dp_resource.h   |   8 +-
 main/desktop/source/deployment/inc/dp_ucb.h        |   8 +-
 main/desktop/source/deployment/inc/dp_xml.h        |   8 +-
 .../desktop/source/deployment/manager/dp_manager.h |  46 +-
 .../source/deployment/registry/inc/dp_backend.h    |  68 +--
 .../deployment/registry/script/dp_lib_container.h  |   8 +-
 main/desktop/source/pagein/file_image.h            |   8 +-
 main/desktop/source/pkgchk/unopkg/unopkg_main.h    |   8 +-
 main/desktop/source/pkgchk/unopkg/unopkg_shared.h  |  16 +-
 main/desktop/win32/source/QuickStart/QuickStart.h  |   8 +-
 main/desktop/win32/source/QuickStart/StdAfx.h      |  10 +-
 main/desktop/win32/source/QuickStart/resource.h    |  10 +-
 main/desktop/win32/source/main.h                   |   8 +-
 main/desktop/win32/source/rebase/Resource.h        |   8 +-
 main/desktop/win32/source/setup/Resource.h         |   8 +-
 main/desktop/win32/source/wrapper.h                |  14 +-
 .../inc/drawinglayer/drawinglayerdllapi.h          |   8 +-
 main/editeng/inc/editeng/editengdllapi.h           |   8 +-
 main/embeddedobj/source/msole/platform.h           |   8 +-
 .../test/Container1/nativelib/nativeview.h         |   8 +-
 main/embedserv/source/inc/common.h                 |   8 +-
 main/embedserv/source/inc/embservconst.h           |  10 +-
 main/embedserv/source/inc/stdafx.h                 |   2 +-
 main/embedserv/source/inprocserv/inprocembobj.h    |  10 +-
 .../source/activex/main/SOActionsApproval.h        |  10 +-
 main/extensions/source/activex/main/SOActiveX.h    |   8 +-
 .../source/activex/main/SOComWindowPeer.h          |   8 +-
 .../source/activex/main/SODispatchInterceptor.h    |   8 +-
 main/extensions/source/activex/main/StdAfx2.h      |   8 +-
 .../source/activex/main/com_uno_helper.h           |  36 +-
 main/extensions/source/activex/main/resource.h     |  10 +-
 .../source/macosx/spotlight/OOoContentDataParser.h |  14 +-
 .../source/macosx/spotlight/OOoMetaDataParser.h    |  10 +-
 .../source/macosx/spotlight/OOoSpotlightImporter.h |   8 +-
 main/extensions/source/macosx/spotlight/ioapi.h    |   8 +-
 main/extensions/source/macosx/spotlight/unzip.h    |  10 +-
 main/extensions/test/ole/AxTestComponents/Basic.h  |  14 +-
 main/extensions/test/ole/AxTestComponents/Foo.h    |  10 +-
 main/extensions/test/ole/AxTestComponents/StdAfx.h |   8 +-
 .../test/ole/AxTestComponents/resource.h           |  10 +-
 .../EventListener/EvtListener.h                    |  10 +-
 .../ole/EventListenerSample/EventListener/StdAfx.h |   8 +-
 .../EventListenerSample/EventListener/resource.h   |  10 +-
 main/extensions/test/ole/MfcControl/MfcControl.h   |   8 +-
 .../extensions/test/ole/MfcControl/MfcControlCtl.h |   8 +-
 .../extensions/test/ole/MfcControl/MfcControlPpg.h |   8 +-
 main/extensions/test/ole/MfcControl/Resource.h     |   8 +-
 .../test/ole/OleConverterVar1/smartarray.h         |  32 +-
 .../test/ole/unoTocomCalls/Test/StdAfx.h           |   8 +-
 .../ole/unoTocomCalls/XCallback_Impl/Callback.h    |  35 +-
 .../test/ole/unoTocomCalls/XCallback_Impl/Simple.h |  12 +-
 .../test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h |   8 +-
 .../ole/unoTocomCalls/XCallback_Impl/resource.h    |  10 +-
 main/fileaccess/inc/fileaccess/dllapi.h            |   8 +-
 main/filter/inc/filter/msfilter/msfilterdllapi.h   |   8 +-
 .../source/xforms/warnings_guard_unicode_regex.h   |   8 +-
 main/formula/inc/formula/formuladllapi.h           |  12 +-
 main/fpicker/source/aqua/SalAquaConstants.h        |   8 +-
 main/fpicker/source/win32/filepicker/afxres.h      |   8 +-
 .../source/win32/filepicker/platform_vista.h       |   8 +-
 main/fpicker/source/win32/filepicker/platform_xp.h |   8 +-
 main/fpicker/source/win32/filepicker/resource.h    |  10 +-
 main/fpicker/source/win32/filepicker/vistatypes.h  |   8 +-
 main/framework/inc/acceleratorconst.h              |  14 +-
 main/framework/inc/arguments.h                     |   8 +-
 main/framework/inc/commands.h                      |   8 +-
 main/framework/inc/dispatchcommands.h              |   8 +-
 main/framework/inc/framework/fwedllapi.h           |   8 +-
 main/framework/inc/fwidllapi.h                     |   8 +-
 main/framework/inc/fwkdllapi.h                     |   8 +-
 main/framework/inc/general.h                       |  10 +-
 main/framework/inc/loadstate.h                     |   8 +-
 main/framework/inc/mediadescriptor.h               |   8 +-
 main/framework/inc/properties.h                    |   8 +-
 main/framework/inc/protocols.h                     |  10 +-
 main/framework/inc/queries.h                       |   8 +-
 main/framework/inc/services.h                      |   8 +-
 main/framework/inc/stdtypes.h                      |  10 +-
 main/framework/inc/targets.h                       |   8 +-
 main/framework/inc/threadhelp/igate.h              |   8 +-
 main/framework/inc/threadhelp/inoncopyable.h       |   8 +-
 main/framework/inc/threadhelp/irwlock.h            |   8 +-
 .../framework/inc/threadhelp/itransactionmanager.h |   8 +-
 main/i18npool/inc/bullet.h                         |   8 +-
 main/i18npool/inc/i18npool/i18npooldllapi.h        |  14 +-
 main/i18npool/inc/i18npool/lang.h                  |  10 +-
 main/i18npool/inc/warnings_guard_unicode_brkiter.h |   8 +-
 .../i18npool/inc/warnings_guard_unicode_calendar.h |   8 +-
 main/i18npool/inc/warnings_guard_unicode_tblcoll.h |   8 +-
 main/i18npool/inc/wtt.h                            |  10 +-
 .../indexentry/data/indexdata_alphanumeric.h       |  10 +-
 .../source/indexentry/data/indexdata_ja_phonetic.h |   8 +-
 .../i18npool/source/nativenumber/data/numberchar.h |  12 +-
 .../source/transliteration/data/numberchar.h       |   8 +-
 main/i18nutil/inc/i18nutil/i18nutildllapi.h        |   8 +-
 main/i18nutil/inc/i18nutil/x_rtl_ustring.h         |   8 +-
 main/i18nutil/source/utility/casefolding_data.h    |  12 +-
 main/i18nutil/source/utility/unicode_data.h        |  12 +-
 main/i18nutil/source/utility/widthfolding_data.h   |  28 +-
 main/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h     |  12 +-
 main/jvmfwk/inc/jvmfwk/framework.h                 |  66 +--
 main/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h              |  12 +-
 main/jvmfwk/inc/jvmfwk/vendorplugin.h              |  22 +-
 .../plugins/sunmajor/pluginlib/diagnostics.h       |   8 +-
 main/linguistic/inc/linguistic/lngdllapi.h         |   8 +-
 main/migrationanalysis/src/msokill/StdAfx.h        |   8 +-
 main/migrationanalysis/src/wizard/res_defines.h    |   2 +-
 .../DesktopEnvironment/nativelib/unix/nativeview.h |   8 +-
 .../nativelib/windows/nativeview.h                 |   8 +-
 main/odk/examples/OLE/activex/SOActiveX.h          |  24 +-
 main/odk/examples/OLE/activex/SOComWindowPeer.h    |  54 +-
 main/odk/examples/OLE/activex/StdAfx2.h            |   8 +-
 main/odk/examples/OLE/activex/resource.h           |  10 +-
 .../cpp/complextoolbarcontrols/ListenerHelper.h    |   8 +-
 .../cpp/complextoolbarcontrols/MyProtocolHandler.h |  14 +-
 main/oox/inc/oox/dllapi.h                          |   8 +-
 main/package/inc/package/dllapi.h                  |   8 +-
 main/registry/inc/registry/reader.h                |   8 +-
 main/registry/inc/registry/registry.h              | 262 ++++-----
 main/registry/inc/registry/registrydllapi.h        |  12 +-
 main/registry/inc/registry/regtype.h               |  30 +-
 main/registry/inc/registry/types.h                 |   8 +-
 main/registry/inc/registry/version.h               |   8 +-
 main/registry/inc/registry/writer.h                |   8 +-
 main/registry/test/regdiagnose.h                   |   8 +-
 main/reportdesign/inc/dllapi.h                     |  14 +-
 main/rsc/inc/rscall.h                              |   8 +-
 main/rsc/inc/rscerror.h                            |   8 +-
 main/rsc/source/rscpp/cpp.h                        |   8 +-
 main/rsc/source/rscpp/cppdef.h                     |   8 +-
 main/sal/inc/internal/once.h                       |   8 +-
 main/sal/inc/osl/diagnose.h                        |   8 +-
 main/sal/inc/osl/doublecheckedlocking.h            |   8 +-
 main/sal/inc/osl/endian.h                          |   8 +-
 main/sal/inc/osl/file.h                            | 620 ++++++++++-----------
 main/sal/inc/osl/interlck.h                        |  12 +-
 main/sal/inc/osl/module.h                          |  52 +-
 main/sal/inc/osl/mutex.h                           |  12 +-
 main/sal/inc/osl/nlsupport.h                       |  14 +-
 main/sal/inc/osl/pipe.h                            |  12 +-
 main/sal/inc/osl/profile.h                         |  36 +-
 main/sal/inc/osl/security.h                        |  14 +-
 main/sal/inc/osl/semaphor.h                        |  12 +-
 main/sal/inc/osl/socket.h                          |  78 +--
 main/sal/inc/osl/thread.h                          |  10 +-
 main/sal/inc/osl/time.h                            |  14 +-
 main/sal/inc/osl/util.h                            |  10 +-
 main/sal/inc/rtl/alloc.h                           |   8 +-
 main/sal/inc/rtl/bootstrap.h                       |  70 +--
 main/sal/inc/rtl/byteseq.h                         |  84 +--
 main/sal/inc/rtl/cipher.h                          |   8 +-
 main/sal/inc/rtl/crc.h                             |   8 +-
 main/sal/inc/rtl/digest.h                          |   8 +-
 main/sal/inc/rtl/logfile.h                         |   8 +-
 main/sal/inc/rtl/math.h                            |   8 +-
 main/sal/inc/rtl/memory.h                          |   8 +-
 main/sal/inc/rtl/process.h                         |  18 +-
 main/sal/inc/rtl/random.h                          |   8 +-
 main/sal/inc/rtl/strbuf.h                          |  52 +-
 main/sal/inc/rtl/string.h                          |   8 +-
 main/sal/inc/rtl/tencinfo.h                        |   8 +-
 main/sal/inc/rtl/textcvt.h                         |   8 +-
 main/sal/inc/rtl/textenc.h                         |   8 +-
 main/sal/inc/rtl/tres.h                            |   8 +-
 main/sal/inc/rtl/unload.h                          | 218 ++++----
 main/sal/inc/rtl/uri.h                             |   8 +-
 main/sal/inc/rtl/ustrbuf.h                         |   8 +-
 main/sal/inc/rtl/ustring.h                         |  10 +-
 main/sal/inc/rtl/uuid.h                            |  14 +-
 main/sal/inc/sal/alloca.h                          |   8 +-
 main/sal/inc/sal/config.h                          |   8 +-
 main/sal/inc/sal/macros.h                          |  10 +-
 main/sal/inc/sal/main.h                            |  10 +-
 main/sal/inc/sal/mathconf.h                        |   8 +-
 main/sal/inc/sal/types.h                           |  28 +-
 main/sal/inc/systools/win32/StrConvert.h           |   8 +-
 main/sal/inc/systools/win32/advapi9x.h             |  30 +-
 main/sal/inc/systools/win32/comdlg9x.h             |  12 +-
 main/sal/inc/systools/win32/kernel9x.h             |  22 +-
 main/sal/inc/systools/win32/mpr9x.h                |  12 +-
 main/sal/inc/systools/win32/shell9x.h              |  14 +-
 main/sal/inc/systools/win32/snprintf.h             |  16 +-
 main/sal/inc/systools/win32/user9x.h               |  14 +-
 main/sal/inc/systools/win32/uwinapi.h              |   8 +-
 main/sal/osl/inc/printtrace.h                      |   8 +-
 main/sal/osl/os2/file_error_transl.h               |  34 +-
 main/sal/osl/os2/file_path_helper.h                | 209 ++++---
 main/sal/osl/os2/file_url.h                        |  24 +-
 main/sal/osl/os2/path_helper.h                     |  20 +-
 main/sal/osl/os2/pipeimpl.h                        |  10 +-
 main/sal/osl/os2/procimpl.h                        |   8 +-
 main/sal/osl/os2/secimpl.h                         |  10 +-
 main/sal/osl/os2/sockimpl.h                        |  14 +-
 main/sal/osl/os2/system.h                          |  34 +-
 main/sal/osl/os2/uunxapi.h                         |  51 +-
 main/sal/osl/unx/backtrace.h                       |  10 +-
 main/sal/osl/unx/file_error_transl.h               |  34 +-
 main/sal/osl/unx/file_path_helper.h                | 171 +++---
 main/sal/osl/unx/file_url.h                        |  32 +-
 main/sal/osl/unx/procimpl.h                        |   8 +-
 main/sal/osl/unx/secimpl.h                         |  10 +-
 main/sal/osl/unx/sockimpl.h                        |  14 +-
 main/sal/osl/unx/system.h                          |  34 +-
 main/sal/osl/unx/uunxapi.h                         |  51 +-
 main/sal/osl/w32/file_error.h                      |   8 +-
 main/sal/osl/w32/file_url.h                        |  10 +-
 main/sal/osl/w32/path_helper.h                     |  20 +-
 main/sal/osl/w32/pipeimpl.h                        |  10 +-
 main/sal/osl/w32/procimpl.h                        |   8 +-
 main/sal/osl/w32/secimpl.h                         |  12 +-
 main/sal/osl/w32/sockimpl.h                        |  12 +-
 main/sal/osl/w32/system.h                          |   8 +-
 main/sal/qa/OStringBuffer/rtl_String_Const.h       |  10 +-
 main/sal/qa/OStringBuffer/rtl_String_Utils_Const.h |   8 +-
 main/sal/qa/osl/condition/osl_Condition_Const.h    |   8 +-
 main/sal/qa/osl/file/osl_File_Const.h              |  90 +--
 main/sal/qa/osl/module/osl_Module_Const.h          |   8 +-
 main/sal/qa/osl/mutex/osl_Mutex_Const.h            |   8 +-
 main/sal/qa/osl/security/osl_Security_Const.h      |   8 +-
 main/sal/qa/osl/socket/osl_Socket_Const.h          |  24 +-
 main/sal/qa/osl/socket/osl_Socket_Const_orig.h     |  22 +-
 main/sal/qa/rtl/process/rtl_Process_Const.h        |   8 +-
 main/sal/qa/rtl_strings/rtl_String_Const.h         |  44 +-
 main/sal/qa/rtl_strings/rtl_String_Utils_Const.h   |   8 +-
 main/sal/rtl/source/alloc_arena.h                  |   8 +-
 main/sal/rtl/source/alloc_cache.h                  |   8 +-
 main/sal/rtl/source/alloc_impl.h                   |   8 +-
 main/sal/rtl/source/hash.h                         |   8 +-
 main/sal/rtl/source/strimp.h                       |   8 +-
 main/sal/rtl/source/surrogates.h                   |   8 +-
 main/sal/systools/win32/uwinapi/Uwinapi.h          |   8 +-
 main/sal/systools/win32/uwinapi/macros.h           |   8 +-
 main/sal/systools/win32/uwinapi/win95sys.h         |   8 +-
 main/sal/textenc/context.h                         |   8 +-
 main/sal/textenc/convertbig5hkscs.h                |   8 +-
 main/sal/textenc/converter.h                       |   8 +-
 main/sal/textenc/converteuctw.h                    |   8 +-
 main/sal/textenc/convertgb18030.h                  |   8 +-
 main/sal/textenc/convertiso2022cn.h                |   8 +-
 main/sal/textenc/convertiso2022jp.h                |   8 +-
 main/sal/textenc/convertiso2022kr.h                |   8 +-
 main/sal/textenc/gettextencodingdata.h             |   8 +-
 main/sal/textenc/tenchelp.h                        |   8 +-
 main/sal/textenc/unichars.h                        |   8 +-
 main/sal/workben/clipboardwben/testcopy/resource.h |   2 +-
 .../sal/workben/clipboardwben/testpaste/resource.h |   2 +-
 .../workben/clipboardwben/testviewer/resource.h    |   2 +-
 main/salhelper/inc/salhelper/salhelperdllapi.h     |  12 +-
 main/sane/inc/sane.h                               |   2 +-
 main/sax/inc/sax/dllapi.h                          |   8 +-
 main/sc/addin/inc/addin.h                          |   8 +-
 main/sc/inc/helpids.h                              |   8 +-
 main/sc/inc/sccommands.h                           |   8 +-
 main/sc/inc/scdllapi.h                             |   8 +-
 main/sc/source/filter/inc/decl.h                   |   8 +-
 main/sc/source/filter/inc/fkttab.h                 |   8 +-
 main/sc/source/filter/inc/funktion.h               |   8 +-
 main/sc/source/filter/inc/op.h                     |   8 +-
 main/sc/source/filter/inc/optab.h                  |   8 +-
 main/sc/source/filter/inc/scmem.h                  |   8 +-
 main/sc/source/filter/inc/tool.h                   |   8 +-
 main/sd/inc/diadef.h                               |   8 +-
 main/sd/inc/fadedef.h                              |   8 +-
 main/sd/inc/helpids.h                              |   8 +-
 main/sd/inc/sddllapi.h                             |   8 +-
 main/sd/inc/strmname.h                             |   8 +-
 main/sfx2/inc/sfx2/dllapi.h                        |   8 +-
 main/sfx2/inc/sfx2/qswin32.h                       |   8 +-
 main/sfx2/inc/sfx2/sfxcommands.h                   |   8 +-
 main/shell/inc/internal/resource.h                 |   8 +-
 main/shell/inc/kde_headers.h                       |   8 +-
 main/shell/source/backends/gconfbe/orbit.h         |   8 +-
 main/solenv/inc/postmac.h                          |   8 +-
 main/solenv/inc/preinclude.h                       |   8 +-
 main/solenv/inc/premac.h                           |   8 +-
 main/soltools/cpp/cpp.h                            |  18 +-
 main/soltools/mkdepend/def.h                       |   8 +-
 main/soltools/mkdepend/ifparser.h                  |  22 +-
 main/soltools/mkdepend/imakemdep.h                 |  20 +-
 main/soltools/winunistd/unistd.h                   |   2 +-
 main/sot/inc/sot/sotdllapi.h                       |  14 +-
 main/starmath/inc/helpids.h                        |   8 +-
 main/starmath/inc/smcommands.h                     |   8 +-
 main/stlport/systemstlguards/postextstl.h          |   8 +-
 main/stlport/systemstlguards/preextstl.h           |   8 +-
 main/stoc/source/security/lru_cache.h              |  38 +-
 main/stoc/source/security/permissions.h            |  18 +-
 main/store/inc/store/dllapi.h                      |   8 +-
 main/store/inc/store/store.h                       |   8 +-
 main/store/inc/store/types.h                       |   8 +-
 main/svgio/inc/svgio/svgiodllapi.h                 |   8 +-
 main/svl/inc/svl/svldllapi.h                       |   8 +-
 main/svtools/inc/svtools/htmltokn.h                |   8 +-
 main/svtools/inc/svtools/rtftoken.h                |  14 +-
 main/svtools/inc/svtools/svtdllapi.h               |   8 +-
 main/svtools/source/filter/jpeg/jpeg.h             |  10 +-
 main/svx/inc/svx/svxcommands.h                     |   8 +-
 main/svx/inc/svx/svxdllapi.h                       |   8 +-
 main/svx/source/stbctrls/stbctrls.h                |   8 +-
 main/sw/inc/error.h                                |   8 +-
 main/sw/inc/swddllapi.h                            |   8 +-
 main/sw/inc/swdllapi.h                             |   8 +-
 main/sw/inc/swerror.h                              |   8 +-
 main/sw/inc/swstyle.h                              |   8 +-
 main/sw/inc/unomid.h                               |   8 +-
 main/sw/source/core/inc/unofldmid.h                |   8 +-
 main/sw/source/ui/inc/cfgid.h                      |   8 +-
 main/sw/source/ui/inc/globals.h                    |   8 +-
 main/toolkit/inc/toolkit/dllapi.h                  |   8 +-
 main/tools/inc/poly.h                              |   8 +-
 main/tools/inc/tools/diagnose_ex.h                 |   8 +-
 main/tools/inc/tools/postsys.h                     |   8 +-
 main/tools/inc/tools/postwin.h                     |   8 +-
 main/tools/inc/tools/postx.h                       |   8 +-
 main/tools/inc/tools/presys.h                      |   8 +-
 main/tools/inc/tools/prewin.h                      |   8 +-
 main/tools/inc/tools/prex.h                        |   8 +-
 main/tools/inc/tools/rc.h                          |   8 +-
 main/tools/inc/tools/rcid.h                        |   8 +-
 main/tools/inc/tools/solar.h                       |  10 +-
 main/tools/inc/tools/svwin.h                       |   8 +-
 main/tools/inc/tools/tools.h                       |   8 +-
 main/tools/inc/tools/toolsdllapi.h                 |  14 +-
 main/tools/inc/tools/weakbase.h                    |   8 +-
 main/twain/inc/twain.h                             | 106 ++--
 main/ucb/source/ucp/odma/odma.h                    |  58 +-
 main/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h     |  14 +-
 main/unotools/inc/unotools/unotoolsdllapi.h        |  14 +-
 main/vbahelper/inc/vbahelper/vbadllapi.h           |   8 +-
 main/vcl/aqua/source/a11y/aqua11yactionwrapper.h   |   8 +-
 .../vcl/aqua/source/a11y/aqua11ycomponentwrapper.h |   8 +-
 main/vcl/aqua/source/a11y/aqua11yrolehelper.h      |   8 +-
 .../vcl/aqua/source/a11y/aqua11yselectionwrapper.h |   8 +-
 main/vcl/aqua/source/a11y/aqua11ytablewrapper.h    |   8 +-
 .../source/a11y/aqua11ytextattributeswrapper.h     |   8 +-
 main/vcl/aqua/source/a11y/aqua11ytextwrapper.h     |   8 +-
 main/vcl/aqua/source/a11y/aqua11yutil.h            |   8 +-
 main/vcl/aqua/source/a11y/aqua11yvaluewrapper.h    |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrapperbutton.h   |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrappercombobox.h |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrappergroup.h    |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrapperlist.h     |   8 +-
 .../aqua/source/a11y/aqua11ywrapperradiobutton.h   |   8 +-
 .../aqua/source/a11y/aqua11ywrapperradiogroup.h    |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrapperrow.h      |   8 +-
 .../aqua/source/a11y/aqua11ywrapperscrollarea.h    |   8 +-
 .../vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrappersplitter.h |   8 +-
 .../aqua/source/a11y/aqua11ywrapperstatictext.h    |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrappertextarea.h |   8 +-
 main/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h  |   8 +-
 main/vcl/inc/accel.h                               |   8 +-
 main/vcl/inc/aqua/aqua11yfactory.h                 |  10 +-
 main/vcl/inc/aqua/aqua11ywrapper.h                 |   8 +-
 main/vcl/inc/aqua/aquaprintview.h                  |  12 +-
 main/vcl/inc/aqua/aquavcltypes.h                   |   8 +-
 main/vcl/inc/aqua/salbmp.h                         |  20 +-
 main/vcl/inc/aqua/salconst.h                       |   8 +-
 main/vcl/inc/aqua/salframe.h                       |  48 +-
 main/vcl/inc/aqua/salframeview.h                   |  16 +-
 main/vcl/inc/aqua/salgdi.h                         |  30 +-
 main/vcl/inc/aqua/salinst.h                        |  28 +-
 main/vcl/inc/aqua/salmenu.h                        |  18 +-
 main/vcl/inc/aqua/salnativewidgets.h               |  10 +-
 main/vcl/inc/aqua/salnsmenu.h                      |   8 +-
 main/vcl/inc/aqua/salnstimer.h                     |   8 +-
 main/vcl/inc/aqua/salobj.h                         |  20 +-
 main/vcl/inc/aqua/salprn.h                         |  36 +-
 main/vcl/inc/aqua/salsys.h                         |   8 +-
 main/vcl/inc/aqua/saltimer.h                       |  10 +-
 main/vcl/inc/aqua/salvd.h                          |  10 +-
 main/vcl/inc/aqua/svsys.h                          |   8 +-
 main/vcl/inc/aqua/vclnsapp.h                       |   8 +-
 main/vcl/inc/image.h                               |   8 +-
 main/vcl/inc/jobset.h                              |   8 +-
 main/vcl/inc/list.h                                |  10 +-
 main/vcl/inc/os2/salbmp.h                          |  10 +-
 main/vcl/inc/os2/salframe.h                        |   8 +-
 main/vcl/inc/os2/salgdi.h                          |  16 +-
 main/vcl/inc/os2/salinst.h                         |   8 +-
 main/vcl/inc/os2/sallayout.h                       |   8 +-
 main/vcl/inc/os2/salmenu.h                         |   8 +-
 main/vcl/inc/os2/salobj.h                          |   8 +-
 main/vcl/inc/os2/salprn.h                          |   8 +-
 main/vcl/inc/os2/salsound.h                        |  18 +-
 main/vcl/inc/os2/salsys.h                          |   8 +-
 main/vcl/inc/os2/saltimer.h                        |   8 +-
 main/vcl/inc/os2/salvd.h                           |   8 +-
 main/vcl/inc/os2/svsys.h                           |   8 +-
 main/vcl/inc/os2/wingdi.h                          |   8 +-
 main/vcl/inc/outdev.h                              |  12 +-
 main/vcl/inc/print.h                               |   8 +-
 main/vcl/inc/svsys.h                               |   8 +-
 main/vcl/inc/toolbox.h                             |  18 +-
 main/vcl/inc/unx/XIM.h                             |  10 +-
 main/vcl/inc/unx/Xproto.h                          |   8 +-
 main/vcl/inc/unx/pspgraphics.h                     |  20 +-
 main/vcl/inc/unx/salbmp.h                          |  60 +-
 main/vcl/inc/unx/salfont.h                         |   8 +-
 main/vcl/inc/unx/salframe.h                        |  64 +--
 main/vcl/inc/unx/salgdi.h                          |  20 +-
 main/vcl/inc/unx/salinst.h                         |  12 +-
 main/vcl/inc/unx/salmenu.h                         |   8 +-
 main/vcl/inc/unx/salobj.h                          |  10 +-
 main/vcl/inc/unx/salprn.h                          |   8 +-
 main/vcl/inc/unx/salsys.h                          |  10 +-
 main/vcl/inc/unx/saltimer.h                        |   8 +-
 main/vcl/inc/unx/salunx.h                          |   8 +-
 main/vcl/inc/unx/salvd.h                           |  16 +-
 main/vcl/inc/unx/svsys.h                           |   8 +-
 main/vcl/inc/unx/svunx.h                           |   8 +-
 main/vcl/inc/unx/x11_cursors/null_curs.h           |   2 +-
 main/vcl/inc/unx/x11_cursors/salcursors.h          |   8 +-
 main/vcl/inc/vcl/cmdevt.h                          |   8 +-
 main/vcl/inc/vcl/combobox.h                        |   8 +-
 main/vcl/inc/vcl/dllapi.h                          |   8 +-
 main/vcl/inc/vcl/graph.h                           |   8 +-
 main/vcl/inc/vcl/lstbox.h                          |   8 +-
 main/vcl/inc/vcl/spin.h                            |   8 +-
 main/vcl/inc/vcl/sv.h                              |   8 +-
 main/vcl/inc/vclpluginapi.h                        |   8 +-
 main/vcl/inc/win/g_msaasvc.h                       |   8 +-
 main/vcl/inc/win/salbmp.h                          |  10 +-
 main/vcl/inc/win/salframe.h                        |  10 +-
 main/vcl/inc/win/salinst.h                         |   8 +-
 main/vcl/inc/win/salmenu.h                         |   8 +-
 main/vcl/inc/win/salnativewidgets.h                |  10 +-
 main/vcl/inc/win/salobj.h                          |   8 +-
 main/vcl/inc/win/salprn.h                          |  10 +-
 main/vcl/inc/win/salsys.h                          |  12 +-
 main/vcl/inc/win/saltimer.h                        |   8 +-
 main/vcl/inc/win/salvd.h                           |   8 +-
 main/vcl/inc/win/svsys.h                           |   8 +-
 main/vcl/inc/window.h                              |  10 +-
 main/vcl/unx/generic/dtrans/copydata_curs.h        |   8 +-
 main/vcl/unx/generic/dtrans/copydata_mask.h        |   8 +-
 main/vcl/unx/generic/dtrans/linkdata_curs.h        |   8 +-
 main/vcl/unx/generic/dtrans/linkdata_mask.h        |   8 +-
 main/vcl/unx/generic/dtrans/movedata_curs.h        |   8 +-
 main/vcl/unx/generic/dtrans/movedata_mask.h        |   8 +-
 main/vcl/unx/generic/dtrans/nodrop_curs.h          |   8 +-
 main/vcl/unx/generic/dtrans/nodrop_mask.h          |   8 +-
 main/vos/inc/vos/vosdllapi.h                       |  12 +-
 main/winaccessibility/inc/UAccCOM2.h               |   8 +-
 main/winaccessibility/source/UAccCOM/AccAction.h   |  12 +-
 .../source/UAccCOM/AccActionBase.h                 |   8 +-
 .../winaccessibility/source/UAccCOM/AccComponent.h |   8 +-
 .../source/UAccCOM/AccComponentBase.h              |   8 +-
 .../source/UAccCOM/AccEditableText.h               |  12 +-
 .../winaccessibility/source/UAccCOM/AccHyperLink.h |   8 +-
 .../winaccessibility/source/UAccCOM/AccHypertext.h |   8 +-
 main/winaccessibility/source/UAccCOM/AccImage.h    |   8 +-
 main/winaccessibility/source/UAccCOM/AccRelation.h |   8 +-
 main/winaccessibility/source/UAccCOM/AccTable.h    |   8 +-
 main/winaccessibility/source/UAccCOM/AccText.h     |   8 +-
 main/winaccessibility/source/UAccCOM/AccTextBase.h |   8 +-
 main/winaccessibility/source/UAccCOM/AccValue.h    |   8 +-
 .../source/UAccCOM/AccessibleKeyStroke.h           |  10 +-
 .../source/UAccCOM/CheckEnableAccessible.h         |   8 +-
 main/winaccessibility/source/UAccCOM/EnumVariant.h |   8 +-
 main/winaccessibility/source/UAccCOM/MAccessible.h |  10 +-
 main/winaccessibility/source/UAccCOM/Resource.h    |   8 +-
 main/winaccessibility/source/UAccCOM/UNOXWrapper.h |   8 +-
 main/winaccessibility/source/UAccCOM/acccommon.h   |   8 +-
 main/winaccessibility/source/UAccCOM/stdafx.h      |  10 +-
 main/writerfilter/source/rtftok/FlexLexer.h        |  10 +-
 main/x11_extensions/inc/Xrandr.h                   |  30 +-
 main/x11_extensions/inc/randr.h                    |   4 +-
 main/x11_extensions/inc/randrproto.h               |   8 +-
 main/xmerge/source/activesync/XMergeFactory.h      |  12 +-
 main/xmerge/source/activesync/XMergeSync.h         |  10 +-
 main/xmerge/source/activesync/resource.h           |  10 +-
 main/xmerge/source/activesync/stdafx.h             |   8 +-
 main/xml2cmp/source/inc/lst_str.h                  |   8 +-
 main/xml2cmp/source/inc/new_del.h                  |   8 +-
 main/xml2cmp/source/inc/precomp.h                  |   8 +-
 main/xml2cmp/source/inc/str.h                      |  10 +-
 main/xml2cmp/source/inc/textbuff.h                 |   8 +-
 main/xml2cmp/source/inc/textfile.h                 |   8 +-
 main/xmloff/inc/xmloff/XMLFilterServiceNames.h     |   8 +-
 main/xmloff/inc/xmloff/dllapi.h                    |   8 +-
 main/xmlscript/inc/xmlscript/xcrdllapi.h           |   8 +-
 main/xmlscript/inc/xmlscript/xmlns.h               |   8 +-
 main/xmlsecurity/source/xmlsec/nss/certerrors.h    |  12 +-
 557 files changed, 4553 insertions(+), 4558 deletions(-)

diff --git a/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h b/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h
index b2b39beca3..73d93f5439 100644
--- a/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h
+++ b/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,23 +7,23 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
 #ifndef INCLUDED_ACCESSIBILITYDLLAPI_H
 #define INCLUDED_ACCESSIBILITYDLLAPI_H
-                                                                                                                             
+
 #include "sal/types.h"
 
 #if defined(ACCESSIBILITY_DLLIMPLEMENTATION)
@@ -32,5 +32,5 @@
 #define ACCESSIBILITY_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define ACCESSIBILITY_DLLPRIVATE SAL_DLLPRIVATE
-                                                                                    
+
 #endif /* INCLUDED_ACCESSIBILITYDLLAPI_H */
diff --git a/main/apple_remote/inc/AppleRemote.h b/main/apple_remote/inc/AppleRemote.h
index cfc4f155b3..f490011aa2 100644
--- a/main/apple_remote/inc/AppleRemote.h
+++ b/main/apple_remote/inc/AppleRemote.h
@@ -2,13 +2,13 @@
  * RemoteControlWrapper.h
  * RemoteControlWrapper
  *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
  *
- * Code modified and adapted to OpenOffice.org 
+ * Code modified and adapted to OpenOffice.org
  * by Eric Bachard on 11.08.2008 under the same license
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
  *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -34,7 +34,7 @@
 /*	Interacts with the Apple Remote Control HID device
 	The class is not thread safe
 */
-@interface AppleRemote : HIDRemoteControlDevice {		
+@interface AppleRemote : HIDRemoteControlDevice {
 }
 
 @end
diff --git a/main/apple_remote/inc/GlobalKeyboardDevice.h b/main/apple_remote/inc/GlobalKeyboardDevice.h
index 5b221c0ba1..d7853b8510 100644
--- a/main/apple_remote/inc/GlobalKeyboardDevice.h
+++ b/main/apple_remote/inc/GlobalKeyboardDevice.h
@@ -2,13 +2,13 @@
  * GlobalKeyboardDevice.h
  * RemoteControlWrapper
  *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
  *
- * Code modified and adapted to OpenOffice.org 
+ * Code modified and adapted to OpenOffice.org
  * by Eric Bachard on 11.08.2008 under the same license
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
  *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -39,10 +39,10 @@
  */
 
 @interface GlobalKeyboardDevice : RemoteControl {
-	
+
 	NSMutableDictionary* hotKeyRemoteEventMapping;
 	EventHandlerRef eventHandlerRef;
-		
+
 }
 
 - (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers;
diff --git a/main/apple_remote/inc/HIDRemoteControlDevice.h b/main/apple_remote/inc/HIDRemoteControlDevice.h
index 9a436e6306..269280e5a1 100644
--- a/main/apple_remote/inc/HIDRemoteControlDevice.h
+++ b/main/apple_remote/inc/HIDRemoteControlDevice.h
@@ -2,13 +2,13 @@
  * HIDRemoteControlDevice.h
  * RemoteControlWrapper
  *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
  *
- * Code modified and adapted to OpenOffice.org 
+ * Code modified and adapted to OpenOffice.org
  * by Eric Bachard on 11.08.2008 under the same license
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
  *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -42,11 +42,11 @@
 	NSMutableArray*		   allCookies;
 	NSMutableDictionary*   cookieToButtonMapping;
 	CFRunLoopSourceRef	   eventSource;
-	
+
 	BOOL fixSecureEventInputBug;
 	BOOL openInExclusiveMode;
-	BOOL processesBacklog;	
-	
+	BOOL processesBacklog;
+
 	int supportedButtonEvents;
 }
 
diff --git a/main/apple_remote/inc/KeyspanFrontRowControl.h b/main/apple_remote/inc/KeyspanFrontRowControl.h
index c877f25cad..c5ae606e04 100644
--- a/main/apple_remote/inc/KeyspanFrontRowControl.h
+++ b/main/apple_remote/inc/KeyspanFrontRowControl.h
@@ -2,13 +2,13 @@
  * KeyspanFrontRowControl.h
  * RemoteControlWrapper
  *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
  *
- * Code modified and adapted to OpenOffice.org 
+ * Code modified and adapted to OpenOffice.org
  * by Eric Bachard on 11.08.2008 under the same License
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
  *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
diff --git a/main/apple_remote/inc/MultiClickRemoteBehavior.h b/main/apple_remote/inc/MultiClickRemoteBehavior.h
index 26dcced8cf..efa1e0cd20 100644
--- a/main/apple_remote/inc/MultiClickRemoteBehavior.h
+++ b/main/apple_remote/inc/MultiClickRemoteBehavior.h
@@ -2,13 +2,13 @@
  * MultiClickRemoteBehavior.h
  * RemoteControlWrapper
  *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
  *
- * Code modified and adapted to OpenOffice.org 
+ * Code modified and adapted to OpenOffice.org
  * by Eric Bachard on 11.08.2008 under the same License
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
  *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -38,19 +38,19 @@
  */
 @interface MultiClickRemoteBehavior : NSObject {
 	id delegate;
-	
+
 	// state for simulating plus/minus hold
-	BOOL simulateHoldEvents;	
+	BOOL simulateHoldEvents;
 	BOOL lastEventSimulatedHold;
 	RemoteControlEventIdentifier lastHoldEvent;
-	NSTimeInterval lastHoldEventTime;	
-	
+	NSTimeInterval lastHoldEventTime;
+
 	// state for multi click
 	unsigned int clickCountEnabledButtons;
 	NSTimeInterval maxClickTimeDifference;
-	NSTimeInterval lastClickCountEventTime;	
+	NSTimeInterval lastClickCountEventTime;
 	RemoteControlEventIdentifier lastClickCountEvent;
-	unsigned int eventClickCount;	
+	unsigned int eventClickCount;
 }
 
 - (id) init;
@@ -83,7 +83,7 @@
 
 @end
 
-/* 
+/*
  * Method definitions for the delegate of the MultiClickRemoteBehavior class
  */
 @interface NSObject(MultiClickRemoteBehaviorDelegate)
diff --git a/main/apple_remote/inc/RemoteControl.h b/main/apple_remote/inc/RemoteControl.h
index 356738ae4d..ee0302c56d 100644
--- a/main/apple_remote/inc/RemoteControl.h
+++ b/main/apple_remote/inc/RemoteControl.h
@@ -2,13 +2,13 @@
  * RemoteControl.h
  * RemoteControlWrapper
  *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
  *
- * Code modified and adapted to OpenOffice.org 
+ * Code modified and adapted to OpenOffice.org
  * by Eric Bachard on 11.08.2008 under the same License
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,17 +20,17 @@
  *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
  *****************************************************************************/
- 
+
 #import <Cocoa/Cocoa.h>
 
-// notifaction names that are being used to signal that an application wants to 
+// notifaction names that are being used to signal that an application wants to
 // have access to the remote control device or if the application has finished
 // using the remote control device
 extern NSString* REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION;
@@ -42,7 +42,7 @@ extern NSString* kApplicationIdentifier;
 extern NSString* kTargetApplicationIdentifier;
 
 // we have a 6 bit offset to make a hold event out of a normal event
-#define EVENT_TO_HOLD_EVENT_OFFSET 6 
+#define EVENT_TO_HOLD_EVENT_OFFSET 6
 
 @class RemoteControl;
 
@@ -54,16 +54,16 @@ typedef enum _RemoteControlEventIdentifier {
 	kRemoteButtonPlay				=1<<4,
 	kRemoteButtonRight				=1<<5,
 	kRemoteButtonLeft				=1<<6,
-	
+
 	// hold events
 	kRemoteButtonPlus_Hold			=1<<7,
-	kRemoteButtonMinus_Hold			=1<<8,	
-	kRemoteButtonMenu_Hold			=1<<9,	
-	kRemoteButtonPlay_Hold			=1<<10,	
+	kRemoteButtonMinus_Hold			=1<<8,
+	kRemoteButtonMenu_Hold			=1<<9,
+	kRemoteButtonPlay_Hold			=1<<10,
 	kRemoteButtonRight_Hold			=1<<11,
 	kRemoteButtonLeft_Hold			=1<<12,
-	
-	// special events (not supported by all devices)	
+
+	// special events (not supported by all devices)
 	kRemoteControl_Switched			=1<<13,
 
 	// New values for the "metallic" Remote (2009 model)
diff --git a/main/apple_remote/inc/RemoteControlContainer.h b/main/apple_remote/inc/RemoteControlContainer.h
index 101412ebe4..22e3404a73 100644
--- a/main/apple_remote/inc/RemoteControlContainer.h
+++ b/main/apple_remote/inc/RemoteControlContainer.h
@@ -2,13 +2,13 @@
  * RemoteControlContainer.h
  * RemoteControlWrapper
  *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
  *
- * Code modified and adapted to OpenOffice.org 
+ * Code modified and adapted to OpenOffice.org
  * by Eric Bachard on 11.08.2008 under the same License
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
  *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
diff --git a/main/apple_remote/inc/RemoteMainController.h b/main/apple_remote/inc/RemoteMainController.h
index 936e20dfcc..249a9b22a4 100644
--- a/main/apple_remote/inc/RemoteMainController.h
+++ b/main/apple_remote/inc/RemoteMainController.h
@@ -2,13 +2,13 @@
  * RemoteMainController.h
  *
  *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
  *
- * Code modified and adapted to OpenOffice.org 
+ * Code modified and adapted to OpenOffice.org
  * by Eric Bachard on 11.08.2008 under the same License
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
  *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
diff --git a/main/autodoc/inc/cosv/csv_precomp.h b/main/autodoc/inc/cosv/csv_precomp.h
index f5b4b8484f..4a3fc28c97 100644
--- a/main/autodoc/inc/cosv/csv_precomp.h
+++ b/main/autodoc/inc/cosv/csv_precomp.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/autodoc/source/cosv/inc/precomp.h b/main/autodoc/source/cosv/inc/precomp.h
index 81aeb40e04..7a6aa19aba 100644
--- a/main/autodoc/source/cosv/inc/precomp.h
+++ b/main/autodoc/source/cosv/inc/precomp.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/autodoc/source/inc/precomp.h b/main/autodoc/source/inc/precomp.h
index 5768e9f3f7..78c5462335 100644
--- a/main/autodoc/source/inc/precomp.h
+++ b/main/autodoc/source/inc/precomp.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/autodoc/source/udm/inc/precomp.h b/main/autodoc/source/udm/inc/precomp.h
index 74c1da485b..b26732183e 100644
--- a/main/autodoc/source/udm/inc/precomp.h
+++ b/main/autodoc/source/udm/inc/precomp.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/automation/inc/automation/automationdllapi.h b/main/automation/inc/automation/automationdllapi.h
index 25f5f9f6d3..b652ac0abe 100644
--- a/main/automation/inc/automation/automationdllapi.h
+++ b/main/automation/inc/automation/automationdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -34,5 +34,5 @@
 #define AUTOMATION_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define AUTOMATION_DLLPRIVATE SAL_DLLPRIVATE
-                                                                                                                             
+
 #endif /* INCLUDED_AUTOMATIONDLLAPI_H */
diff --git a/main/avmedia/inc/avmedia/avmediadllapi.h b/main/avmedia/inc/avmedia/avmediadllapi.h
index ca6b2ed402..c5f4f0e61c 100644
--- a/main/avmedia/inc/avmedia/avmediadllapi.h
+++ b/main/avmedia/inc/avmedia/avmediadllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -34,5 +34,5 @@
 #define AVMEDIA_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE
-                                                                                                                             
+
 #endif /* INCLUDED_AVMEDIADLLAPI_H */
diff --git a/main/basegfx/inc/basegfx/basegfxdllapi.h b/main/basegfx/inc/basegfx/basegfxdllapi.h
index 56b207417d..12211a4f91 100644
--- a/main/basegfx/inc/basegfx/basegfxdllapi.h
+++ b/main/basegfx/inc/basegfx/basegfxdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/basic/inc/basic/basicdllapi.h b/main/basic/inc/basic/basicdllapi.h
index c2f1571c8c..1eeb46c897 100644
--- a/main/basic/inc/basic/basicdllapi.h
+++ b/main/basic/inc/basic/basicdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,23 +7,23 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
 #ifndef INCLUDED_BASICDLLAPI_H
 #define INCLUDED_BASICDLLAPI_H
-                                                                                                                             
+
 #include "sal/types.h"
 
 #if defined(BASIC_DLLIMPLEMENTATION)
@@ -32,5 +32,5 @@
 #define BASIC_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define BASIC_DLLPRIVATE SAL_DLLPRIVATE
-                                                                                    
+
 #endif /* INCLUDED_BASICDLLAPI_H */
diff --git a/main/bridges/source/jni_uno/jni_base.h b/main/bridges/source/jni_uno/jni_base.h
index 11ed04d2f7..47d12b63d2 100644
--- a/main/bridges/source/jni_uno/jni_base.h
+++ b/main/bridges/source/jni_uno/jni_base.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -57,7 +57,7 @@ class JNI_info;
 struct BridgeRuntimeError
 {
     ::rtl::OUString m_message;
-    
+
     inline BridgeRuntimeError( ::rtl::OUString const & message )
         : m_message( message )
         {}
@@ -70,10 +70,10 @@ class JNI_context
     JNI_info const * m_jni_info;
     JNIEnv *         m_env;
     jobject          m_class_loader;
-    
+
     JNI_context( JNI_context & ); // not impl
     void operator = ( JNI_context ); // not impl
-    
+
     void java_exc_occured() const;
 public:
     inline explicit JNI_context(
@@ -82,10 +82,10 @@ public:
           m_env( env ),
           m_class_loader( class_loader )
         {}
-    
+
     inline JNI_info const * get_info() const
         { return m_jni_info; }
-    
+
     inline JNIEnv * operator -> () const
         { return m_env; }
     inline JNIEnv * get_jni_env() const
@@ -100,10 +100,10 @@ public:
     jclass findClass(
         char const * name, jclass classClass, jmethodID methodForName,
         bool inException) const;
-    
+
     inline void ensure_no_exception() const; // throws BridgeRuntimeError
     inline bool assert_no_exception() const; // asserts and clears exception
-    
+
     ::rtl::OUString get_stack_trace( jobject jo_exc = 0 ) const;
 };
 
@@ -136,7 +136,7 @@ class JNI_guarded_context
 {
     JNI_guarded_context( JNI_guarded_context & ); // not impl
     void operator = ( JNI_guarded_context ); // not impl
-    
+
 public:
     inline explicit JNI_guarded_context(
         JNI_info const * jni_info, ::jvmaccess::UnoVirtualMachine * vm_access )
@@ -153,7 +153,7 @@ class JLocalAutoRef
 {
     JNI_context const & m_jni;
     jobject m_jo;
-    
+
 public:
     inline JLocalAutoRef( JNI_context const & jni )
         : m_jni( jni ),
@@ -165,7 +165,7 @@ public:
         {}
     inline JLocalAutoRef( JLocalAutoRef & auto_ref );
     inline ~JLocalAutoRef() SAL_THROW( () );
-    
+
     inline jobject get() const
         { return m_jo; }
     inline bool is() const
@@ -239,7 +239,7 @@ struct rtl_mem
 		{ return mem; }
 	inline static void operator delete ( void *, void * )
 		{}
-    
+
     static inline ::std::auto_ptr< rtl_mem > allocate( ::std::size_t bytes );
 };
 
@@ -257,15 +257,15 @@ inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes )
 class TypeDescr
 {
     typelib_TypeDescription * m_td;
-    
+
     TypeDescr( TypeDescr & ); // not impl
     void operator = ( TypeDescr ); // not impl
-    
+
 public:
     inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref );
     inline ~TypeDescr() SAL_THROW( () )
         { TYPELIB_DANGER_RELEASE( m_td ); }
-    
+
     inline typelib_TypeDescription * get() const
         { return m_td; }
 };
diff --git a/main/bridges/source/jni_uno/jni_bridge.h b/main/bridges/source/jni_uno/jni_bridge.h
index 55c6a5eecc..12a091f75b 100644
--- a/main/bridges/source/jni_uno/jni_bridge.h
+++ b/main/bridges/source/jni_uno/jni_bridge.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -51,25 +51,25 @@ struct Mapping : public uno_Mapping
 struct Bridge
 {
     mutable oslInterlockedCount m_ref;
-    
+
     uno_ExtEnvironment *        m_uno_env;
     uno_Environment *           m_java_env;
-    
+
     Mapping                     m_java2uno;
     Mapping                     m_uno2java;
     bool                        m_registered_java2uno;
-    
+
     JNI_info const *            m_jni_info;
-    
+
     //
     ~Bridge() SAL_THROW( () );
     explicit Bridge(
         uno_Environment * java_env, uno_ExtEnvironment * uno_env,
         bool registered_java2uno );
-    
+
     void acquire() const;
     void release() const;
-    
+
     // jni_data.cxx
     void map_to_uno(
         JNI_context const & jni,
@@ -85,7 +85,7 @@ struct Bridge
         JNI_type_info const * info /* maybe 0 */,
         bool in_param, bool out_param,
         bool special_wrapped_integral_types = false ) const;
-    
+
     // jni_uno2java.cxx
     void handle_uno_exc(
         JNI_context const & jni, uno_Any * uno_exc ) const;
@@ -99,7 +99,7 @@ struct Bridge
     jobject map_to_java(
         JNI_context const & jni,
         uno_Interface * pUnoI, JNI_interface_type_info const * info ) const;
-    
+
     // jni_java2uno.cxx
     void handle_java_exc(
         JNI_context const & jni,
diff --git a/main/bridges/source/jni_uno/jni_helper.h b/main/bridges/source/jni_uno/jni_helper.h
index f799cf1947..7cfde82f18 100644
--- a/main/bridges/source/jni_uno/jni_helper.h
+++ b/main/bridges/source/jni_uno/jni_helper.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/bridges/source/jni_uno/jni_info.h b/main/bridges/source/jni_uno/jni_info.h
index 137333adaa..d4a3d17812 100644
--- a/main/bridges/source/jni_uno/jni_info.h
+++ b/main/bridges/source/jni_uno/jni_info.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -70,7 +70,7 @@ struct JNI_type_info
 {
     ::com::sun::star::uno::TypeDescription      m_td;
     jclass                                      m_class;
-    
+
     virtual void destroy( JNIEnv * jni_env ) = 0;
 protected:
     inline void destruct( JNIEnv * jni_env )
@@ -86,8 +86,8 @@ struct JNI_interface_type_info : public JNI_type_info
     jobject                                     m_proxy_ctor; // proxy ctor
     jobject                                     m_type;
     // sorted via typelib function index
-    jmethodID *                                 m_methods;    
-    
+    jmethodID *                                 m_methods;
+
     virtual void destroy( JNIEnv * jni_env );
     explicit JNI_interface_type_info(
         JNI_context const & jni, typelib_TypeDescription * td );
@@ -101,7 +101,7 @@ struct JNI_compound_type_info : public JNI_type_info
     jmethodID                                   m_exc_ctor;
     // sorted via typelib member index
     jfieldID *                                  m_fields;
-    
+
     virtual void destroy( JNIEnv * jni_env );
     explicit JNI_compound_type_info(
         JNI_context const & jni, typelib_TypeDescription * td );
@@ -124,7 +124,7 @@ class JNI_info
 {
     mutable ::osl::Mutex        m_mutex;
     mutable t_str2type          m_type_map;
-    
+
 public:
     // These two are needed very early by find_class from within the ctor:
     jclass                      m_class_Class;
@@ -136,7 +136,7 @@ public:
     jobject                     m_object_Type_UNSIGNED_SHORT;
     jobject                     m_object_Type_UNSIGNED_LONG;
     jobject                     m_object_Type_UNSIGNED_HYPER;
-    
+
     //
     jclass                      m_class_Object;
     jclass                      m_class_Character;
@@ -148,14 +148,14 @@ public:
     jclass                      m_class_Float;
     jclass                      m_class_Double;
     jclass                      m_class_String;
-    
+
     jclass                      m_class_UnoRuntime;
     jclass                      m_class_RuntimeException;
     jclass                      m_class_Any;
     jclass                      m_class_Type;
     jclass                      m_class_TypeClass;
     jclass                      m_class_JNI_proxy;
-    
+
     //
     jmethodID                   m_method_Object_toString;
     jmethodID                   m_method_Class_getName;
@@ -167,7 +167,7 @@ public:
     jmethodID                   m_ctor_Integer_with_int;
     jmethodID                   m_ctor_Long_with_long;
     jmethodID                   m_ctor_Float_with_float;
-    jmethodID                   m_ctor_Double_with_double;    
+    jmethodID                   m_ctor_Double_with_double;
     jmethodID                   m_method_Boolean_booleanValue;
     jmethodID                   m_method_Byte_byteValue;
     jmethodID                   m_method_Character_charValue;
@@ -176,7 +176,7 @@ public:
     jmethodID                   m_method_Integer_intValue;
     jmethodID                   m_method_Long_longValue;
     jmethodID                   m_method_Short_shortValue;
-    
+
     //
     jmethodID                   m_method_IEnvironment_getRegisteredInterface;
     jmethodID                   m_method_IEnvironment_registerInterface;
@@ -190,7 +190,7 @@ public:
     jfieldID                    m_field_Type__typeName;
     jmethodID                   m_method_TypeClass_fromInt;
     jfieldID                    m_field_Enum_m_value;
-    
+
     //
     jmethodID                   m_method_JNI_proxy_get_proxy_ctor;
     jmethodID                   m_method_JNI_proxy_create;
@@ -205,8 +205,8 @@ public:
     ::com::sun::star::uno::Type const & m_RuntimeException_type;
     ::com::sun::star::uno::Type const & m_void_type;
     //
-    JNI_interface_type_info const * m_XInterface_type_info;    
-    
+    JNI_interface_type_info const * m_XInterface_type_info;
+
     //
     JNI_type_info const * get_type_info(
         JNI_context const & jni,
@@ -221,18 +221,18 @@ public:
     inline static void append_sig(
         ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type,
         bool use_Object_for_type_XInterface = true, bool use_slashes = true );
-    
+
     // get this
     static JNI_info const * get_jni_info(
         rtl::Reference< jvmaccess::UnoVirtualMachine > const & uno_vm );
     inline void destroy( JNIEnv * jni_env );
-    
+
 private:
     JNI_type_info const * create_type_info(
         JNI_context const & jni, typelib_TypeDescription * td ) const;
-    
+
     void destruct( JNIEnv * jni_env );
-    
+
     JNI_info( JNIEnv * jni_env, jobject class_loader,
               jclass classClass, jmethodID methodForName );
     inline ~JNI_info() {}
diff --git a/main/bridges/test/inter_libs_exc/share.h b/main/bridges/test/inter_libs_exc/share.h
index 4fd4d4dd28..c0502a8e62 100644
--- a/main/bridges/test/inter_libs_exc/share.h
+++ b/main/bridges/test/inter_libs_exc/share.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/main/bridges/test/testcomp.h b/main/bridges/test/testcomp.h
index 393eb90386..40ab83c017 100644
--- a/main/bridges/test/testcomp.h
+++ b/main/bridges/test/testcomp.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -47,13 +47,13 @@ public:
 	OInterfaceTest() {}
 	~OInterfaceTest() {}
 
-public:	
+public:
 	// XInterface
 	Any	SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException );
 	void 		SAL_CALL acquire() throw() 						 { OWeakObject::acquire(); }
 	void 		SAL_CALL release() throw()						 { OWeakObject::release(); }
 
-public:	
+public:
     virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setInOut( ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL getOut( ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException);
@@ -74,7 +74,7 @@ public:
 	OCallMe() : m_nLastToDos(-1) {}
 	~OCallMe() {}
 
-public:	
+public:
 	// XInterface
 	Any	SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException );
 	void 		SAL_CALL acquire()throw() 						 { OWeakObject::acquire(); }
@@ -110,7 +110,7 @@ public:
 	OTestFactory() {}
 	~OTestFactory() {}
 
-public:	
+public:
 	// XInterface
 	Any	        SAL_CALL queryInterface( const  com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException );
 	void 		SAL_CALL acquire() throw() 						 { OWeakObject::acquire(); }
@@ -134,12 +134,12 @@ public:
 		m_rSMgr( r )
 		{}
 	~OInstanceProvider(){ printf( "instance provider dies\n" );}
-public:	
+public:
 	// XInterface
 	Any	        SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException );
 	void 		SAL_CALL acquire()throw() 						 { OWeakObject::acquire(); }
 	void 		SAL_CALL release() throw()						 { OWeakObject::release(); }
-	
+
 public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
 	       getInstance( const ::rtl::OUString& sObjectName )
diff --git a/main/canvas/inc/canvas/canvastoolsdllapi.h b/main/canvas/inc/canvas/canvastoolsdllapi.h
index 1c3c0d6ab2..f6d19d73ef 100644
--- a/main/canvas/inc/canvas/canvastoolsdllapi.h
+++ b/main/canvas/inc/canvas/canvastoolsdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/cli_ure/source/climaker/climaker_share.h b/main/cli_ure/source/climaker/climaker_share.h
index a53f0e248c..52be2938a5 100644
--- a/main/cli_ure/source/climaker/climaker_share.h
+++ b/main/cli_ure/source/climaker/climaker_share.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -122,9 +122,9 @@ __gc class TypeEmitter : public ::System::IDisposable
 {
     ::System::Reflection::Emit::ModuleBuilder * m_module_builder;
     ::System::Reflection::Assembly * m_extra_assemblies __gc [];
-    
+
     ::System::Reflection::MethodInfo * m_method_info_Type_GetTypeFromHandle;
-    
+
     ::System::Type * m_type_Exception;
     ::System::Type * get_type_Exception();
     ::System::Type * m_type_RuntimeException;
@@ -155,7 +155,7 @@ __gc class TypeEmitter : public ::System::IDisposable
         const css::uno::Sequence<
         css::uno::Reference<css::reflection::XCompoundTypeDescription> > & seqExceptionsTd);
 
-    
+
     __gc class iface_entry
     {
     public:
@@ -164,7 +164,7 @@ __gc class TypeEmitter : public ::System::IDisposable
     };
     ::System::Collections::Hashtable * m_incomplete_ifaces;
     ::System::Type * complete_iface_type( iface_entry * entry );
-    
+
     __gc class struct_entry
     {
     public:
@@ -180,10 +180,10 @@ __gc class TypeEmitter : public ::System::IDisposable
     ::System::Collections::Hashtable * m_incomplete_structs;
     ::System::Type * complete_struct_type( struct_entry * entry );
 
-    /*  returns the type for the name. If it is a struct then it may 
+    /*  returns the type for the name. If it is a struct then it may
         complete the struct if not already done. This also refers to its
-        base types.            
-        
+        base types.
+
         @param sName
             the full name of the type.
         @return the type object for sName. Not necessarily a struct.
@@ -198,7 +198,7 @@ __gc class TypeEmitter : public ::System::IDisposable
     };
     ::System::Collections::Hashtable * m_incomplete_services;
     ::System::Type * complete_service_type(service_entry * entry);
-    
+
     __gc class singleton_entry
     {
     public:
@@ -209,10 +209,10 @@ __gc class TypeEmitter : public ::System::IDisposable
 
     ::System::Collections::Hashtable * m_incomplete_singletons;
     ::System::Type * complete_singleton_type(singleton_entry * entry);
-    
-    
+
+
     ::System::Collections::Hashtable * m_generated_structs;
-    
+
     ::System::Type * get_type(
         ::System::String * cli_name, bool throw_exc );
     ::System::Type * get_type(
@@ -224,7 +224,7 @@ __gc class TypeEmitter : public ::System::IDisposable
     ::System::Type * get_type(
         css::uno::Reference<
         css::reflection::XEnumTypeDescription > const & xType );
-    /* returns the type for a struct or exception. In case of a polymorphic struct it may 
+    /* returns the type for a struct or exception. In case of a polymorphic struct it may
         return a ::uno::PolymorphicType (cli_basetypes.dll) only if the struct is already
         complete.
     */
@@ -252,10 +252,10 @@ public:
         ::System::Reflection::Assembly * assemblies __gc [] );
     // must be called to finish up uncompleted types
     void Dispose();
-    
+
     ::System::Reflection::Assembly * type_resolve(
         ::System::Object * sender, ::System::ResolveEventArgs * args );
-    
+
     ::System::Type * get_type(
         css::uno::Reference<
         css::reflection::XTypeDescription > const & xType );
diff --git a/main/cli_ure/source/native/native_share.h b/main/cli_ure/source/native/native_share.h
index 0f618b151e..afafcfc151 100644
--- a/main/cli_ure/source/native/native_share.h
+++ b/main/cli_ure/source/native/native_share.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -65,7 +65,7 @@ inline ::System::Object * to_cli(
             ::com::sun::star::uno::Reference<
               ::com::sun::star::uno::XInterface >() );
     }
-    
+
     intptr_t intptr =
         reinterpret_cast< intptr_t >(
             mapping.mapInterface( x.get(), ::getCppuType( &x ) ) );
@@ -90,7 +90,7 @@ inline void to_uno(
             ::com::sun::star::uno::Reference<
               ::com::sun::star::uno::XInterface >() );
     }
-    
+
     ::System::Runtime::InteropServices::GCHandle handle(
         ::System::Runtime::InteropServices::GCHandle::Alloc( x ) );
     T * ret = 0;
diff --git a/main/cli_ure/source/uno_bridge/cli_base.h b/main/cli_ure/source/uno_bridge/cli_base.h
index 29a2603e99..7326f46c4d 100644
--- a/main/cli_ure/source/uno_bridge/cli_base.h
+++ b/main/cli_ure/source/uno_bridge/cli_base.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -113,7 +113,7 @@ __gc struct Constants
 struct BridgeRuntimeError
 {
     ::rtl::OUString m_message;
-    
+
     inline BridgeRuntimeError( ::rtl::OUString const & message )
         : m_message( message )
         {}
@@ -130,7 +130,7 @@ struct rtl_mem
 		{ return mem; }
 	inline static void operator delete ( void *, void * )
 		{}
-    
+
     static inline ::std::auto_ptr< rtl_mem > allocate( ::std::size_t bytes );
 };
 //--------------------------------------------------------------------------------------------------
@@ -146,15 +146,15 @@ inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes )
 class TypeDescr
 {
     typelib_TypeDescription * m_td;
-    
+
     TypeDescr( TypeDescr & ); // not impl
     void operator = ( TypeDescr ); // not impl
-    
+
 public:
     inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref );
     inline ~TypeDescr() SAL_THROW( () )
         { TYPELIB_DANGER_RELEASE( m_td ); }
-    
+
     inline typelib_TypeDescription * get() const
         { return m_td; }
 };
diff --git a/main/cli_ure/source/uno_bridge/cli_bridge.h b/main/cli_ure/source/uno_bridge/cli_bridge.h
index 5b41458899..eb213b27b7 100644
--- a/main/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/main/cli_ure/source/uno_bridge/cli_bridge.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -64,17 +64,17 @@ struct Bridge
     mutable oslInterlockedCount m_ref;
     uno_ExtEnvironment *        m_uno_env;
     uno_Environment *           m_uno_cli_env;
-                                               
+
     Mapping                     m_cli2uno;
     Mapping                     m_uno2cli;
     bool                        m_registered_cli2uno;
 
     ~Bridge() SAL_THROW( () );
     Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, bool registered_java2uno );
-    
+
     void acquire() const;
     void release() const;
-    
+
     void  map_to_uno(
         void * uno_data, System::Object* cli_data,
         typelib_TypeDescriptionReference * type,
@@ -88,9 +88,9 @@ struct Bridge
         System::Object* *cli_data, void const * uno_data,
         typelib_TypeDescriptionReference * type, System::Type* info /* maybe 0 */,
         bool bDontCreateObj) const;
-    
+
     System::Object* map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceTypeDescription* pTD) const;
-    
+
     System::Object* Bridge::call_uno(uno_Interface * pUnoI,
                       typelib_TypeDescription* member_td,
                       typelib_TypeDescriptionReference * return_type,
@@ -104,7 +104,7 @@ struct Bridge
         typelib_TypeDescriptionReference * return_type,
         typelib_MethodParameter * params, int nParams,
         void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) const;
-    
+
     uno_Interface * map_cli2uno(
         System::Object* cliI, typelib_TypeDescription* pTD) const;
 
diff --git a/main/cli_ure/source/uno_bridge/cli_environment.h b/main/cli_ure/source/uno_bridge/cli_environment.h
index aca4c83381..e4a0c99aac 100644
--- a/main/cli_ure/source/uno_bridge/cli_environment.h
+++ b/main/cli_ure/source/uno_bridge/cli_environment.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -43,10 +43,10 @@ public __gc class Cli_environment
 
 #if OSL_DEBUG_LEVEL >= 1
     int _numRegisteredObjects;
-#endif     
+#endif
 
 public:
-    
+
     static Cli_environment()
     {
         m_objects = Hashtable::Synchronized(new Hashtable());
@@ -61,7 +61,7 @@ public:
     inline Cli_environment();
 
     ~Cli_environment();
-    
+
     /**
        Registers an UNO object as being mapped by this bridge. The resulting
        cli object is represents all interfaces of the UNO object. Therefore the
@@ -80,7 +80,7 @@ public:
        destructors.
      */
     inline void revokeInterface(System::String* oid);
-    
+
     void revokeInterface(System::String* oid, System::Type* type);
     /**
      * Retrieves an interface identified by its object id and type from this
diff --git a/main/cli_ure/source/uno_bridge/cli_proxy.h b/main/cli_ure/source/uno_bridge/cli_proxy.h
index 8a6eece955..793c5582a0 100644
--- a/main/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/main/cli_ure/source/uno_bridge/cli_proxy.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -48,7 +48,7 @@ namespace cli_uno
 public __gc class UnoInterfaceInfo
 {
 public:
-    UnoInterfaceInfo(Bridge const * bridge, uno_Interface* unoI, 
+    UnoInterfaceInfo(Bridge const * bridge, uno_Interface* unoI,
                      typelib_InterfaceTypeDescription* td);
     ~UnoInterfaceInfo();
     uno_Interface * m_unoI; // wrapped interface
@@ -71,7 +71,7 @@ public __gc class  UnoInterfaceProxy: public srrp::RealProxy,
     sc::ArrayList* m_listIfaces;
     /** The number of UNO interfaces this proxy represents. It corresponds
         to the number of elements in m_listIfaces.
-    */    
+    */
     int m_numUnoIfaces;
     /** The list is filled with additional UnoInterfaceProxy object due
         to aggregation via bridges.  Though the latter is strongly
@@ -79,12 +79,12 @@ public __gc class  UnoInterfaceProxy: public srrp::RealProxy,
     */
     sc::ArrayList* m_listAdditionalProxies;
     int m_nlistAdditionalProxies;
-    
+
     UnoInterfaceInfo * findInfo( ::System::Type * type );
 
     Bridge const* m_bridge;
  	System::String* m_oid;
-    
+
 #if OSL_DEBUG_LEVEL >= 2
     /** The string contains all names of UNO interfaces which are
         represented by this proxy. It is used to print out the interfaces
@@ -96,7 +96,7 @@ public __gc class  UnoInterfaceProxy: public srrp::RealProxy,
 //      */
     int _numInterfaces;
 #endif
-    
+
 public:
 
     /** Creates a proxy and registers it on the dot NET side.
@@ -135,7 +135,7 @@ public:
         m_sTypeName = name;
     }
 
-    
+
 private:
     UnoInterfaceProxy(
 		Bridge * bridge,
@@ -165,7 +165,7 @@ private:
     static System::String* m_ToString_String = new System::String("ToString");
 
 protected:
-     srrm::IMessage* invokeObject(sc::IDictionary* properties,                    
+     srrm::IMessage* invokeObject(sc::IDictionary* properties,
                                   srrm::LogicalCallContext* context,
                                   srrm::IMethodCallMessage* mcm);
 };
@@ -224,17 +224,17 @@ struct CliProxy: public uno_Interface
 
         That is the real Uno position has to be deducted by 3. Then
         arUnoPosToCliPos[pos] contains the index for m_arMethodInfos.
-        
+
      */
     gcroot<System::Int32[]> m_arUnoPosToCliPos;
 
     /** Count of inherited interfaces of the cli interface.
      */
     int m_nInheritedInterfaces;
-    /** Contains the number of methods of each interface. 
+    /** Contains the number of methods of each interface.
      */
     gcroot<System::Int32[]> m_arInterfaceMethodCount;
-    
+
     CliProxy( Bridge const* bridge, System::Object* cliI,
                  typelib_TypeDescription const* pTD,
                  const rtl::OUString& usOid);
@@ -273,16 +273,16 @@ struct CliProxy: public uno_Interface
        The implementation assumes that the order of interface methods as
        provided by InterfaceMapping.InterfaceMethods corresponds to the order
        of methods in the interface declaration.
-      
+
        @param nUnoFunctionPos
        Position of the method in the uno interface.
      */
     sr::MethodInfo* getMethodInfo(int nUnoFunctionPos,
                                   const rtl::OUString & usMethodName,
                                   MethodKind mk);
-    
+
     void SAL_CALL uno_DispatchMethod(
-        struct _uno_Interface * pUnoI, 
+        struct _uno_Interface * pUnoI,
         const struct _typelib_TypeDescription * pMemberType,
         void * pReturn,
         void * pArgs[],
diff --git a/main/comphelper/inc/comphelper/comphelperdllapi.h b/main/comphelper/inc/comphelper/comphelperdllapi.h
index 47cca1521b..ecf1fcc006 100644
--- a/main/comphelper/inc/comphelper/comphelperdllapi.h
+++ b/main/comphelper/inc/comphelper/comphelperdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,27 +7,27 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 #ifndef INCLUDED_COMPHELPERDLLAPI_H
 #define INCLUDED_COMPHELPERDLLAPI_H
-                                                                                                                             
+
 #include "sal/types.h"
-                                                                                                                             
+
 #if defined(COMPHELPER_DLLIMPLEMENTATION)
 #define COMPHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else
 #define COMPHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define COMPHELPER_DLLPRIVATE SAL_DLLPRIVATE
-                                                                                                                             
+
 #endif /* INCLUDED_COMPHELPERDLLAPI_H */
diff --git a/main/comphelper/inc/comphelper/fileformat.h b/main/comphelper/inc/comphelper/fileformat.h
index 9177bf125e..7aac97b058 100644
--- a/main/comphelper/inc/comphelper/fileformat.h
+++ b/main/comphelper/inc/comphelper/fileformat.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/connectivity/source/drivers/ado/ado_post_sys_include.h b/main/connectivity/source/drivers/ado/ado_post_sys_include.h
index 425959153a..620625e7c4 100644
--- a/main/connectivity/source/drivers/ado/ado_post_sys_include.h
+++ b/main/connectivity/source/drivers/ado/ado_post_sys_include.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/connectivity/source/drivers/ado/ado_pre_sys_include.h b/main/connectivity/source/drivers/ado/ado_pre_sys_include.h
index 8bc42d482b..6e7ac85c46 100644
--- a/main/connectivity/source/drivers/ado/ado_pre_sys_include.h
+++ b/main/connectivity/source/drivers/ado/ado_pre_sys_include.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/connectivity/source/drivers/evoab2/EApi.h b/main/connectivity/source/drivers/evoab2/EApi.h
index 6d04cd2622..5879611ef8 100644
--- a/main/connectivity/source/drivers/evoab2/EApi.h
+++ b/main/connectivity/source/drivers/evoab2/EApi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,19 +7,19 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
- 
+
 
 #ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
 #define _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
diff --git a/main/connectivity/source/inc/diagnose_ex.h b/main/connectivity/source/inc/diagnose_ex.h
index 67d66c0f35..84d640ea09 100644
--- a/main/connectivity/source/inc/diagnose_ex.h
+++ b/main/connectivity/source/inc/diagnose_ex.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/connectivity/source/inc/hsqldb/HStorageAccess.h b/main/connectivity/source/inc/hsqldb/HStorageAccess.h
index b543f109c0..05d3374a75 100644
--- a/main/connectivity/source/inc/hsqldb/HStorageAccess.h
+++ b/main/connectivity/source/inc/hsqldb/HStorageAccess.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 /* DO NOT EDIT THIS FILE - it is machine generated */
diff --git a/main/connectivity/source/inc/hsqldb/StorageFileAccess.h b/main/connectivity/source/inc/hsqldb/StorageFileAccess.h
index 3c54d22b27..3fada8a2d4 100644
--- a/main/connectivity/source/inc/hsqldb/StorageFileAccess.h
+++ b/main/connectivity/source/inc/hsqldb/StorageFileAccess.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 /* DO NOT EDIT THIS FILE - it is machine generated */
diff --git a/main/connectivity/source/inc/hsqldb/StorageNativeInputStream.h b/main/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
index 631ec9eea5..d95432d6ee 100644
--- a/main/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
+++ b/main/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 /* DO NOT EDIT THIS FILE - it is machine generated */
diff --git a/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h b/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
index f6275b7c83..1d65578090 100644
--- a/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
+++ b/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -24,7 +24,7 @@
 #define  INCLUDED_CPPCANVASDLLAPI_H
 
 #if defined CPPCANVAS_DLLIMPLEMENTATION
-        
+
 #define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
 #else
 #define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
diff --git a/main/cppu/inc/com/sun/star/uno/Any.h b/main/cppu/inc/com/sun/star/uno/Any.h
index 5c8325f95e..87bd0a940e 100644
--- a/main/cppu/inc/com/sun/star/uno/Any.h
+++ b/main/cppu/inc/com/sun/star/uno/Any.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -31,13 +31,13 @@
 
 
 namespace com
-{     
+{
 namespace sun
-{     
+{
 namespace star
-{     
+{
 namespace uno
-{     
+{
 
 /** C++ class representing an IDL any.
 	This class is used to transport any type defined in IDL. The class inherits from the
@@ -63,101 +63,101 @@ public:
     /** @internal */
 	inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
 		{}
-	
+
 	/** Default constructor: Any holds no value; its type is void.
 	*/
 	inline Any() SAL_THROW( () );
-    
+
     /** Templated ctor.  Sets a copy of the given value.
-        
+
         @param value value of the Any
     */
     template <typename T>
     explicit inline Any( T const & value );
     /// Ctor support for C++ bool.
     explicit inline Any( bool value );
-    
+
 	/** Copy constructor: Sets value of the given any.
-        
+
 		@param rAny another any
 	*/
 	inline Any( const Any & rAny ) SAL_THROW( () );
-	
+
 	/** Constructor: Sets a copy of the given data.
-        
+
 		@param pData_ value
 		@param rType type of value
 	*/
 	inline Any( const void * pData_, const Type & rType ) SAL_THROW( () );
-	
+
 	/** Constructor: Sets a copy of the given data.
-        
+
 		@param pData_ value
 		@param pTypeDescr type of value
 	*/
 	inline Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () );
-	
+
 	/** Constructor: Sets a copy of the given data.
-        
+
 		@param pData_ value
 		@param pType type of value
 	*/
 	inline Any( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW( () );
-	
+
 	/** Destructor: Destructs any content and frees memory.
 	*/
 	inline ~Any() SAL_THROW( () );
-	
+
 	/** Assignment operator: Sets the value of the given any.
-        
+
 		@param rAny another any (right side)
 		@return this any
 	*/
 	inline Any & SAL_CALL operator = ( const Any & rAny ) SAL_THROW( () );
-	
+
 	/** Gets the type of the set value.
-        
+
 		@return a Type object of the set value
 	 */
 	inline const Type & SAL_CALL getValueType() const SAL_THROW( () )
 		{ return * reinterpret_cast< const Type * >( &pType ); }
 	/** Gets the type of the set value.
-        
+
 		@return the UNacquired type description reference of the set value
 	 */
 	inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const SAL_THROW( () )
 		{ return pType; }
-	
+
 	/** Gets the type description of the set value. Provides ownership of the type description!
 		Call an explicit typelib_typedescription_release() to release afterwards.
-        
+
 		@param a pointer to type description pointer
 	*/
 	inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const SAL_THROW( () )
 		{ ::typelib_typedescriptionreference_getDescription( ppTypeDescr, pType ); }
-	
+
 	/** Gets the type class of the set value.
-        
+
 		@return the type class of the set value
 	 */
 	inline TypeClass SAL_CALL getValueTypeClass() const SAL_THROW( () )
 		{ return (TypeClass)pType->eTypeClass; }
-	
+
 	/** Gets the type name of the set value.
-        
+
 		@return the type name of the set value
 	*/
 	inline ::rtl::OUString SAL_CALL getValueTypeName() const SAL_THROW( () );
-	
+
 	/** Tests if any contains a value.
-        
+
 		@return true if any has a value, false otherwise
 	*/
 	inline sal_Bool SAL_CALL hasValue() const SAL_THROW( () )
 		{ return (typelib_TypeClass_VOID != pType->eTypeClass); }
-	
+
 	/** Gets a pointer to the set value.
-        
+
 		@return a pointer to the set value
 	*/
 	inline const void * SAL_CALL getValue() const SAL_THROW( () )
@@ -180,66 +180,66 @@ public:
     template <typename T>
     inline T get() const;
 #endif // ! defined(EXCEPTIONS_OFF)
-    
+
 	/** Sets a value. If the any already contains a value, that value will be destructed
         and its memory freed.
-        
+
 		@param pData_ pointer to value
 		@param rType type of value
 	*/
 	inline void SAL_CALL setValue( const void * pData_, const Type & rType ) SAL_THROW( () );
 	/** Sets a value. If the any already contains a value, that value will be destructed
 		and its memory freed.
-        
+
 		@param pData_ pointer to value
 		@param pType type of value
 	*/
 	inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW( () );
 	/** Sets a value. If the any already contains a value, that value will be destructed
 		and its memory freed.
-        
+
 		@param pData_ pointer to value
 		@param pTypeDescr type description of value
 	*/
 	inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () );
-	
+
 	/** Clears this any. If the any already contains a value, that value will be destructed
 		and its memory freed. After this has been called, the any does not contain a value.
 	*/
 	inline void SAL_CALL clear() SAL_THROW( () );
-	
+
 	/** Tests whether this any is extractable to a value of given type.
         Widening conversion without data loss is taken into account.
-        
+
 		@param rType destination type
 		@return true if this any is extractable to value of given type (e.g. using >>= operator)
 	*/
 	inline sal_Bool SAL_CALL isExtractableTo( const Type & rType ) const SAL_THROW( () );
-    
+
 	/** Tests whether this any can provide a value of specified type.
         Widening conversion without data loss is taken into account.
-        
+
 		@return true if this any can provide a value of specified type
 		(e.g. using >>= operator)
 	*/
     template <typename T>
 	inline bool has() const;
-    
+
 	/** Equality operator: compares two anys.
 		The values need not be of equal type, e.g. a short integer is compared to a long integer.
-        
+
 		@param rAny another any (right side)
 		@return true if both any contains equal values
 	*/
 	inline sal_Bool SAL_CALL operator == ( const Any & rAny ) const SAL_THROW( () );
 	/** Unequality operator: compares two anys.
 		The values need not be of equal type, e.g. a short integer is compared to a long integer.
-        
+
 		@param rAny another any (right side)
 		@return true if both any contains unequal values
 	*/
 	inline sal_Bool SAL_CALL operator != ( const Any & rAny ) const SAL_THROW( () );
-    
+
 private:
     // not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16)
     explicit Any( sal_uInt16 );
@@ -288,7 +288,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
 /** Template binary >>= operator to assign a value from an any.
 	If the any does not contain a value that can be assigned without data loss, then this
     operation will fail returning false.
-    
+
     @tplparam C value type
 	@param rAny source any (left side)
 	@param value destination value (right side)
@@ -296,12 +296,12 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
 */
 template< class C >
 inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( () );
-	
+
 /** Template equality operator: compares set value of left side any to right side value.
 	The values need not be of equal type, e.g. a short integer is compared to a long integer.
 	This operator can be implemented as template member function, if all supported compilers
     can cope with template member functions.
-    
+
     @tplparam C value type
 	@param rAny another any (left side)
 	@param value a value (right side)
@@ -313,7 +313,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_T
 	The values need not be of equal type, e.g. a short integer is compared to a long integer.
 	This operator can be implemented as template member function, if all supported compilers
     can cope with template member functions.
-    
+
     @tplparam C value type
 	@param rAny another any (left side)
 	@param value a value (right side)
@@ -364,10 +364,10 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v
 }
 
 /** Gets the meta type of IDL type any.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type any
 */
diff --git a/main/cppu/inc/com/sun/star/uno/Reference.h b/main/cppu/inc/com/sun/star/uno/Reference.h
index 2819420cd0..ee4b493cb2 100644
--- a/main/cppu/inc/com/sun/star/uno/Reference.h
+++ b/main/cppu/inc/com/sun/star/uno/Reference.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -27,13 +27,13 @@
 
 
 namespace com
-{     
+{
 namespace sun
-{     
+{
 namespace star
-{     
+{
 namespace uno
-{     
+{
 
 class RuntimeException;
 class XInterface;
@@ -61,9 +61,9 @@ protected:
 	/** the interface pointer
 	*/
 	XInterface * _pInterface;
-	
+
 	/** Queries given interface for type rType.
-        
+
 		@param pInterface interface pointer
 		@param rType interface type
 		@return interface of demanded type (may be null)
@@ -73,7 +73,7 @@ protected:
 #ifndef EXCEPTIONS_OFF
 	/** Queries given interface for type rType.
         Throws a RuntimeException if the demanded interface cannot be queried.
-        
+
 		@param pInterface interface pointer
 		@param rType interface type
 		@return interface of demanded type
@@ -81,54 +81,54 @@ protected:
 	inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface, const Type & rType )
         SAL_THROW( (RuntimeException) );
 #endif
-    
+
 public:
 	/** Gets interface pointer. This call does not acquire the interface.
-        
+
 		@return UNacquired interface pointer
 	*/
     inline XInterface * SAL_CALL get() const SAL_THROW( () )
 		{ return _pInterface; }
-	
+
 	/** Checks if reference is null.
-        
+
 		@return true if reference acquires an interface, i.e. true if it is not null
 	*/
 	inline sal_Bool SAL_CALL is() const SAL_THROW( () )
 		{ return (0 != _pInterface); }
-	
+
 	/** Equality operator: compares two interfaces
 		Checks if both references are null or refer to the same object.
-        
+
 		@param rRef another interface
 		@return true if both references are null or refer to the same object, false otherwise
 	*/
 	inline sal_Bool SAL_CALL operator == ( XInterface * pInterface ) const SAL_THROW( () );
 	/** Unequality operator: compares two interfaces
 		Checks if both references are null or refer to the same object.
-        
+
 		@param rRef another interface
 		@return false if both references are null or refer to the same object, true otherwise
 	*/
 	inline sal_Bool SAL_CALL operator != ( XInterface * pInterface ) const SAL_THROW( () );
-	
+
 	/** Equality operator: compares two interfaces
 		Checks if both references are null or refer to the same object.
-        
+
 		@param rRef another reference
 		@return true if both references are null or refer to the same object, false otherwise
 	*/
 	inline sal_Bool SAL_CALL operator == ( const BaseReference & rRef ) const SAL_THROW( () );
 	/** Unequality operator: compares two interfaces
 		Checks if both references are null or refer to the same object.
-        
+
 		@param rRef another reference
 		@return false if both references are null or refer to the same object, true otherwise
 	*/
 	inline sal_Bool SAL_CALL operator != ( const BaseReference & rRef ) const SAL_THROW( () );
 
     /** Needed by some STL containers.
-        
+
         @param rRef another reference
         @return true, if this reference is less than rRef
     */
@@ -178,7 +178,7 @@ template< class interface_type >
 class Reference : public BaseReference
 {
 	/** Queries given interface for type interface_type.
-        
+
 		@param pInterface interface pointer
 		@return interface of demanded type (may be null)
 	*/
@@ -187,14 +187,14 @@ class Reference : public BaseReference
 #ifndef EXCEPTIONS_OFF
 	/** Queries given interface for type interface_type.
         Throws a RuntimeException if the demanded interface cannot be queried.
-        
+
 		@param pInterface interface pointer
 		@return interface of demanded type
 	*/
 	inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface )
         SAL_THROW( (RuntimeException) );
 	/** Returns the given interface if it is not <NULL/>, throws a RuntimeException otherwise.
-        
+
         @param pInterface interface pointer
         @return pInterface
 	*/
@@ -231,7 +231,7 @@ class Reference : public BaseReference
     static inline XInterface * castToXInterface(interface_type * p) {
         return static_cast< XInterface * >(static_cast< void * >(p));
     }
-	
+
 public:
 	// these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -246,55 +246,55 @@ public:
     /** @internal */
 	inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
 		{}
-	
+
 	/** Destructor: Releases interface if set.
 	*/
 	inline ~Reference() SAL_THROW( () );
-	
+
 	/** Default Constructor: Sets null reference.
 	*/
 	inline Reference() SAL_THROW( () );
-	
+
 	/** Copy constructor: Copies interface reference.
-        
+
 		@param rRef another reference
 	*/
 	inline Reference( const Reference< interface_type > & rRef ) SAL_THROW( () );
 	/** Constructor: Sets given interface pointer.
-        
+
 		@param pInterface an interface pointer
 	*/
 	inline Reference( interface_type * pInterface ) SAL_THROW( () );
-	
+
 	/** Constructor: Sets given interface pointer without acquiring it.
-        
+
 		@param pInterface another reference
 		@param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors
 	*/
 	inline Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW( () );
 	/** Constructor: Sets given interface pointer without acquiring it.
         Deprecated, please use SAL_NO_ACQUIRE version.
-        
+
         @deprecated
 		@param pInterface another reference
 		@param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to other constructors
 	*/
 	inline Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () );
-	
+
 	/** Constructor: Queries given interface for reference interface type (interface_type).
-        
+
 		@param rRef another reference
 		@param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to other constructors
 	*/
 	inline Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) );
 	/** Constructor: Queries given interface for reference interface type (interface_type).
-        
+
 		@param pInterface an interface pointer
 		@param dummy UNO_QUERY to force obvious distinction to other constructors
 	*/
 	inline Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) );
 	/** Constructor: Queries given any for reference interface type (interface_type).
-        
+
 		@param rAny an any
 		@param dummy UNO_QUERY to force obvious distinction to other constructors
 	*/
@@ -302,7 +302,7 @@ public:
 #ifndef EXCEPTIONS_OFF
 	/** Constructor: Queries given interface for reference interface type (interface_type).
         Throws a RuntimeException if the demanded interface cannot be queried.
-        
+
 		@param rRef another reference
 		@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                      to other constructors
@@ -310,7 +310,7 @@ public:
 	inline Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) );
 	/** Constructor: Queries given interface for reference interface type (interface_type).
         Throws a RuntimeException if the demanded interface cannot be queried.
-        
+
 		@param pInterface an interface pointer
 		@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                      to other constructors
@@ -318,7 +318,7 @@ public:
 	inline Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) );
 	/** Constructor: Queries given any for reference interface type (interface_type).
         Throws a RuntimeException if the demanded interface cannot be queried.
-        
+
 		@param rAny an any
 		@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                      to other constructors
@@ -343,47 +343,47 @@ public:
     */
     inline Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) );
 #endif
-	
+
 	/** Cast operator to Reference< XInterface >: Reference objects are binary compatible and
         any interface must be derived from com.sun.star.uno.XInterface.
         This a useful direct cast possibility.
 	*/
 	inline SAL_CALL operator const Reference< XInterface > & () const SAL_THROW( () )
 		{ return * reinterpret_cast< const Reference< XInterface > * >( this ); }
-	
+
 	/** Dereference operator: Used to call interface methods.
-        
+
 		@return UNacquired interface pointer
 	*/
 	inline interface_type * SAL_CALL operator -> () const SAL_THROW( () )
 		{ return castFromXInterface(_pInterface); }
-	
+
 	/** Gets interface pointer. This call does not acquire the interface.
-        
+
 		@return UNacquired interface pointer
 	*/
 	inline interface_type * SAL_CALL get() const SAL_THROW( () )
 		{ return castFromXInterface(_pInterface); }
-	
+
 	/** Clears reference, i.e. releases interface. Reference is null after clear() call.
 	*/
 	inline void	SAL_CALL clear() SAL_THROW( () );
-	
+
 	/** Sets the given interface. An interface already set will be released.
-        
+
 		@param rRef another reference
 		@return true, if non-null interface was set
 	*/
     inline sal_Bool SAL_CALL set( const Reference< interface_type > & rRef ) SAL_THROW( () );
 	/** Sets the given interface. An interface already set will be released.
-        
+
 		@param pInterface another interface
 		@return true, if non-null interface was set
 	*/
     inline sal_Bool SAL_CALL set( interface_type * pInterface ) SAL_THROW( () );
-	
+
 	/** Sets interface pointer without acquiring it. An interface already set will be released.
-        
+
 		@param pInterface an interface pointer
 		@param dummy SAL_NO_ACQUIRE to force obvious distinction to set methods
 		@return true, if non-null interface was set
@@ -398,10 +398,10 @@ public:
 		@return true, if non-null interface was set
 	*/
 	inline sal_Bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () );
-	
+
 	/** Queries given interface for reference interface type (interface_type) and sets it.
         An interface already set will be released.
-        
+
 		@param pInterface an interface pointer
 		@param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to set methods
 		@return true, if non-null interface was set
@@ -409,16 +409,16 @@ public:
     inline sal_Bool SAL_CALL set( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) );
 	/** Queries given interface for reference interface type (interface_type) and sets it.
 		An interface already set will be released.
-        
+
 		@param rRef another reference
 		@param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to set methods
 		@return true, if non-null interface was set
 	*/
     inline sal_Bool SAL_CALL set( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) );
-    
+
 	/** Queries given any for reference interface type (interface_type)
         and sets it.  An interface already set will be released.
-        
+
 		@param rAny
                an Any containing an interface
 		@param dummy
@@ -428,12 +428,12 @@ public:
                 true, if non-null interface was set
 	*/
     inline bool set( Any const & rAny, UnoReference_Query );
-    
+
 #ifndef EXCEPTIONS_OFF
 	/** Queries given interface for reference interface type (interface_type) and sets it.
         An interface already set will be released.
         Throws a RuntimeException if the demanded interface cannot be set.
-        
+
 		@param pInterface an interface pointer
 		@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                      to set methods
@@ -442,17 +442,17 @@ public:
 	/** Queries given interface for reference interface type (interface_type) and sets it.
 		An interface already set will be released.
         Throws a RuntimeException if the demanded interface cannot be set.
-        
+
 		@param rRef another reference
 		@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                to set methods
 	*/
     inline void SAL_CALL set( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) );
-    
+
 	/** Queries given any for reference interface type (interface_type) and
 		sets it.  An interface already set will be released.
         Throws a RuntimeException if the demanded interface cannot be set.
-        
+
 		@param rAny
                an Any containing an interface
 		@param dummy
@@ -463,7 +463,7 @@ public:
     /** sets the given interface
         An interface already set will be released.
         Throws a RuntimeException if the source interface is <NULL/>.
-        
+
         @param pInterface an interface pointer
         @param dummy UNO_SET_THROW to force obvious distinction to other set methods
 
@@ -473,39 +473,39 @@ public:
     /** sets the given interface
         An interface already set will be released.
         Throws a RuntimeException if the source interface is <NULL/>.
-        
+
         @param rRef an interface reference
         @param dummy UNO_SET_THROW to force obvious distinction to other set methods
 
         @since UDK 3.2.8
 	*/
     inline void SAL_CALL set( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) );
-    
+
 #endif
-	
+
 	/** Assignment operator: Acquires given interface pointer and sets reference.
 		An interface already set will be released.
-        
+
 		@param pInterface an interface pointer
 		@return this reference
 	*/
     inline Reference< interface_type > & SAL_CALL operator = ( interface_type * pInterface ) SAL_THROW( () );
 	/** Assignment operator: Acquires given interface reference and sets reference.
 		An interface already set will be released.
-        
+
 		@param rRef an interface reference
 		@return this reference
 	*/
     inline Reference< interface_type > & SAL_CALL operator = ( const Reference< interface_type > & rRef ) SAL_THROW( () );
-	
+
 	/** Queries given interface reference for type interface_type.
-        
+
 		@param rRef interface reference
 		@return interface reference of demanded type (may be null)
 	*/
 	inline static Reference< interface_type > SAL_CALL query( const BaseReference & rRef ) SAL_THROW( (RuntimeException) );
 	/** Queries given interface for type interface_type.
-        
+
 		@param pInterface interface pointer
 		@return interface reference of demanded type (may be null)
 	*/
diff --git a/main/cppu/inc/com/sun/star/uno/Sequence.h b/main/cppu/inc/com/sun/star/uno/Sequence.h
index 47b10403fb..8f215649cf 100644
--- a/main/cppu/inc/com/sun/star/uno/Sequence.h
+++ b/main/cppu/inc/com/sun/star/uno/Sequence.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -39,19 +39,19 @@ class ByteSequence;
 }
 
 namespace com
-{     
+{
 namespace sun
-{     
+{
 namespace star
-{     
+{
 namespace uno
-{     
+{
 
 /** Template C++ class representing an IDL sequence. Template argument is the
     sequence element type.  C++ Sequences are reference counted and shared,
     so the sequence keeps a handle to its data.  To keep value semantics,
     copies are only generated if the sequence is to be modified (new handle).
-    
+
     @tplparam E element type of sequence
 */
 template< class E >
@@ -61,7 +61,7 @@ class Sequence
         @internal
     */
     uno_Sequence * _pSequence;
-    
+
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -80,135 +80,135 @@ public:
     inline static void SAL_CALL operator delete ( void *, void * )
         SAL_THROW( () )
         {}
-    
+
     /** Static pointer to typelib type of sequence.
         Don't use directly, call getCppuType().
         @internal
     */
     static typelib_TypeDescriptionReference * s_pType;
-    
+
     /** typedefs the element type of the sequence
     */
     typedef E ElementType;
-    
+
     /** Default constructor: Creates an empty sequence.
     */
     inline Sequence() SAL_THROW( () );
-    
+
     /** Copy constructor: Creates a copy of given sequence.
-        
+
         @param rSeq another sequence of same type
     */
     inline Sequence( const Sequence< E > & rSeq ) SAL_THROW( () );
-    
+
     /** Constructor: Takes over ownership of given sequence.
-        
+
         @param pSequence a sequence
         @param dummy SAL_NO_ACQUIRE to force obvious distinction to other
         constructors
     */
     inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire )
         SAL_THROW( () );
-    
+
     /** Constructor: Creates a copy of given elements.
-        
+
         @param pElement an array of elements
         @param len length of array
     */
     inline Sequence( const E * pElements, sal_Int32 len );
-    
+
     /** Constructor: Creates a default constructed sequence of given length.
-        
+
         @param len initial sequence length
     */
     inline explicit Sequence( sal_Int32 len );
-    
+
     /** Destructor: Releases sequence handle. Last handle will destruct
         elements and free memory.
     */
     inline ~Sequence() SAL_THROW( () );
-    
+
     /** Assignment operator: Acquires given sequence handle and releases
         previously set handle.
-        
+
         @param rSeq another sequence of same type
         @return this sequence
     */
     inline Sequence< E > & SAL_CALL operator = ( const Sequence< E > & rSeq )
         SAL_THROW( () );
-    
+
     /** Gets length of the sequence.
-        
+
         @return length of sequence
     */
     inline sal_Int32 SAL_CALL getLength() const SAL_THROW( () )
         { return _pSequence->nElements; }
-    
+
     /** Tests whether the sequence has elements, i.e. elements count is
         greater than zero.
-        
+
         @return true, if elements count is greater than zero
     */
     inline sal_Bool SAL_CALL hasElements() const SAL_THROW( () )
         { return (_pSequence->nElements > 0); }
-    
+
     /** Gets a pointer to elements array for reading.
         If the sequence has a length of 0, then the returned pointer is
         undefined.
-        
+
         @return pointer to elements array
     */
     inline const E * SAL_CALL getConstArray() const SAL_THROW( () )
         { return reinterpret_cast< const E * >( _pSequence->elements ); }
-    
+
     /** Gets a pointer to elements array for reading and writing.
         In general if the sequence has a handle acquired by other sequences
         (reference count > 1), then a new sequence is created copy constructing
         all elements to keep value semantics!
         If the sequence has a length of 0, then the returned pointer is
         undefined.
-        
+
         @return pointer to elements array
     */
     inline E * SAL_CALL getArray();
-    
+
     /** Non-const index operator: Obtains a reference to element indexed at
         given position.
         The implementation does not check for array bounds!
         In general if the sequence has a handle acquired by other sequences
         (reference count > 1), then a new sequence is created copy constructing
         all elements to keep value semantics!
-        
+
         @param nIndex index
         @return non-const C++ reference to element
     */
     inline E & SAL_CALL operator [] ( sal_Int32 nIndex );
-    
+
     /** Const index operator: Obtains a reference to element indexed at
         given position.  The implementation does not check for array bounds!
-        
+
         @param nIndex index
         @return const C++ reference to element
     */
     inline const E & SAL_CALL operator [] ( sal_Int32 nIndex ) const
         SAL_THROW( () );
-    
+
     /** Equality operator: Compares two sequences.
-        
+
         @param rSeq another sequence of same type (right side)
         @return true if both sequences are equal, false otherwise
     */
     inline sal_Bool SAL_CALL operator == ( const Sequence< E > & rSeq ) const
         SAL_THROW( () );
-    
+
     /** Unequality operator: Compares two sequences.
-        
+
         @param rSeq another sequence of same type (right side)
         @return false if both sequences are equal, true otherwise
     */
     inline sal_Bool SAL_CALL operator != ( const Sequence< E > & rSeq ) const
         SAL_THROW( () );
-    
+
     /** Reallocates sequence to new length.
         If the new length is smaller than the former, then upper elements will
         be destructed (and their memory freed).  If the new length is greater
@@ -216,13 +216,13 @@ public:
         If the sequence has a handle acquired by other sequences
         (reference count > 1), then the remaining elements are copy constructed
         to a new sequence handle to keep value semantics!
-        
+
         @param nSize new size of sequence
     */
     inline void SAL_CALL realloc( sal_Int32 nSize );
-    
+
     /** Provides UNacquired sequence handle.
-        
+
         @return UNacquired sequence handle
     */
     inline uno_Sequence * SAL_CALL get() const SAL_THROW( () )
@@ -230,7 +230,7 @@ public:
 };
 
 /** Creates a UNO byte sequence from a SAL byte sequence.
-    
+
     @param rByteSequence a byte sequence
     @return a UNO byte sequence
 */
@@ -246,7 +246,7 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence(
 
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
     @tplparam E element type of sequence
     @param dummy typed pointer for function signature
     @return type of IDL sequence
@@ -260,7 +260,7 @@ SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * )
     This function has been introduced, because one cannot get the (templated)
     cppu type out of C++ array types.  Array types have special
     getCppuArrayTypeN() functions.
-    
+
     @attention
     the given element type must be the same as the template argument type!
     @tplparam E element type of sequence
@@ -274,7 +274,7 @@ SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType )
 
 /** Gets the meta type of IDL sequence< char >.
     This function has been introduced due to ambiguities with unsigned short.
-    
+
     @param dummy typed pointer for function signature
     @return type of IDL sequence< char >
 */
diff --git a/main/cppu/inc/com/sun/star/uno/Type.h b/main/cppu/inc/com/sun/star/uno/Type.h
index 2fb978e7c4..434b28d517 100644
--- a/main/cppu/inc/com/sun/star/uno/Type.h
+++ b/main/cppu/inc/com/sun/star/uno/Type.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,22 +7,22 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 #ifndef _COM_SUN_STAR_UNO_TYPE_H_
 #define _COM_SUN_STAR_UNO_TYPE_H_
-					
+
 #include <typelib/typedescription.h>
 #ifndef _COM_SUN_STAR_UNO_TYPECLASS_HDL_
 #include <com/sun/star/uno/TypeClass.hdl>
@@ -33,13 +33,13 @@
 
 
 namespace com
-{     
+{
 namespace sun
-{     
+{
 namespace star
-{     
+{
 namespace uno
-{     
+{
 
 /** Enum defining UNO_TYPE_NO_ACQUIRE for type description reference transfer.
 */
@@ -64,7 +64,7 @@ class Type
         @internal
 	*/
 	typelib_TypeDescriptionReference * _pType;
-	
+
 public:
 	// these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -79,118 +79,118 @@ public:
     /** @internal */
 	inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
 		{}
-	
+
 	/** Default Constructor: Type is set to void.
 	*/
 	inline Type() SAL_THROW( () );
-	
+
 	/** Constructor: Type is constructed by given name and type class.
-        
+
 		@param eTypeClass type class of type
 		@param rTypeName name of type
 	*/
 	inline Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW( () );
-	
+
 	/** Constructor: Type is constructed by given name and type class.
-        
+
 		@param eTypeClass type class of type
 		@param pTypeName name of type
 	*/
 	inline Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW( () );
-	
+
 	/** Constructor: Type is (copy) constructed by given C type description reference.
-        
+
 		@param pType C type description reference
 	*/
 	inline Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () );
-	
+
 	/** Constructor: Type is (copy) constructed by given C type description reference
         without acquiring it.
-        
+
 		@param pType C type description reference
 		@param dummy UNO_TYPE_NO_ACQUIRE to force obvious distinction to other constructors
 	*/
 	inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () );
 	/** Constructor: Type is (copy) constructed by given C type description reference
         without acquiring it.
-        
+
 		@param pType C type description reference
 		@param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors
 	*/
 	inline Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW( () );
-	
+
     /** Copy constructor: Type is copy constructed by given type.
-        
+
 		@param rType another type
 	*/
     inline Type( const Type & rType ) SAL_THROW( () );
-	
+
 	/** Destructor: Releases acquired C type description reference.
 	*/
     inline ~Type() SAL_THROW( () )
 		{ ::typelib_typedescriptionreference_release( _pType ); }
-	
+
 	/** Assignment operator: Acquires right side type and releases previously set type.
-        
+
 		@param rType another type (right side)
 		@return this type
 	*/
 	inline Type & SAL_CALL operator = ( const Type & rType ) SAL_THROW( () );
-	
+
 	/** Gets the type class of set type.
-        
+
 		@return type class of set type
 	*/
 	inline TypeClass SAL_CALL getTypeClass() const SAL_THROW( () )
 		{ return (TypeClass)_pType->eTypeClass; }
-	
+
 	/** Gets the name of the set type.
-        
+
 		@return name of the set type
 	*/
 	inline ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW( () );
-	
+
 	/** Obtains a full type description of set type.
-        
+
 		@param ppDescr [inout] type description
 	*/
 	inline void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const SAL_THROW( () )
 		{ ::typelib_typedescriptionreference_getDescription( ppDescr, _pType ); }
-	
+
 	/** Gets the C typelib type description reference pointer. Does not acquire the reference!
-        
+
 		@return UNacquired type description reference
 	*/
 	inline typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const SAL_THROW( () )
 		{ return _pType; }
-	
+
     /** Tests if values of this reflected type can be assigned by values of given type.
         This includes widening conversion (e.g., long assignable from short), as long as there
         is no data loss.
-        
+
 		@param rType another type
 		@return true if values of this type can be assigned from values of given type,
                 false otherwise
 	*/
 	inline sal_Bool SAL_CALL isAssignableFrom( const Type & rType ) const SAL_THROW( () )
 		{ return ::typelib_typedescriptionreference_isAssignableFrom( _pType, rType._pType ); }
-    
+
 	/** Compares two types.
-        
+
 		@param rType another type
 		@return true if both types refer the same type, false otherwise
 	*/
 	inline sal_Bool SAL_CALL equals( const Type & rType ) const SAL_THROW( () )
 		{ return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
 	/** Equality operator: Compares two types.
-        
+
 		@param rType another type
 		@return true if both types refer the same type, false otherwise
 	*/
 	inline sal_Bool SAL_CALL operator == ( const Type & rType ) const SAL_THROW( () )
 		{ return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
 	/** Unequality operator: Compares two types.
-        
+
 		@param rType another type
 		@return false if both types refer the same type, true otherwise
 	*/
@@ -216,7 +216,7 @@ public:
 
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type "type"
 */
@@ -227,35 +227,35 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::su
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW( () );
 /** Gets the meta type of IDL type void.
-    
+
 	@return type of IDL type void
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW( () );
 
 /** Gets the meta type of IDL type boolean.
-    
+
 	@return type of IDL type boolean
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW( () );
 /** Gets the meta type of IDL type boolean.
-    
+
 	@return type of IDL type boolean
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW( () );
 /** Gets the meta type of IDL type boolean.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type boolean
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () );
 /** Gets the meta type of IDL type boolean.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type boolean
 */
@@ -263,153 +263,153 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType(
     bool const * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type char.
-    
+
 	@return type of IDL type char
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW( () );
 /** Gets the meta type of IDL type char.
-    
+
 	@return type of IDL type char
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( () );
 
 /** Gets the meta type of IDL type byte.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type byte
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type string.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type string
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type short.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type short
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type unsigned short.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type unsigned short
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type long.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type long
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type unsigned long.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type unsigned long
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type hyper.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type hyper
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type unsigned hyper.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type unsigned hyper
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type float.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type float
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type double.
-    
+
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-    
+
 	@param dummy typed pointer for function signature
 	@return type of IDL type double
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () );
 
 /** Array template function to get meta type for one-dimensional arrays.
-    
+
     @param pT array pointer
 	@return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for two-dimensional arrays.
-    
+
     @param pT array pointer
     @return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for three-dimensional arrays.
-    
+
     @param pT array pointer
     @return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for four-dimensional arrays.
-    
+
     @param pT array pointer
     @return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for five-dimensional arrays.
-    
+
     @param pT array pointer
     @return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for six-dimensional arrays.
-    
+
     @param pT array pointer
 	@return type of array
 */
diff --git a/main/cppu/inc/com/sun/star/uno/genfunc.h b/main/cppu/inc/com/sun/star/uno/genfunc.h
index b7d8c0ec7b..e98f3b1744 100644
--- a/main/cppu/inc/com/sun/star/uno/genfunc.h
+++ b/main/cppu/inc/com/sun/star/uno/genfunc.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -28,28 +28,28 @@
 typedef struct _typelib_TypeDescriptionReference typelib_TypeDescriptionReference;
 
 namespace com
-{     
+{
 namespace sun
-{     
+{
 namespace star
-{     
+{
 namespace uno
-{     
+{
 
 /** Function to acquire a C++ interface.
-    
+
 	@param pCppI C++ interface pointer
 */
 inline void SAL_CALL cpp_acquire( void * pCppI )
 	SAL_THROW( () );
 /** Function to release a C++ interface.
-    
+
 	@param pCppI C++ interface pointer
 */
 inline void SAL_CALL cpp_release( void * pCppI )
 	SAL_THROW( () );
 /** Function to query for a C++ interface.
-    
+
 	@param pCppI C++ interface pointer
 	@param pType demanded interface type
 	@return acquired C++ interface pointer or null
diff --git a/main/cppu/inc/typelib/typeclass.h b/main/cppu/inc/typelib/typeclass.h
index b3bb092185..008182dd09 100644
--- a/main/cppu/inc/typelib/typeclass.h
+++ b/main/cppu/inc/typelib/typeclass.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/cppu/inc/typelib/typedescription.h b/main/cppu/inc/typelib/typedescription.h
index dfaf49bc90..4b0800ae9b 100644
--- a/main/cppu/inc/typelib/typedescription.h
+++ b/main/cppu/inc/typelib/typedescription.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -57,7 +57,7 @@ typedef struct _typelib_TypeDescriptionReference
 	*/
 	typelib_TypeClass					eTypeClass;
 	/** fully qualified name of type
-	*/ 
+	*/
 	rtl_uString *						pTypeName;
 	/** pointer to full typedescription; this value is only valid if the type is never swapped out
 	*/
@@ -72,7 +72,7 @@ typedef struct _typelib_TypeDescriptionReference
 
 /** Full type description of a type. Memory layout of this struct is identical to the
     typelib_TypeDescriptionReference for the first six members.
-    So a typedescription can be used as type reference. 
+    So a typedescription can be used as type reference.
 */
 typedef struct _typelib_TypeDescription
 {
@@ -86,9 +86,9 @@ typedef struct _typelib_TypeDescription
 	sal_Int32							nStaticRefCount;
 	/** type class of type
 	*/
-	typelib_TypeClass					eTypeClass;	
+	typelib_TypeClass					eTypeClass;
 	/** fully qualified name of type
-	*/ 
+	*/
 	rtl_uString *						pTypeName;
 	/** pointer to self to distinguish reference from description; for internal use only
 	*/
@@ -99,7 +99,7 @@ typedef struct _typelib_TypeDescription
 	/** reserved for future use; 0 if not used
 	*/
 	void *								pReserved;
-	
+
 	/** flag to determine whether the description is complete:
         compound and union types lack of member names, enums lack of member types and names,
 		interfaces lack of members and table init.
@@ -127,11 +127,11 @@ typedef struct _typelib_CompoundTypeDescription
 	/** inherits all members of typelib_TypeDescription
 	*/
 	typelib_TypeDescription				aBase;
-	
+
 	/** pointer to base type description, else 0
 	*/
 	struct _typelib_CompoundTypeDescription * pBaseTypeDescription;
-	
+
 	/** number of members
 	*/
 	sal_Int32							nMembers;
@@ -178,11 +178,11 @@ typedef struct _typelib_UnionTypeDescription
 	/** inherits all members of typelib_TypeDescription
 	*/
 	typelib_TypeDescription				aBase;
-	
+
 	/** type of the discriminant
 	*/
 	typelib_TypeDescriptionReference *	pDiscriminantTypeRef;
-	
+
 	/** union default descriminant
 	*/
 	sal_Int64							nDefaultDiscriminant;
@@ -213,7 +213,7 @@ typedef struct _typelib_IndirectTypeDescription
 	/** inherits all members of typelib_TypeDescription
 	*/
 	typelib_TypeDescription				aBase;
-	
+
 	/** array, sequence: pointer to element type
 	*/
 	typelib_TypeDescriptionReference *	pType;
@@ -226,7 +226,7 @@ typedef struct _typelib_ArrayTypeDescription
 	/** inherits all members of typelib_IndirectTypeDescription
 	*/
 	typelib_IndirectTypeDescription		aBase;
-	
+
 	/** number of dimensions
 	*/
 	sal_Int32							nDimensions;
@@ -245,7 +245,7 @@ typedef struct _typelib_EnumTypeDescription
 	/** inherits all members of typelib_TypeDescription
 	*/
 	typelib_TypeDescription				aBase;
-	
+
 	/** first value of the enum
 	*/
 	sal_Int32							nDefaultEnumValue;
@@ -288,7 +288,7 @@ typedef struct _typelib_InterfaceMemberTypeDescription
 	/** inherits all members of typelib_TypeDescription
 	*/
 	typelib_TypeDescription				aBase;
-	
+
 	/** position of member in the interface including the number of members of
         any base interfaces
 	*/
@@ -306,7 +306,7 @@ typedef struct _typelib_InterfaceMethodTypeDescription
 	/** inherits all members of typelib_InterfaceMemberTypeDescription
 	*/
 	typelib_InterfaceMemberTypeDescription		aBase;
-	
+
 	/** type of the return value
 	*/
 	typelib_TypeDescriptionReference *			pReturnTypeRef;
@@ -355,10 +355,10 @@ typedef struct _typelib_InterfaceAttributeTypeDescription
 	/** inherits all members of typelib_InterfaceMemberTypeDescription
 	*/
 	typelib_InterfaceMemberTypeDescription		aBase;
-	
+
 	/** determines whether attribute is read only
 	*/
-	sal_Bool									bReadOnly;	   
+	sal_Bool									bReadOnly;
 	/** type of the attribute
 	*/
 	typelib_TypeDescriptionReference *			pAttributeTypeRef;
@@ -438,7 +438,7 @@ typedef struct _typelib_InterfaceTypeDescription
 	/** inherits all members of typelib_TypeDescription
 	*/
 	typelib_TypeDescription						aBase;
-	
+
 	/** pointer to base type description, else 0
 
         @deprecated
@@ -562,7 +562,7 @@ typedef struct _typelib_Union_Init
 
 /** Creates a union type description. All discriminants are handled as int64 values.
 	The pDiscriminantTypeRef must be of type byte, short, ..., up to hyper.
-    
+
 	@param ppRet inout union type description
 	@param pTypeName name of union type
 	@param pDiscriminantTypeRef discriminant type
@@ -582,7 +582,7 @@ void SAL_CALL typelib_typedescription_newUnion(
 	SAL_THROW_EXTERN_C();
 
 /** Creates an enum type description.
-    
+
 	@param ppRet inout enum type description
 	@param pTypeName name of enum
 	@param nDefaultEnumValue default enum value
@@ -600,7 +600,7 @@ void SAL_CALL typelib_typedescription_newEnum(
 	SAL_THROW_EXTERN_C();
 
 /** Creates an array type description.
-    
+
 	@param ppRet inout enum type description
 	@param pElementTypeRef element type
 	@param nDimensions number of dimensions
@@ -638,7 +638,7 @@ void SAL_CALL typelib_typedescription_new(
 	SAL_THROW_EXTERN_C();
 
 /** Creates a new struct type description.
-    
+
 	@param ppRet inout type description
 	@param pTypeName name of type
 	@param pType base type;
@@ -656,7 +656,7 @@ void SAL_CALL typelib_typedescription_newStruct(
 	SAL_THROW_EXTERN_C();
 
 /** Creates an interface type description.
-    
+
 	@param ppRet inout interface type description
 	@param pTypeName the fully qualified name of the interface.
 	@param nUik1 uik part
@@ -681,7 +681,7 @@ void SAL_CALL typelib_typedescription_newInterface(
 	SAL_THROW_EXTERN_C();
 
 /** Creates a multiple-inheritance interface type description.
-    
+
 	@param ppRet inout interface type description
 	@param pTypeName the fully qualified name of the interface.
 	@param nUik1 uik part
@@ -707,7 +707,7 @@ void SAL_CALL typelib_typedescription_newMIInterface(
 	SAL_THROW_EXTERN_C();
 
 /** Creates an interface method type description.
-    
+
 	@param ppRet inout method type description
 	@param nAbsolutePosition position of member including all members of base interfaces
 	@param bOneWay determines whether method is declared oneway
@@ -733,7 +733,7 @@ void SAL_CALL typelib_typedescription_newInterfaceMethod(
 	SAL_THROW_EXTERN_C();
 
 /** Creates an interface attribute type description.
-    
+
 	@param ppRet inout attribute type description
 	@param nAbsolutePosition position of this attribute including all members of base interfaces
 	@param pAttributeName fully qualified name of attribute including interface
@@ -755,7 +755,7 @@ void SAL_CALL typelib_typedescription_newInterfaceAttribute(
 	SAL_THROW_EXTERN_C();
 
 /** Creates an extended interface attribute type description.
-    
+
 	@param ppRet inout attribute type description
 	@param nAbsolutePosition position of this attribute including all members of
     base interfaces
@@ -783,7 +783,7 @@ void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
     SAL_THROW_EXTERN_C();
 
 /** Increments reference count of given type description.
-    
+
 	@param pDesc type description
 */
 void SAL_CALL typelib_typedescription_acquire(
@@ -792,7 +792,7 @@ void SAL_CALL typelib_typedescription_acquire(
 
 /** Decrements reference count of given type. If reference count reaches 0, the trype description
     is deleted.
-    
+
 	@param pDesc type description
 */
 void SAL_CALL typelib_typedescription_release(
@@ -801,7 +801,7 @@ void SAL_CALL typelib_typedescription_release(
 
 /** Registers a type description and creates a type description reference. Type descriptions
     will be registered automatically if they are provided via the callback chain.
-    
+
 	@param ppNewDescription	inout description to be registered;
 */
 void SAL_CALL typelib_typedescription_register(
@@ -809,7 +809,7 @@ void SAL_CALL typelib_typedescription_register(
 	SAL_THROW_EXTERN_C();
 
 /** Tests whether two types descriptions are equal, i.e. type class and names are equal.
-    
+
 	@param p1 a type description
 	@param p2 another type description
 	@return true, if type descriptions are equal
@@ -819,7 +819,7 @@ sal_Bool SAL_CALL typelib_typedescription_equals(
 	SAL_THROW_EXTERN_C();
 
 /** Retrieves a type description via its fully qualified name.
-    
+
 	@param ppRet inout type description; *ppRet is 0, if type description was not found
 	@param pName name demanded type description
 */
@@ -828,7 +828,7 @@ void SAL_CALL typelib_typedescription_getByName(
 	SAL_THROW_EXTERN_C();
 
 /** Sets size of type description cache.
-    
+
 	@param nNewSize new size of cache
 */
 void SAL_CALL typelib_setCacheSize(
@@ -837,8 +837,8 @@ void SAL_CALL typelib_setCacheSize(
 
 /** Function pointer declaration of callback function get additional descriptions. Callbacks
     must provide complete type descriptions (see typelib_typedescription_complete())!
-    
-	@param pContext callback context 
+
+	@param pContext callback context
 	@param ppRet inout type description
 	@param pTypeName  name of demanded type description
 */
@@ -846,8 +846,8 @@ typedef void (SAL_CALL * typelib_typedescription_Callback)(
 	void * pContext, typelib_TypeDescription ** ppRet, rtl_uString * pTypeName );
 
 /** Registers callback function providing additional type descriptions.
-    
-	@param pContext callback context 
+
+	@param pContext callback context
 	@param pCallback callback function
 */
 void SAL_CALL typelib_typedescription_registerCallback(
@@ -855,8 +855,8 @@ void SAL_CALL typelib_typedescription_registerCallback(
 	SAL_THROW_EXTERN_C();
 
 /** Revokes a previously registered callback function.
-    
-	@param pContext callback context 
+
+	@param pContext callback context
 	@param pCallback registered callback function
 */
 void SAL_CALL typelib_typedescription_revokeCallback(
@@ -870,12 +870,12 @@ void SAL_CALL typelib_typedescription_revokeCallback(
 
 /** Creates a type description reference. This is a weak reference not holding the description.
 	If the description is already registered, the previous one is returned.
-    
+
 	@param ppTDR inout type description reference
 	@param eTypeClass type class of type
 	@param pTypeName name of type
 */
-void SAL_CALL typelib_typedescriptionreference_new( 
+void SAL_CALL typelib_typedescriptionreference_new(
 	typelib_TypeDescriptionReference ** ppTDR,
 	typelib_TypeClass eTypeClass,
 	rtl_uString * pTypeName )
@@ -883,7 +883,7 @@ void SAL_CALL typelib_typedescriptionreference_new(
 
 /** Creates a type description reference. This is a weak reference not holding the description.
 	If the description is already registered, the previous one is returned.
-    
+
 	@param ppTDR inout type description reference
 	@param eTypeClass type class of type
 	@param pTypeName ascii name of type
@@ -895,7 +895,7 @@ void SAL_CALL typelib_typedescriptionreference_newByAsciiName(
 	SAL_THROW_EXTERN_C();
 
 /** Increments reference count of type description reference.
-    
+
 	@param pRef type description reference
 */
 void SAL_CALL typelib_typedescriptionreference_acquire(
@@ -904,7 +904,7 @@ void SAL_CALL typelib_typedescriptionreference_acquire(
 
 /** Increments reference count of type description reference. If the reference count reaches 0,
     then the reference is deleted.
-    
+
 	@param pRef type description reference
 */
 void SAL_CALL typelib_typedescriptionreference_release(
@@ -913,7 +913,7 @@ void SAL_CALL typelib_typedescriptionreference_release(
 
 /** Retrieves the type description for a given reference. If it is not possible to resolve the
     reference, null is returned.
-    
+
 	@param ppRet inout type description
 */
 void SAL_CALL typelib_typedescriptionreference_getDescription(
@@ -921,7 +921,7 @@ void SAL_CALL typelib_typedescriptionreference_getDescription(
 	SAL_THROW_EXTERN_C();
 
 /** Tests whether two types description references are equal, i.e. type class and names are equal.
-    
+
 	@param p1 a type description reference
 	@param p2 another type description reference
 	@return true, if type description references are equal
@@ -931,7 +931,7 @@ sal_Bool SAL_CALL typelib_typedescriptionreference_equals(
 	SAL_THROW_EXTERN_C();
 
 /** Assigns a type.
-    
+
 	@param ppDest destination type
 	@param pSource source type
 */
@@ -942,7 +942,7 @@ void SAL_CALL typelib_typedescriptionreference_assign(
 
 /** Tests if values of type pAssignable can be assigned by values of type pFrom. This includes
     widening conversion (e.g., long assignable from short), as long as there is no data loss.
-    
+
 	@param pAssignable type description of value to be assigned
 	@param pFrom type description of value
 */
@@ -953,7 +953,7 @@ sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom(
 
 /** Tests if values of type pAssignable can be assigned by values of type pFrom. This includes
     widening conversion (e.g., long assignable from short), as long as there is no data loss.
-    
+
 	@param pAssignable type of value to be assigned
 	@param pFrom type of value
 */
@@ -965,9 +965,9 @@ sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom(
 /** Gets static type reference of standard types by type class.
 	ADDITIONAL OPT: provides Type com.sun.star.uno.Exception for typelib_TypeClass_EXCEPTION
                     and com.sun.star.uno.XInterface for typelib_TypeClass_INTERFACE.
-    
+
 	Thread synchronizes on typelib mutex.
-    
+
 	@param eTypeClass type class of basic type
 	@return pointer to type reference pointer
 */
@@ -976,7 +976,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
 	SAL_THROW_EXTERN_C();
 
 /** Inits static type reference. Thread synchronizes on typelib init mutex.
-    
+
 	@param ppRef pointer to type reference pointer
 	@param eTypeClass type class of type
 	@param pTypeName ascii name of type
@@ -987,7 +987,7 @@ void SAL_CALL typelib_static_type_init(
 	SAL_THROW_EXTERN_C();
 
 /** Inits static sequence type reference. Thread synchronizes on typelib init mutex.
-    
+
 	@param ppRef pointer to type reference pointer
 	@param pElementType element type of sequence
 */
@@ -997,7 +997,7 @@ void SAL_CALL typelib_static_sequence_type_init(
 	SAL_THROW_EXTERN_C ();
 
 /** Inits static array type reference. Thread synchronizes on typelib init mutex.
-    
+
 	@param ppRef pointer to type reference pointer
 	@param pElementType element type of sequence
 	@param nDimensions number of dimensions
@@ -1052,7 +1052,7 @@ void SAL_CALL typelib_static_struct_type_init(
 	SAL_THROW_EXTERN_C();
 
 /** Inits incomplete static interface type reference. Thread synchronizes on typelib init mutex.
-    
+
 	@param ppRef pointer to type reference pointer
 	@param pTypeName name of interface
 	@param pBaseType base type
@@ -1081,7 +1081,7 @@ void SAL_CALL typelib_static_mi_interface_type_init(
     SAL_THROW_EXTERN_C();
 
 /** Inits incomplete static enum type reference. Thread synchronizes on typelib init mutex.
-    
+
 	@param ppRef pointer to type reference pointer
 	@param pTypeName name of enum
 	@param nDefaultEnumValue default enum value
@@ -1096,7 +1096,7 @@ void SAL_CALL typelib_static_enum_type_init(
     INTERFACE and ENUM type descriptions may be partly initialized (see typelib_static_...(),
     typelib_TypeDescription::bComplete). For interface type descriptions, this will also
     init index tables.
-    
+
 	@param ppTypeDescr [inout] type description to be completed (may be exchanged!)
 	@return true, if type description is complete
 */
diff --git a/main/cppu/inc/typelib/uik.h b/main/cppu/inc/typelib/uik.h
index e522c0858a..fc5f8ee170 100644
--- a/main/cppu/inc/typelib/uik.h
+++ b/main/cppu/inc/typelib/uik.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/cppu/inc/uno/any2.h b/main/cppu/inc/uno/any2.h
index 2e5ea576dd..0da8e65b95 100644
--- a/main/cppu/inc/uno/any2.h
+++ b/main/cppu/inc/uno/any2.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -64,7 +64,7 @@ typedef struct _uno_Any
 
 /** Assign an any with a given value. Interfaces are acquired or released by the given callback
     functions.
-    
+
 	@param pDest			pointer memory of destination any
 	@param pSource			pointer to source value; defaults (0) to default constructed value
 	@param pTypeDescr		type description of value; defaults (0) to void
@@ -80,7 +80,7 @@ void SAL_CALL uno_any_assign(
 	SAL_THROW_EXTERN_C();
 /** Assign an any with a given value. Interfaces are acquired or released by the given callback
     functions.
-    
+
 	@param pDest			pointer memory of destination any
 	@param pSource			pointer to source value; defaults (0) to default constructed value
 	@param pTypeDescr		type description of value; defaults (0) to void
@@ -96,7 +96,7 @@ void SAL_CALL uno_type_any_assign(
 	SAL_THROW_EXTERN_C();
 
 /** Constructs an any with a given value. Interfaces are acquired by the given callback function.
-    
+
 	@param pDest			pointer memory of destination any
 	@param pSource			pointer to source value; defaults (0) to default constructed value
 	@param pTypeDescr		type description of value; defaults (0) to void
@@ -109,7 +109,7 @@ void SAL_CALL uno_any_construct(
 	uno_AcquireFunc acquire )
 	SAL_THROW_EXTERN_C();
 /** Constructs an any with a given value. Interfaces are acquired by the given callback function.
-	
+
 	@param pDest			pointer memory of destination any
 	@param pSource			pointer to source value; defaults (0) to default constructed value
 	@param pType			type of value; defaults (0) to void
@@ -123,7 +123,7 @@ void SAL_CALL uno_type_any_construct(
 	SAL_THROW_EXTERN_C();
 
 /** Constructs an any with a given value and converts/ maps interfaces.
-    
+
 	@param pDest			pointer memory of destination any
 	@param pSource			pointer to source value; defaults (0) to default constructed value
 	@param pTypeDescr		type description of value; defaults (0) to void
@@ -135,7 +135,7 @@ void SAL_CALL uno_any_constructAndConvert(
 	struct _uno_Mapping * mapping )
 	SAL_THROW_EXTERN_C();
 /** Constructs an any with a given value and converts/ maps interfaces.
-    
+
 	@param pDest			pointer memory of destination any
 	@param pSource			pointer to source value; defaults (0) to default constructed value
 	@param pType			type of value; defaults (0) to void
@@ -148,7 +148,7 @@ void SAL_CALL uno_type_any_constructAndConvert(
 	SAL_THROW_EXTERN_C();
 
 /** Destructs an any.
-    
+
 	@param pValue			pointer to any
 	@param release			function called each time an interface needs to be released;
                             defaults (0) to uno
@@ -158,7 +158,7 @@ void SAL_CALL uno_any_destruct(
 	SAL_THROW_EXTERN_C();
 
 /** Sets value to void.
-    
+
 	@param pValue			pointer to any
 	@param release			function called each time an interface needs to be released;
                             defaults (0) to uno
diff --git a/main/cppu/inc/uno/cuno.h b/main/cppu/inc/uno/cuno.h
index 06bebffc3b..323c3fd502 100644
--- a/main/cppu/inc/uno/cuno.h
+++ b/main/cppu/inc/uno/cuno.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/cppu/inc/uno/current_context.h b/main/cppu/inc/uno/current_context.h
index 95a268c127..f00d13e538 100644
--- a/main/cppu/inc/uno/current_context.h
+++ b/main/cppu/inc/uno/current_context.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -34,7 +34,7 @@ extern "C"
 	@attention
     Don't spread the returned interface around to other threads.  Every thread has its own
     current context.
-    
+
 	@param ppCurrentContext  inout param current context of type com.sun.star.uno.XCurrentContext
 	@param pEnvDcp           descriptor of returned interface's environment
 	@param pEnvContext       context of returned interface's environment (commonly 0)
@@ -46,7 +46,7 @@ sal_Bool SAL_CALL uno_getCurrentContext(
 	SAL_THROW_EXTERN_C();
 
 /** Sets the current task's context.
-	
+
 	@param pCurrentContext  in param current context of type com.sun.star.uno.XCurrentContext
 	@param pEnvDcp          descriptor of interface's environment
 	@param pEnvContext      context of interface's environment (commonly 0)
diff --git a/main/cppu/inc/uno/data.h b/main/cppu/inc/uno/data.h
index 245c8fd33e..2892427be5 100644
--- a/main/cppu/inc/uno/data.h
+++ b/main/cppu/inc/uno/data.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -36,7 +36,7 @@ struct _typelib_InterfaceTypeDescription;
 struct _uno_Mapping;
 
 /** Generic function pointer declaration to query for an interface.
-    
+
 	@param pInterface interface
 	@param pTypedemanded interface type
 	@return interface pointer
@@ -44,20 +44,20 @@ struct _uno_Mapping;
 typedef void * (SAL_CALL * uno_QueryInterfaceFunc)(
 	void * pInterface, struct _typelib_TypeDescriptionReference * pType );
 /** Generic function pointer declaration to acquire an interface.
-    
+
 	@param pInterface interface to be acquired
 */
 typedef void (SAL_CALL * uno_AcquireFunc)(
 	void * pInterface );
 /** Generic function pointer declaration to release an interface.
-    
+
 	@param pInterface interface to be release
 */
 typedef void (SAL_CALL * uno_ReleaseFunc)(
 	void * pInterface );
 
 /** Tests if two values are equal. May compare different types (e.g., short to long).
-    
+
 	@param pVal1			pointer to a value
 	@param pVal1TypeDescr	type description of pVal1
 	@param pVal2			pointer to another value
@@ -73,7 +73,7 @@ sal_Bool SAL_CALL uno_equalData(
 	uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
 	SAL_THROW_EXTERN_C();
 /** Tests if two values are equal. May compare different types (e.g., short to long).
-    
+
 	@param pVal1			pointer to a value
 	@param pVal1Type		type of pVal1
 	@param pVal2			pointer to another value
@@ -91,7 +91,7 @@ sal_Bool SAL_CALL uno_type_equalData(
 
 /** Copy construct memory with given value. The size of the destination value must be larger
     or equal to the size of the source value.
-    
+
 	@param pDest			pointer to destination value memory
 	@param pSource			pointer to source value
 	@param pTypeDescr		type description of source
@@ -104,7 +104,7 @@ void SAL_CALL uno_copyData(
 	SAL_THROW_EXTERN_C();
 /** Copy construct memory with given value. The size of the destination value must be larger
     or equal to the size of the source value.
-    
+
 	@param pDest			pointer to destination value memory
 	@param pSource			pointer to source value
 	@param pType			type of source
@@ -118,7 +118,7 @@ void SAL_CALL uno_type_copyData(
 
 /** Copy construct memory with given value. The size of the destination value must be larger
     or equal to the size of the source value. Interfaces are converted/ mapped by mapping parameter.
-    
+
 	@param pDest			pointer to destination value memory
 	@param pSource			pointer to source value
 	@param pTypeDescr		type description of source
@@ -130,7 +130,7 @@ void SAL_CALL uno_copyAndConvertData(
 	SAL_THROW_EXTERN_C();
 /** Copy construct memory with given value. The size of the destination value must be larger
     or equal to the size of the source value. Interfaces are converted/ mapped by mapping parameter.
-    
+
 	@param pDest			pointer to destination value memory
 	@param pSource			pointer to source value
 	@param pType			type of source
@@ -142,7 +142,7 @@ void SAL_CALL uno_type_copyAndConvertData(
 	SAL_THROW_EXTERN_C();
 
 /** Destructs a given value; does NOT free its memory!
-    
+
 	@param pValue			value to be destructed
 	@param pTypeDescr		type description of value
 	@param release			function called each time an interface pointer needs to be released;
@@ -152,7 +152,7 @@ void SAL_CALL uno_destructData(
 	void * pValue, struct _typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release )
 	SAL_THROW_EXTERN_C();
 /** Destructs a given value; does NOT free its memory!
-    
+
 	@param pValue			value to be destructed
 	@param pType			type of value
 	@param release			function called each time an interface pointer needs to be released;
@@ -163,7 +163,7 @@ void SAL_CALL uno_type_destructData(
 	SAL_THROW_EXTERN_C();
 
 /** Default constructs a value. All simple types are set to 0, enums are set to their default value.
-    
+
 	@param pMem				pointer to memory of value to be constructed
 	@param pTypeDescr		type description of value to be constructed
 */
@@ -171,7 +171,7 @@ void SAL_CALL uno_constructData(
 	void * pMem, struct _typelib_TypeDescription * pTypeDescr )
 	SAL_THROW_EXTERN_C();
 /** Default constructs a value. All simple types are set to 0, enums are set to their default value.
-    
+
 	@param pMem				pointer to memory of value to be constructed
 	@param pType			type of value to be constructed
 */
@@ -183,7 +183,7 @@ void SAL_CALL uno_type_constructData(
     Widening conversion WITHOUT data loss is allowed (e.g., assigning a long with a short).
     Querying for demanded interface type is allowed.
     Assignment from any value to a value of type Any and vice versa is allowed.
-    
+
 	@param pDest			pointer to destination value
 	@param pDestTypeDescr	type description of destination value
 	@param pSource			pointer to source value; if 0, then destination value will be assigned
@@ -206,7 +206,7 @@ sal_Bool SAL_CALL uno_assignData(
     Widening conversion WITHOUT data loss is allowed (e.g., assigning a long with a short).
     Querying for demanded interface type is allowed.
     Assignment from any value to a value of type Any and vice versa is allowed.
-    
+
 	@param pDest			pointer to destination value
 	@param pDestType		type of destination value
 	@param pSource			pointer to source value; if 0, then destination value will be assigned
@@ -230,7 +230,7 @@ sal_Bool SAL_CALL uno_type_assignData(
     Widening conversion WITHOUT data loss is allowed (e.g., assigning a long with a short).
     Querying for demanded interface type is allowed.
     Assignment from any value to a value of type Any and vice versa is allowed.
-    
+
 	@param pAssignable      type
 	@param pFrom			pointer to value
 	@param pFromType		type of value
diff --git a/main/cppu/inc/uno/dispatcher.h b/main/cppu/inc/uno/dispatcher.h
index 0991bc0971..5c0cdc449d 100644
--- a/main/cppu/inc/uno/dispatcher.h
+++ b/main/cppu/inc/uno/dispatcher.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -40,7 +40,7 @@ struct _uno_Interface;
 	If an exception is signalled, the any *ppException is properly constructed by the callee,
     otherwise the pointer *ppException is set to 0.
 	An attribute get call is indicated by a non-null return pointer.
-    
+
 	@param pUnoI		uno interface the call is performed on
 	@param pMemberType	member type description of a method or attribute
 	@param pReturn	    pointer to return value memory;
@@ -51,7 +51,7 @@ struct _uno_Interface;
 	@param ppException	pointer to pointer to unconstructed any to signal an exception.
 */
 typedef void (SAL_CALL * uno_DispatchMethod)(
-	struct _uno_Interface * pUnoI, 
+	struct _uno_Interface * pUnoI,
 	const struct _typelib_TypeDescription * pMemberType,
 	void * pReturn,
 	void * pArgs[],
@@ -68,12 +68,12 @@ typedef void (SAL_CALL * uno_DispatchMethod)(
 typedef struct _uno_Interface
 {
 	/** Acquires uno interface.
-        
+
 		@param pInterface uno interface
 	*/
 	void (SAL_CALL * acquire)( struct _uno_Interface * pInterface );
 	/** Releases uno interface.
-        
+
 		@param pInterface uno interface
 	*/
 	void (SAL_CALL * release)( struct _uno_Interface * pInterface );
diff --git a/main/cppu/inc/uno/environment.h b/main/cppu/inc/uno/environment.h
index 660bfeafad..bee870c209 100644
--- a/main/cppu/inc/uno/environment.h
+++ b/main/cppu/inc/uno/environment.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -49,68 +49,68 @@ typedef struct _uno_Environment
 	/** reserved for future use (0 if not used)
 	*/
 	void *				pReserved;
-	
+
 	/** type name of environment
 	*/
 	rtl_uString *		pTypeName;
-	
+
 	/** free context pointer to be used for specific classes of environments (e.g., a jvm pointer)
 	*/
 	void *				pContext;
-	
+
 	/** pointer to extended environment (interface registration functionality), if supported
 	*/
 	struct _uno_ExtEnvironment * pExtEnv;
-	
+
 	/** Acquires this environment.
-        
+
 		@param pEnv this environment
 	*/
 	void (SAL_CALL * acquire)( struct _uno_Environment * pEnv );
-	
+
 	/** Releases this environment; last release of environment will revoke the environment from
         runtime.
-        
+
 		@param pEnv this environment
 	*/
 	void (SAL_CALL * release)( struct _uno_Environment * pEnv );
-	
+
 	/** Acquires this environment weakly.  You can only harden a weakly held environment if it
         is still acquired hard (acquire()).
-        
+
 		@param pEnv this environment
 	*/
 	void (SAL_CALL * acquireWeak)( struct _uno_Environment * pEnv );
-	
+
 	/** Releases this environment weakly in correspondence to acquireWeak().
-        
+
 		@param pEnv this environment
 	*/
 	void (SAL_CALL * releaseWeak)( struct _uno_Environment * pEnv );
-	
+
 	/** Makes hard reference out of weak referenced environment. You can only harden a weakly
         held environment if it is still acquired hard (acquire()).
-        
+
 		@param ppHardEnv inout hard referenced environment (has to be released via release())
 		@param pEnv environment (may be weak referenced)
 	*/
 	void (SAL_CALL * harden)(
 		struct _uno_Environment ** ppHardEnv,
 		struct _uno_Environment * pEnv );
-	
+
 	/** Call this function to EXPLICITLY dispose this environment (e.g., release all
         interfaces). You may want to call this function before shutting down due to a runtime error.
-        
+
 		@param pEnv this environment
 	*/
 	void (SAL_CALL * dispose)( struct _uno_Environment * pEnv );
-	
+
 	/* ===== the following part will be late initialized by a matching bridge ===== *
 	 * ===== and is NOT for public use.										  ===== */
-	
+
 	/** CALLBACK function pointer: Disposing callback function pointer that can be set to get
                                    signalled before the environment is destroyed.
-                                   
+
 		@param pEnv environment that is being disposed
 	*/
 	void (SAL_CALL * environmentDisposing)( struct _uno_Environment * pEnv );
@@ -121,14 +121,14 @@ typedef struct _uno_Environment
 	Any proxy object must register itself on first acquire() call and revoke itself on last
     release() call. This can happen several times because the environment caches proxy objects
 	until the environment explicitly frees the proxy object calling this function.
-    
+
 	@param pEnv environment
 	@param pProxy proxy pointer
 */
 typedef void (SAL_CALL * uno_freeProxyFunc)( struct _uno_ExtEnvironment * pEnv, void * pProxy );
 
 /** Generic function pointer declaration to allocate memory. Used with getRegisteredInterfaces().
-    
+
 	@param nBytes amount of memory in bytes
 	@return pointer to allocated memory
 */
@@ -141,9 +141,9 @@ typedef struct _uno_ExtEnvironment
 	/** inherits all members of an uno_Environment
 	*/
 	uno_Environment aBase;
-	
+
 	/** Registers an interface of this environment.
-        
+
 		@param pEnv			this environment
 		@param ppInterface	inout parameter of interface to be registered
 		@param pOId			object id of interface
@@ -154,10 +154,10 @@ typedef struct _uno_ExtEnvironment
 		void ** ppInterface,
 		rtl_uString * pOId,
 		struct _typelib_InterfaceTypeDescription * pTypeDescr );
-	
+
 	/** Registers a proxy interface of this environment that can be reanimated and is freed
         explicitly by this environment.
-        
+
 		@param pEnv			this environment
 		@param ppInterface	inout parameter of interface to be registered
 		@param freeProxy	function to free proxy object
@@ -170,19 +170,19 @@ typedef struct _uno_ExtEnvironment
 		uno_freeProxyFunc freeProxy,
 		rtl_uString * pOId,
 		struct _typelib_InterfaceTypeDescription * pTypeDescr );
-	
+
 	/** Revokes an interface from this environment. You have to revoke any interface that has
         been registered via this method.
-        
+
 		@param pEnv			this environment
 		@param pInterface	interface to be revoked
 	*/
 	void (SAL_CALL * revokeInterface)(
 		struct _uno_ExtEnvironment * pEnv,
 		void * pInterface );
-	
+
 	/** Provides the object id of a given interface.
-        
+
 		@param ppOut		inout oid
 		@param pInterface	interface of object
 	*/
@@ -190,10 +190,10 @@ typedef struct _uno_ExtEnvironment
 		struct _uno_ExtEnvironment * pEnv,
 		rtl_uString ** ppOId,
 		void * pInterface );
-	
+
 	/** Retrieves an interface identified by its object id and type from this environment.
 		Interfaces are retrieved in the same order as they are registered.
-        
+
 		@param pEnv			this environment
 		@param ppInterface	inout parameter for the registered interface; (0) if none was found
 		@param pOId			object id of interface to be retrieved
@@ -204,10 +204,10 @@ typedef struct _uno_ExtEnvironment
 		void ** ppInterface,
 		rtl_uString * pOId,
 		struct _typelib_InterfaceTypeDescription * pTypeDescr );
-	
+
 	/** Returns all currently registered interfaces of this environment. The memory block
         allocated might be slightly larger than (*pnLen * sizeof(void *)).
-        
+
 		@param pEnv			this environment
 		@param pppInterfaces out param; pointer to array of interface pointers
 		@param pnLen		out param; length of array
@@ -222,7 +222,7 @@ typedef struct _uno_ExtEnvironment
 	/* ===== the following part will be late initialized by a matching bridge ===== */
 
 	/** Computes an object id of the given interface; is called by the environment implementation.
-        
+
 		@param pEnv			corresponding environment
 		@param ppOId		out param: computed id
 		@param pInterface	an interface
@@ -230,25 +230,25 @@ typedef struct _uno_ExtEnvironment
 	void (SAL_CALL * computeObjectIdentifier)(
 		struct _uno_ExtEnvironment * pEnv,
 		rtl_uString ** ppOId, void * pInterface );
-	
+
 	/** Function to acquire an interface.
-        
+
 		@param pEnv			corresponding environment
 		@param pInterface	an interface
 	*/
 	void (SAL_CALL * acquireInterface)(
 		struct _uno_ExtEnvironment * pEnv,
 		void * pInterface );
-	
+
 	/** Function to release an interface.
-        
+
 		@param pEnv			corresponding environment
 		@param pInterface	an interface
 	*/
 	void (SAL_CALL * releaseInterface)(
 		struct _uno_ExtEnvironment * pEnv,
 		void * pInterface );
-	
+
 } uno_ExtEnvironment;
 
 #if defined( SAL_W32) ||  defined(SAL_OS2)
@@ -257,7 +257,7 @@ typedef struct _uno_ExtEnvironment
 
 /** Function exported by some bridge library providing acquireInterface(), releaseInterface();
     may set a disposing callback.
-    
+
 	@param pEnv environment to be initialized
 */
 typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv );
@@ -265,7 +265,7 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv );
 
 /** Gets a specific environment. If the specified environment does not exist, then a default one
     is created and registered. The environment revokes itself on last release() call.
-    
+
 	@param ppEnv		inout parameter of environment; given environment will be released
 	@param pEnvDcp	    descriptor of environment
 	@param pContext		some context pointer (e.g., to distinguish java vm; set 0 if not needed)
@@ -276,7 +276,7 @@ void SAL_CALL uno_getEnvironment(
 
 /** Gets all specified environments. Caller has to release returned environments and free allocated
     memory.
-    
+
 	@param pppEnvs		out param; pointer to array of environments
 	@param pnLen		out param; length of array
 	@param memAlloc		function for allocating memory that is passed back
@@ -288,7 +288,7 @@ void SAL_CALL uno_getRegisteredEnvironments(
 	SAL_THROW_EXTERN_C();
 
 /** Creates an environment. The new environment is anonymous (NOT publicly registered/ accessible).
-    
+
 	@param ppEnv		out parameter of environment; given environment will be released
 	@param pEnvDcp      descriptor of environment
 	@param pContext		context pointer (e.g., to distinguish java vm); set 0 if not needed
@@ -298,7 +298,7 @@ void SAL_CALL uno_createEnvironment(
 	SAL_THROW_EXTERN_C();
 
 /** Dumps out environment information, i.e. registered interfaces.
-    
+
 	@param stream		output stream (FILE *)
 	@param pEnv			environment to be dumped
 	@param pFilter		if not null, filters output
@@ -307,7 +307,7 @@ void SAL_CALL uno_dumpEnvironment(
 	void * stream, uno_Environment * pEnv, const sal_Char * pFilter )
 	SAL_THROW_EXTERN_C();
 /** Dumps out environment information, i.e. registered interfaces.
-    
+
 	@param stream		output stream (FILE *)
 	@param pEnvDcp      descritpro of environment to be dumped
 	@param pFilter		if not null, filters output
@@ -343,7 +343,7 @@ typedef void SAL_CALL uno_EnvCallee(va_list * pParam);
 void SAL_CALL uno_Environment_invoke_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_list * pParam)
 	SAL_THROW_EXTERN_C();
 
-/** Invoke the passed function in the given environment. 
+/** Invoke the passed function in the given environment.
 
     @param pEnv     the target environment
     @param pCallee  the function to call
@@ -353,7 +353,7 @@ void SAL_CALL uno_Environment_invoke_v(uno_Environment * pEnv, uno_EnvCallee * p
 void SAL_CALL uno_Environment_invoke (uno_Environment * pEnv, uno_EnvCallee * pCallee, ...)
 	SAL_THROW_EXTERN_C();
 
-/** Enter an environment explicitly. 
+/** Enter an environment explicitly.
 
 	@param pEnv    the environment to enter; NULL leaves all environments
     @since UDK 3.2.7
diff --git a/main/cppu/inc/uno/lbnames.h b/main/cppu/inc/uno/lbnames.h
index f5a4e35dfb..2125154091 100644
--- a/main/cppu/inc/uno/lbnames.h
+++ b/main/cppu/inc/uno/lbnames.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/cppu/inc/uno/mapping.h b/main/cppu/inc/uno/mapping.h
index 5eea408b7d..3c56cbffa1 100644
--- a/main/cppu/inc/uno/mapping.h
+++ b/main/cppu/inc/uno/mapping.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -47,7 +47,7 @@ typedef void (SAL_CALL * uno_AcquireMappingFunc)(struct _uno_Mapping *);
 typedef void (SAL_CALL * uno_ReleaseMappingFunc)(struct _uno_Mapping *);
 
 /** Function pointer declaration to map an interface from one environment to another.
-    
+
 	@param pMapping			mapping
 	@param ppOut			[inout] destination interface; existing interfaces are released
 	@param pInterface		source interface
@@ -87,7 +87,7 @@ typedef struct _uno_Mapping
 #endif
 
 /** Gets an interface mapping from one environment to another.
-    
+
 	@param ppMapping	[inout] mapping; existing mapping will be released
 	@param pFrom		source environment
 	@param pTo			destination environment
@@ -103,7 +103,7 @@ void SAL_CALL uno_getMapping(
 	SAL_THROW_EXTERN_C();
 
 /** Callback function pointer declaration to get a mapping.
-    
+
 	@param ppMapping	inout mapping
 	@param pFrom		source environment
 	@param pTo			destination environment
@@ -116,7 +116,7 @@ typedef void (SAL_CALL * uno_getMappingFunc)(
 	rtl_uString * pAddPurpose );
 
 /** Registers a callback being called each time a mapping is demanded.
-    
+
 	@param pCallback	callback function
 */
 void SAL_CALL uno_registerMappingCallback(
@@ -124,7 +124,7 @@ void SAL_CALL uno_registerMappingCallback(
 	SAL_THROW_EXTERN_C();
 
 /** Revokes a mapping callback registration.
-    
+
 	@param pCallback	callback function
 */
 void SAL_CALL uno_revokeMappingCallback(
@@ -132,14 +132,14 @@ void SAL_CALL uno_revokeMappingCallback(
 	SAL_THROW_EXTERN_C();
 
 /** Function pointer declaration to free a mapping.
-    
+
 	@param pMapping		mapping to be freed
 */
 typedef void (SAL_CALL * uno_freeMappingFunc)( struct _uno_Mapping * pMapping );
 
 /** Registers a mapping. A mapping registers itself on first acquire and revokes itself on last
     release. The given freeMapping function is called by the runtime to cleanup any resources.
-    
+
 	@param ppMapping	inout mapping to be registered
 	@param freeMapping	called by runtime to delete mapping
 	@param pFrom		source environment
@@ -153,7 +153,7 @@ void SAL_CALL uno_registerMapping(
 
 /** Revokes a mapping. A mapping registers itself on first acquire and revokes itself on last
     release.
-    
+
 	@param pMapping		mapping to be revoked
 */
 void SAL_CALL uno_revokeMapping(
@@ -162,7 +162,7 @@ void SAL_CALL uno_revokeMapping(
 
 /** Gets an interface mapping from one language environment to another by corresponding environment
     type names.
-    
+
 	@param ppMapping	[inout] mapping; existing mapping will be released
 	@param pFrom		source environment type name
 	@param pTo			destination environment type name
@@ -182,7 +182,7 @@ void SAL_CALL uno_getMappingByName(
 
 /** Function pointer declaration to get a mapping from a loaded bridge. Bridges export a function
     called uno_ext_getMapping() of this signature.
-    
+
 	@param ppMapping	[inout] mapping; existing mapping will be released
 	@pFrom				source environment
 	@pTo				destination environment
diff --git a/main/cppu/inc/uno/sequence2.h b/main/cppu/inc/uno/sequence2.h
index 9e4c7a35da..57e6d368d3 100644
--- a/main/cppu/inc/uno/sequence2.h
+++ b/main/cppu/inc/uno/sequence2.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -36,7 +36,7 @@ struct _typelib_TypeDescription;
 typedef sal_Sequence uno_Sequence;
 
 /** Assigns a sequence.
-    
+
 	@param ppDest		destinstaion sequence
 	@param pSource		source sequence
 	@param pTypeDescr	type description of the sequence and NOT of an element
@@ -50,7 +50,7 @@ void SAL_CALL uno_sequence_assign(
 	uno_ReleaseFunc release )
 	SAL_THROW_EXTERN_C();
 /** Assigns a sequence.
-    
+
 	@param ppDest		destinstaion sequence
 	@param pSource		source sequence
 	@param pType		type of the sequence and NOT of an element
@@ -65,7 +65,7 @@ void SAL_CALL uno_type_sequence_assign(
 	SAL_THROW_EXTERN_C();
 
 /** Constructs a new sequence with given elements.
-    
+
 	@param ppSequence		  out parameter sequence;
                               0 if memory allocation has failed
 	@param pTypeDescr		  type description of the sequence and NOT of an
@@ -83,7 +83,7 @@ sal_Bool SAL_CALL uno_sequence_construct(
 	uno_AcquireFunc acquire )
 	SAL_THROW_EXTERN_C();
 /** Constructs a new sequence with given elements.
-    
+
 	@param ppSequence		  out parameter sequence;
                               0 if memory allocation has failed
 	@param pType			  type of the sequence and NOT of an element
@@ -103,7 +103,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct(
 /** Assures that the reference count of the given sequence is one.
     Otherwise a new copy of the sequence is created with a reference count
     of one.
-    
+
 	@param ppSequence		inout sequence
 	@param pTypeDescr		type description of sequence
 	@param acquire			function called each time an interface needs to
@@ -121,7 +121,7 @@ sal_Bool SAL_CALL uno_sequence_reference2One(
 /** Assures that the reference count of the given sequence is one.
     Otherwise a new copy of the sequence is created with a reference count
     of one.
-    
+
 	@param ppSequence		inout sequence
 	@param pType			type of sequence
 	@param acquire			function called each time an interface needs to
@@ -139,7 +139,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One(
 
 /** Reallocates length of a sequence. This truncates a sequence or enlarges
     it default constructing appended elements.
-    
+
 	@param ppSequence		inout sequence
 	@param pTypeDescr		type description of sequence
 	@param nSize			new size of sequence
@@ -158,7 +158,7 @@ sal_Bool SAL_CALL uno_sequence_realloc(
 	SAL_THROW_EXTERN_C();
 /** Reallocates length of a sequence. This truncates a sequence or enlarges
     it default constructing appended elements.
-    
+
 	@param ppSequence		inout sequence
 	@param pType			type of sequence
 	@param nSize			new size of sequence
diff --git a/main/cppu/inc/uno/threadpool.h b/main/cppu/inc/uno/threadpool.h
index e7799e0c78..b30c6cd632 100644
--- a/main/cppu/inc/uno/threadpool.h
+++ b/main/cppu/inc/uno/threadpool.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -37,13 +37,13 @@ extern "C" {
   uno_releaseIdFromCurrentThread().
   This method is in general called by a bridge, that wants to bind a remote threadId
   to a new thread.
- 
+
   @param pThreadId a byte sequence, that contains the identifier of the current thread.
-  @return true, when the identifier was registered. 
+  @return true, when the identifier was registered.
           false, when the thread has already an identifier. The identifier was not
           altered. ( This is in general a bug ).
 
-  @see uno_releaseIdFromCurrentThread()        
+  @see uno_releaseIdFromCurrentThread()
  */
 sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId )
 	SAL_THROW_EXTERN_C();
@@ -54,8 +54,8 @@ sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId )
   If no id has been bound for the thread before, a new one is generated and bound
   to the thread.
   For each call to uno_getIdOfCurrentThread(), a call to uno_releaseIdFromCurrentThread()
-  must be done. 
- 
+  must be done.
+
   @param ppThreadId [out] Contains the (acquired) ThreadId.
   @see uno_releaseIdFromCurrentThread()
  */
@@ -63,7 +63,7 @@ void SAL_CALL uno_getIdOfCurrentThread( sal_Sequence **ppThreadId )
 	SAL_THROW_EXTERN_C();
 
 
-/** 
+/**
   If the internal refcount drops to zero, the association between threadId and
   thread is broken.
  */
@@ -89,9 +89,9 @@ uno_threadpool_create() SAL_THROW_EXTERN_C();
   an incoming request/reply).
   For every call to uno_threadpool_attach, a corresponding call to
   uno_threadpool_detach must be done.
- 
+
   @param hPool The bridge threadpool handle previously created by uno_threadpool_create.
- 
+
 */
 void SAL_CALL
 uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C();
@@ -99,7 +99,7 @@ uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C();
 /**
   This method is called to wait for a reply of a previously sent request. This is a
   blocking method. uno_threadpool_attach() must have been called before.
- 
+
   @param hPool the handle that was previously created by uno_threadpool_create().
   @param ppJob [out] the pointer, that was given by uno_threadpool_putJob
   0, when uno_threadpool_dispose() was the reason to fall off from threadpool.
@@ -112,30 +112,30 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob )
 /**
    Detaches the current thread from the threadpool. Must be called for
    every call to uno_threadpool_attach.
-*/	
+*/
 void SAL_CALL
 uno_threadpool_detach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C();
 
 /**
   Puts a job into the pool. A job may either be a request or a reply
   (replies have a 0 in the doRequest parameter). This function is non-blocking.
- 
+
   A request may either be synchronous or asynchronous.
   If the request is synchronous, it is first looked up,
   if there exists a handle with the given
   identifier. If this is the case, the thread is woken up and the doRequest
   function is called with the given pJob. If no handle exists,
   a new thread is created and the given threadId is bound to the new thread.
- 
+
   If the request is asynchronous, it is put into the queue of asynchronous
   requests for the current threadid. The requests are always executed in a new
   thread, even if the thread with the given id is waiting in the pool. No id is bound
   to the newly created thread. The responsibilty is left to the bridge ( if it
   wishes to bind a name).
- 
+
   If pJob is a reply, there MUST be a thread with the given threadId waiting
-  for this reply. 
- 
+  for this reply.
+
   @param pThreadId The Id of the thread, that initialized this request. (In general a
                    remote threadid).
   @param pJob The argument, that doRequest will get or that will be returned by
@@ -156,16 +156,16 @@ uno_threadpool_putJob(
 /**
   All threads, that are waiting on the hPool handle, are forced out of the pool.
   The threads waiting with uno_threadpool_enter() will return with *ppJob == 0
-  
-  Later calls to uno_threadpool_enter() using the hPool handle will also 
+
+  Later calls to uno_threadpool_enter() using the hPool handle will also
   return immeadiatly with *ppJob == 0.
- 
+
   @param hPool The handle to be disposed.
   In case, hPool is 0, this function joins on all threads created
   by the threadpool administration. This may e.g. used to ensure, that
   no threads are inside the cppu library anymore, in case it needs to get
   unloaded.
- 
+
   This function is called i.e. by a bridge, that is forced to dispose itself.
  */
 void SAL_CALL
diff --git a/main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h b/main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
index f008df11da..254ede47d5 100644
--- a/main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
+++ b/main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,23 +7,23 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
 #ifndef INCLUDED_CPPUHELPERDLLAPI_H
 #define INCLUDED_CPPUHELPERDLLAPI_H
-                                                                                                                             
+
 #include "sal/types.h"
 
 #if defined(CPPUHELPER_DLLIMPLEMENTATION)
@@ -32,5 +32,5 @@
 #define CPPUHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define CPPUHELPER_DLLPRIVATE SAL_DLLPRIVATE
-                                                                                    
+
 #endif /* INCLUDED_CPPUHELPERDLLAPI_H */
diff --git a/main/cppuhelper/inc/cppuhelper/findsofficepath.h b/main/cppuhelper/inc/cppuhelper/findsofficepath.h
index 1b9d8c7bb3..67ace1f189 100644
--- a/main/cppuhelper/inc/cppuhelper/findsofficepath.h
+++ b/main/cppuhelper/inc/cppuhelper/findsofficepath.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/cppuhelper/inc/cppuhelper/interfacecontainer.h b/main/cppuhelper/inc/cppuhelper/interfacecontainer.h
index 5666445287..a8cfc15d30 100644
--- a/main/cppuhelper/inc/cppuhelper/interfacecontainer.h
+++ b/main/cppuhelper/inc/cppuhelper/interfacecontainer.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -40,7 +40,7 @@
 
 /** */ //for docpp
 namespace cppu
-{     
+{
 
 namespace detail {
 
@@ -59,7 +59,7 @@ class OInterfaceContainerHelper;
   This is the iterator of a InterfaceContainerHelper. Typically
   one constructs an instance on the stack for one firing session.
   It is not allowed to assign or copy an instance of this class.
-  
+
   @see OInterfaceContainerHelper
  */
 class CPPUHELPER_DLLPUBLIC OInterfaceIteratorHelper
@@ -68,14 +68,14 @@ public:
 	/**
 	   Create an iterator over the elements of the container. The iterator
 	   copies the elements of the conatainer. A change to the container
-       during the lifetime of an iterator is allowed and does not 
+       during the lifetime of an iterator is allowed and does not
 	   affect the iterator-instance. The iterator and the container take cares
        themself for concurrent access, no additional guarding is necessary.
-       
+
 	   Remark: The copy is on demand. The iterator copy the elements only if the container
 	   change the contents. It is not allowed to destroy the container as long
        as an iterator exist.
-	 
+
 	   @param rCont	the container of the elements.
 	 */
 	OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont ) SAL_THROW( () );
@@ -90,17 +90,17 @@ public:
 		{ return nRemain != 0; }
 	/** Return the next element of the iterator. Calling this method if
 	    hasMoreElements() has returned sal_False, is an error. Cast the
-        returned pointer to the 
+        returned pointer to the
 	 */
 	::com::sun::star::uno::XInterface *	SAL_CALL next() SAL_THROW( () );
 
 	/** Removes the current element (the last one returned by next())
 	    from the underlying container. Calling this method before
 		next() has been called or calling it twice with no next()
-		inbetween is an error. 
+		inbetween is an error.
 	*/
 	void SAL_CALL remove() SAL_THROW( () );
-	
+
 private:
 	OInterfaceContainerHelper &	rCont;
 	sal_Bool					bIsList;
@@ -117,7 +117,7 @@ private:
 /**
   A container of interfaces. To access the elements use an iterator.
   This implementation is thread save.
- 
+
   @see OInterfaceIteratorHelper
  */
 class CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper
@@ -132,10 +132,10 @@ public:
 		{ return pMem; }
 	inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
 		{}
-	
+
 	/**
-	   Create an interface container. 
-	 
+	   Create an interface container.
+
 	   @param rMutex	the mutex to protect multi thread access.
        The lifetime must be longer than the lifetime
 	   of this object.
@@ -166,7 +166,7 @@ public:
         removeInterface() the same number of times.
         In the latter case, you will also get events fired more than once (if the interface is a
         listener interface).
-        
+
         @param rxIFace
                interface to be added; it is allowed to insert null or
                the same interface more than once
@@ -175,7 +175,7 @@ public:
     */
 	sal_Int32 SAL_CALL addInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW( () );
 	/** Removes an element from the container.  It uses interface equality to remove the interface.
-        
+
         @param rxIFace
                interface to be removed
         @return
@@ -194,10 +194,10 @@ public:
 
     /** Executes a functor for each contained listener of specified type, e.g.
         <code>forEach<awt::XPaintListener>(...</code>.
-        
+
         If a com::sun::star::lang::DisposedException occurs which relates to
         the called listener, then that listener is removed from the container.
-        
+
         @tpl ListenerT listener type
         @tpl FuncT unary functor type, let your compiler deduce this for you
         @param func unary functor object expecting an argument of type
@@ -205,7 +205,7 @@ public:
     */
     template <typename ListenerT, typename FuncT>
     inline void forEach( FuncT const& func );
-    
+
     /** Calls a UNO listener method for each contained listener.
 
         The listener method must take a single argument of type EventT,
@@ -213,7 +213,7 @@ public:
 
         If a com::sun::star::lang::DisposedException occurs which relates to
         the called listener, then that listener is removed from the container.
-        
+
         @tpl ListenerT UNO event listener type, let your compiler deduce this for you
         @tpl EventT event type, let your compiler deduce this for you
         @param NotificationMethod
@@ -229,10 +229,10 @@ public:
     */
     template< typename ListenerT, typename EventT >
     inline void notifyEach( void ( SAL_CALL ListenerT::*NotificationMethod )( const EventT& ), const EventT& Event );
-    
+
 private:
 friend class OInterfaceIteratorHelper;
-	/** 
+	/**
 	  bIsList == TRUE -> aData.pAsSequence of type Sequence< XInterfaceSequence >,
 	  otherwise aData.pAsInterface == of type (XEventListener *)
 	 */
@@ -302,7 +302,7 @@ inline void OInterfaceContainerHelper::notifyEach( void ( SAL_CALL ListenerT::*N
 //===================================================================
 /**
   A helper class to store interface references of different types.
- 
+
   @see OInterfaceIteratorHelper
   @see OInterfaceContainerHelper
  */
@@ -319,10 +319,10 @@ public:
 		{ return pMem; }
 	inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
 		{}
-    
+
 	/**
 	  Create a container of interface containers.
-	 
+
 	  @param rMutex	the mutex to protect multi thread access.
 	 					The lifetime must be longer than the lifetime
 	 					of this object.
@@ -345,17 +345,17 @@ public:
 	 			was not created, null was returned.
 	 */
 	inline OInterfaceContainerHelper * SAL_CALL getContainer( const key & ) const SAL_THROW( () );
-	
+
 	/** Inserts an element into the container with the specified key.
         The position is not specified, thus it is not specified in which order events are fired.
-        
+
         @attention
         If you add the same interface more than once, then it will be added to the elements list
         more than once and thus if you want to remove that interface from the list, you have to call
         removeInterface() the same number of times.
         In the latter case, you will also get events fired more than once (if the interface is a
         listener interface).
-        
+
         @param rKey
                the id of the container
         @param r
@@ -364,14 +364,14 @@ public:
         @return
                 the new count of elements in the container
     */
-	inline sal_Int32 SAL_CALL addInterface( 
+	inline sal_Int32 SAL_CALL addInterface(
 		const key & rKey,
 		const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r )
 		SAL_THROW( () );
-	
+
 	/** Removes an element from the container with the specified key.
         It uses interface equality to remove the interface.
-        
+
         @param rKey
                the id of the container
         @param rxIFace
@@ -379,11 +379,11 @@ public:
         @return
                 the new count of elements in the container
     */
-	inline sal_Int32 SAL_CALL removeInterface(	
+	inline sal_Int32 SAL_CALL removeInterface(
 		const key & rKey,
 		const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace )
 		SAL_THROW( () );
-	
+
 	/**
 	  Call disposing on all references in the container, that
 	  support XEventListener. Then clears the container.
@@ -415,7 +415,7 @@ private:
         }
         return iter;
     }
-    
+
 	inline OMultiTypeInterfaceContainerHelperVar( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW( () );
 	inline OMultiTypeInterfaceContainerHelperVar & operator = ( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW( () );
 };
@@ -423,16 +423,16 @@ private:
 
 
 
-/** 
+/**
   This struct contains the standard variables of a broadcaster. Helper
   classes only know a reference to this struct instead of references
   to the four members. The access to the members must be guarded with
   rMutex.
- 
+
   The additional template parameter keyType has been added, because gcc
   can't compile addListener( const container::keyType &key ).
  */
-template < class container , class keyType > 
+template < class container , class keyType >
 struct OBroadcastHelperVar
 {
 	/** The shared mutex. */
@@ -440,7 +440,7 @@ struct OBroadcastHelperVar
 	/** ListenerContainer class is thread save. */
 	container	aLC;
 	/** Dispose call ready. */
-	sal_Bool							bDisposed; 
+	sal_Bool							bDisposed;
 	/** In dispose call. */
 	sal_Bool							bInDispose;
 
@@ -524,10 +524,10 @@ public:
 		{ return pMem; }
 	inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
 		{}
-    
+
 	/**
 	  Create a container of interface containers.
-	 
+
 	  @param rMutex	the mutex to protect multi thread access.
 	 					The lifetime must be longer than the lifetime
 	 					of this object.
@@ -549,17 +549,17 @@ public:
 	 			was not created, null was returned.
 	 */
 	OInterfaceContainerHelper * SAL_CALL getContainer( const ::com::sun::star::uno::Type & rKey ) const SAL_THROW( () );
-	
+
 	/** Inserts an element into the container with the specified key.
         The position is not specified, thus it is not specified in which order events are fired.
-        
+
         @attention
         If you add the same interface more than once, then it will be added to the elements list
         more than once and thus if you want to remove that interface from the list, you have to call
         removeInterface() the same number of times.
         In the latter case, you will also get events fired more than once (if the interface is a
         listener interface).
-        
+
         @param rKey
                the id of the container
         @param r
@@ -568,14 +568,14 @@ public:
         @return
                 the new count of elements in the container
     */
-	sal_Int32 SAL_CALL addInterface( 
+	sal_Int32 SAL_CALL addInterface(
 		const ::com::sun::star::uno::Type & rKey,
 		const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r )
 		SAL_THROW( () );
-	
+
 	/** Removes an element from the container with the specified key.
         It uses interface equality to remove the interface.
-        
+
         @param rKey
                the id of the container
         @param rxIFace
@@ -583,11 +583,11 @@ public:
         @return
                 the new count of elements in the container
     */
-	sal_Int32 SAL_CALL removeInterface(	
+	sal_Int32 SAL_CALL removeInterface(
 		const ::com::sun::star::uno::Type & rKey,
 		const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace )
 		SAL_THROW( () );
-	
+
 	/**
 	  Call disposing on all object in the container that
 	  support XEventListener. Than clear the container.
@@ -597,7 +597,7 @@ public:
 	  Remove all elements of all containers. Does not delete the container.
 	 */
 	void SAL_CALL clear() SAL_THROW( () );
-    
+
 	typedef ::com::sun::star::uno::Type keyType;
 private:
 	void *m_pMap;
@@ -609,6 +609,6 @@ private:
 
 typedef OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper , OMultiTypeInterfaceContainerHelper::keyType > OBroadcastHelper;
 
-}     
+}
 
 #endif
diff --git a/main/cppuhelper/inc/cppuhelper/proptypehlp.h b/main/cppuhelper/inc/cppuhelper/proptypehlp.h
index 3abd943587..b27c7dad17 100644
--- a/main/cppuhelper/inc/cppuhelper/proptypehlp.h
+++ b/main/cppuhelper/inc/cppuhelper/proptypehlp.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -33,7 +33,7 @@ namespace cppu {
     The function does the same as the operator >>= () at the
     Any class, except that it throws an IllegalArgumentException in case of
     failures (the value cannot be extracted without data loss )
-   
+
    @exception com::sun::star::lang::IllegalArgumentException when the type could not be converted.
  */
 template < class target >
@@ -45,13 +45,13 @@ inline void SAL_CALL convertPropertyValue( target &value ,  ::com::sun::star::un
 /**
   conversion of basic types
 */
-inline void SAL_CALL convertPropertyValue( sal_Int64 & target ,  const ::com::sun::star::uno::Any & source ) 
+inline void SAL_CALL convertPropertyValue( sal_Int64 & target ,  const ::com::sun::star::uno::Any & source )
 	SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
-inline void SAL_CALL convertPropertyValue( sal_uInt64 & target, const ::com::sun::star::uno::Any & source ) 
+inline void SAL_CALL convertPropertyValue( sal_uInt64 & target, const ::com::sun::star::uno::Any & source )
 	SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
-inline void SAL_CALL convertPropertyValue( sal_Int32 & target , const ::com::sun::star::uno::Any & source ) 
+inline void SAL_CALL convertPropertyValue( sal_Int32 & target , const ::com::sun::star::uno::Any & source )
 	SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
-inline void SAL_CALL convertPropertyValue( sal_uInt32 & target, const ::com::sun::star::uno::Any & source ) 
+inline void SAL_CALL convertPropertyValue( sal_uInt32 & target, const ::com::sun::star::uno::Any & source )
 	SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
 inline void SAL_CALL convertPropertyValue( sal_Int16 & target , const ::com::sun::star::uno::Any & source )
 	SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
diff --git a/main/crashrep/source/win32/base64.h b/main/crashrep/source/win32/base64.h
index ed0d1ec4c9..a79aa138fb 100644
--- a/main/crashrep/source/win32/base64.h
+++ b/main/crashrep/source/win32/base64.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/crashrep/source/win32/resource.h b/main/crashrep/source/win32/resource.h
index 1f17478115..1fc40b3b87 100644
--- a/main/crashrep/source/win32/resource.h
+++ b/main/crashrep/source/win32/resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -104,7 +104,7 @@
 #define IDC_PROXY_DESCRIPTION			1033
 #define IDC_SENDING_REPORT_STATUS		1034
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
diff --git a/main/cui/source/tabpages/chardlg.h b/main/cui/source/tabpages/chardlg.h
index dde80fdd81..b95dba8037 100644
--- a/main/cui/source/tabpages/chardlg.h
+++ b/main/cui/source/tabpages/chardlg.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/dbaccess/inc/dbaccessdllapi.h b/main/dbaccess/inc/dbaccessdllapi.h
index e828d8a0bc..d9cd9a14c2 100644
--- a/main/dbaccess/inc/dbaccessdllapi.h
+++ b/main/dbaccess/inc/dbaccessdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,32 +7,32 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
 #ifndef INCLUDED_DBACCESSDLLAPI_H
 #define INCLUDED_DBACCESSDLLAPI_H
-                                                                                                                             
+
 #ifndef _SAL_TYPES_H_
 #include "sal/types.h"
 #endif
-                                                                                                                             
+
 #if defined(DBACCESS_DLLIMPLEMENTATION)
 #define DBACCESS_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else
 #define DBACCESS_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define DBACCESS_DLLPRIVATE SAL_DLLPRIVATE
-                                                                                                                             
+
 #endif /* INCLUDED_DBACCESSDLLAPI_H */
diff --git a/main/desktop/source/app/sofficemain.h b/main/desktop/source/app/sofficemain.h
index d486b146ac..0199ce34c7 100644
--- a/main/desktop/source/app/sofficemain.h
+++ b/main/desktop/source/app/sofficemain.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/source/deployment/gui/dp_gui.h b/main/desktop/source/deployment/gui/dp_gui.h
index 49508f18c4..1ebe21c2f0 100644
--- a/main/desktop/source/deployment/gui/dp_gui.h
+++ b/main/desktop/source/deployment/gui/dp_gui.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/source/deployment/inc/dp_interact.h b/main/desktop/source/deployment/inc/dp_interact.h
index 8fd8a738a3..a651de986f 100644
--- a/main/desktop/source/deployment/inc/dp_interact.h
+++ b/main/desktop/source/deployment/inc/dp_interact.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -53,13 +53,13 @@ inline void progressUpdate(
 class ProgressLevel
 {
     css::uno::Reference<css::ucb::XProgressHandler> m_xProgressHandler;
-    
+
 public:
     inline ~ProgressLevel();
     inline ProgressLevel(
         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
         ::rtl::OUString const & status );
-    
+
     inline void update( ::rtl::OUString const & status ) const;
     inline void update( css::uno::Any const & status ) const;
 };
@@ -114,18 +114,18 @@ class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC AbortChannel :
 {
     bool m_aborted;
     css::uno::Reference<css::task::XAbortChannel> m_xNext;
-    
+
 public:
     inline AbortChannel() : m_aborted( false ) {}
     inline static AbortChannel * get(
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel )
         { return static_cast<AbortChannel *>(xAbortChannel.get()); }
-    
+
     inline bool isAborted() const { return m_aborted; }
-    
+
     // XAbortChannel
     virtual void SAL_CALL sendAbort() throw (css::uno::RuntimeException);
-    
+
     class SAL_DLLPRIVATE Chain
     {
         const ::rtl::Reference<AbortChannel> m_abortChannel;
diff --git a/main/desktop/source/deployment/inc/dp_misc.h b/main/desktop/source/deployment/inc/dp_misc.h
index d56064210c..1627363183 100644
--- a/main/desktop/source/deployment/inc/dp_misc.h
+++ b/main/desktop/source/deployment/inc/dp_misc.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -115,7 +115,7 @@ oslProcess raiseProcess( ::rtl::OUString const & appURL,
 //==============================================================================
 
 /** writes the argument string to the console.
-    On Linux/Unix/etc. it converts the UTF16 string to an ANSI string using 
+    On Linux/Unix/etc. it converts the UTF16 string to an ANSI string using
     osl_getThreadTextEncoding() as target encoding. On Windows it uses WriteFile
     with the standard out stream. unopkg.com reads the data and prints them out using
     WriteConsoleW.
@@ -125,21 +125,21 @@ void writeConsole(::rtl::OUString const & sText);
 
 /** writes the argument string to the console.
     On Linux/Unix/etc. the string is passed into fprintf without any conversion.
-    On Windows the string is converted to UTF16 assuming the argument is UTF8 
-    encoded. The UTF16 string is written to stdout with WriteFile. unopkg.com 
+    On Windows the string is converted to UTF16 assuming the argument is UTF8
+    encoded. The UTF16 string is written to stdout with WriteFile. unopkg.com
     reads the data and prints them out using WriteConsoleW.
 */
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
 void writeConsole(::rtl::OString const & sText);
 
-/** writes the argument to the console using the error stream. 
+/** writes the argument to the console using the error stream.
     Otherwise the same as writeConsole.
 */
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
 void writeConsoleError(::rtl::OUString const & sText);
 
 
-/** writes the argument to the console using the error stream. 
+/** writes the argument to the console using the error stream.
     Otherwise the same as writeConsole.
 */
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
@@ -165,7 +165,7 @@ void TRACE(::rtl::OString const & sText);
 
 /** registers or revokes shared or bundled extensions which have been
     recently added or removed.
-*/    
+*/
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
 void syncRepositories(::com::sun::star::uno::Reference<
                       ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
diff --git a/main/desktop/source/deployment/inc/dp_persmap.h b/main/desktop/source/deployment/inc/dp_persmap.h
index 9ae630d2a2..43d215a342 100644
--- a/main/desktop/source/deployment/inc/dp_persmap.h
+++ b/main/desktop/source/deployment/inc/dp_persmap.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #if ! defined INCLUDED_DP_PERSMAP_H
@@ -47,7 +47,7 @@ public:
     PersistentMap( ::rtl::OUString const & url, bool readOnly );
     /** in mem db */
     PersistentMap();
-    
+
     bool has( ::rtl::OString const & key ) const;
     bool get( ::rtl::OString * value, ::rtl::OString const & key ) const;
     t_string2string_map getEntries() const;
diff --git a/main/desktop/source/deployment/inc/dp_resource.h b/main/desktop/source/deployment/inc/dp_resource.h
index b86e1976a4..c02b45b6b9 100644
--- a/main/desktop/source/deployment/inc/dp_resource.h
+++ b/main/desktop/source/deployment/inc/dp_resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/source/deployment/inc/dp_ucb.h b/main/desktop/source/deployment/inc/dp_ucb.h
index a11366e45f..099f65ad77 100644
--- a/main/desktop/source/deployment/inc/dp_ucb.h
+++ b/main/desktop/source/deployment/inc/dp_ucb.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/source/deployment/inc/dp_xml.h b/main/desktop/source/deployment/inc/dp_xml.h
index eaf659d838..95d0fe5ed5 100644
--- a/main/desktop/source/deployment/inc/dp_xml.h
+++ b/main/desktop/source/deployment/inc/dp_xml.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/source/deployment/manager/dp_manager.h b/main/desktop/source/deployment/manager/dp_manager.h
index f5b0c768e0..7d326bbfae 100644
--- a/main/desktop/source/deployment/manager/dp_manager.h
+++ b/main/desktop/source/deployment/manager/dp_manager.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -53,10 +53,10 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
     ::rtl::OUString m_registrationData_expanded;
     ::rtl::OUString m_registryCache;
     bool m_readOnly;
-    
+
     ::rtl::OUString m_activePackages;
     ::rtl::OUString m_activePackages_expanded;
-    ::std::auto_ptr< ActivePackages > m_activePackagesDB;    
+    ::std::auto_ptr< ActivePackages > m_activePackagesDB;
     //This mutex is only used for synchronization in addPackage
     ::osl::Mutex m_addMutex;
     css::uno::Reference<css::ucb::XProgressHandler> m_xLogFile;
@@ -64,7 +64,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
     void fireModified();
 
     css::uno::Reference<css::deployment::XPackageRegistry> m_xRegistry;
-    
+
     void initRegistryBackends();
     void initActivationLayer(
         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv );
@@ -72,7 +72,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
         ::ucbhelper::Content const & ucbContent, bool throw_exc = true );
     ::rtl::OUString insertToActivationLayer(
         css::uno::Sequence<css::beans::NamedValue> const & properties,
-        ::rtl::OUString const & mediaType, 
+        ::rtl::OUString const & mediaType,
         ::ucbhelper::Content const & sourceContent,
         ::rtl::OUString const & title, ActivePackages::Data * dbData );
     void insertToActivationLayerDB(
@@ -101,20 +101,20 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
         css::uno::Reference<css::ucb::XProgressHandler> m_xUserProgress;
         css::uno::Reference<css::task::XInteractionHandler>
         m_xUserInteractionHandler;
-        
+
     public:
         virtual ~CmdEnvWrapperImpl();
         CmdEnvWrapperImpl(
             css::uno::Reference<css::ucb::XCommandEnvironment>
             const & xUserCmdEnv,
             css::uno::Reference<css::ucb::XProgressHandler> const & xLogFile );
-        
+
         // XCommandEnvironment
         virtual css::uno::Reference<css::task::XInteractionHandler> SAL_CALL
         getInteractionHandler() throw (css::uno::RuntimeException);
         virtual css::uno::Reference<css::ucb::XProgressHandler> SAL_CALL
         getProgressHandler() throw (css::uno::RuntimeException);
-        
+
         // XProgressHandler
         virtual void SAL_CALL push( css::uno::Any const & Status )
             throw (css::uno::RuntimeException);
@@ -122,11 +122,11 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
             throw (css::uno::RuntimeException);
         virtual void SAL_CALL pop() throw (css::uno::RuntimeException);
     };
-    
+
 protected:
     inline void check();
     virtual void SAL_CALL disposing();
-    
+
     virtual ~PackageManagerImpl();
     inline PackageManagerImpl(
         css::uno::Reference<css::uno::XComponentContext>
@@ -136,12 +136,12 @@ protected:
           m_context( context ),
           m_readOnly( true )
         {}
-    
+
 public:
     static css::uno::Reference<css::deployment::XPackageManager> create(
         css::uno::Reference<css::uno::XComponentContext>
         const & xComponentContext, ::rtl::OUString const & context );
-    
+
     // XComponent
     virtual void SAL_CALL dispose() throw (css::uno::RuntimeException);
     virtual void SAL_CALL addEventListener(
@@ -150,7 +150,7 @@ public:
     virtual void SAL_CALL removeEventListener(
         css::uno::Reference<css::lang::XEventListener> const & xListener )
         throw (css::uno::RuntimeException);
-    
+
     // XModifyBroadcaster
     virtual void SAL_CALL addModifyListener(
         css::uno::Reference<css::util::XModifyListener> const & xListener )
@@ -158,17 +158,17 @@ public:
     virtual void SAL_CALL removeModifyListener(
         css::uno::Reference<css::util::XModifyListener> const & xListener )
         throw (css::uno::RuntimeException);
-    
+
     // XPackageManager
     virtual ::rtl::OUString SAL_CALL getContext()
         throw (css::uno::RuntimeException);
     virtual css::uno::Sequence<
         css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL
     getSupportedPackageTypes() throw (css::uno::RuntimeException);
-    
+
     virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL
     createAbortChannel() throw (css::uno::RuntimeException);
-    
+
     virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addPackage(
         ::rtl::OUString const & url,
         css::uno::Sequence<css::beans::NamedValue> const & properties,
@@ -180,7 +180,7 @@ public:
                css::ucb::CommandAbortedException,
                css::lang::IllegalArgumentException,
                css::uno::RuntimeException);
-    
+
     virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL importExtension(
         css::uno::Reference<css::deployment::XPackage> const & extension,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
@@ -200,7 +200,7 @@ public:
                css::ucb::CommandAbortedException,
                css::lang::IllegalArgumentException,
                css::uno::RuntimeException);
-    
+
     ::rtl::OUString getDeployPath( ActivePackages::Data const & data );
     css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage_(
         ::rtl::OUString const & id, ::rtl::OUString const & fileName,
@@ -216,7 +216,7 @@ public:
         throw (css::deployment::DeploymentException,
                css::ucb::CommandFailedException,
                css::lang::IllegalArgumentException, css::uno::RuntimeException);
-    
+
     css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
     getDeployedPackages_(
         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv );
@@ -229,7 +229,7 @@ public:
                css::ucb::CommandAbortedException,
                css::lang::IllegalArgumentException,
                css::uno::RuntimeException);
-    
+
     virtual void SAL_CALL reinstallDeployedPackages(
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
diff --git a/main/desktop/source/deployment/registry/inc/dp_backend.h b/main/desktop/source/deployment/registry/inc/dp_backend.h
index 65d7bd7bd2..31c97d7ed4 100644
--- a/main/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/main/desktop/source/deployment/registry/inc/dp_backend.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -60,13 +60,13 @@ typedef ::cppu::WeakComponentImplHelper1<
 //==============================================================================
 class Package : protected ::dp_misc::MutexHolder, public t_PackageBase
 {
-    PackageRegistryBackend * getMyBackend() const; 
+    PackageRegistryBackend * getMyBackend() const;
     void processPackage_impl(
         bool registerPackage,
         bool startup,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv );
-    
+
 protected:
     ::rtl::Reference<PackageRegistryBackend> m_myBackend;
     const ::rtl::OUString m_url;
@@ -76,14 +76,14 @@ protected:
     const bool m_bRemoved;
     //Only set if m_bRemoved = true;
     const ::rtl::OUString m_identifier;
-    
+
     void check() const;
     void fireModified();
     virtual void SAL_CALL disposing();
-    
+
     void checkAborted(
         ::rtl::Reference< ::dp_misc::AbortChannel > const & abortChannel );
-    
+
     // @@@ to be implemented by specific backend:
     virtual css::beans::Optional< css::beans::Ambiguous<sal_Bool> >
     isRegistered_(
@@ -98,7 +98,7 @@ protected:
         ::rtl::Reference< ::dp_misc::AbortChannel > const & abortChannel,
         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
         = 0;
-    
+
     virtual ~Package();
     Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend,
              ::rtl::OUString const & url,
@@ -108,9 +108,9 @@ protected:
              xPackageType,
              bool bRemoved,
              ::rtl::OUString const & identifier);
-    
+
 public:
-    
+
     class TypeInfo :
         public ::cppu::WeakImplHelper1<css::deployment::XPackageTypeInfo>
     {
@@ -143,7 +143,7 @@ public:
                                                 sal_Bool smallIcon )
             throw (css::uno::RuntimeException);
     };
-    
+
     // XComponent
     virtual void SAL_CALL dispose() throw (css::uno::RuntimeException);
     virtual void SAL_CALL addEventListener(
@@ -152,7 +152,7 @@ public:
     virtual void SAL_CALL removeEventListener(
         css::uno::Reference<css::lang::XEventListener> const & xListener )
         throw (css::uno::RuntimeException);
-    
+
     // XModifyBroadcaster
     virtual void SAL_CALL addModifyListener(
         css::uno::Reference<css::util::XModifyListener> const & xListener )
@@ -160,7 +160,7 @@ public:
     virtual void SAL_CALL removeModifyListener(
         css::uno::Reference<css::util::XModifyListener> const & xListener )
         throw (css::uno::RuntimeException);
-    
+
     // XPackage
     virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL
     createAbortChannel() throw (css::uno::RuntimeException);
@@ -173,21 +173,21 @@ public:
                css::ucb::CommandAbortedException,
                css::uno::RuntimeException);
 
-    virtual ::sal_Int32 SAL_CALL checkPrerequisites( 
-		const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel, 
+    virtual ::sal_Int32 SAL_CALL checkPrerequisites(
+		const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel,
 		const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv,
-        sal_Bool noLicenseChecking) 
+        sal_Bool noLicenseChecking)
 		throw (css::deployment::DeploymentException,
                css::deployment::ExtensionRemovedException,
-               css::ucb::CommandFailedException, 
-               css::ucb::CommandAbortedException, 
+               css::ucb::CommandFailedException,
+               css::ucb::CommandAbortedException,
                css::uno::RuntimeException);
 
-    virtual ::sal_Bool SAL_CALL checkDependencies( 
-		const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) 
+    virtual ::sal_Bool SAL_CALL checkDependencies(
+		const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv )
 		throw (css::deployment::DeploymentException,
                css::deployment::ExtensionRemovedException,
-               css::ucb::CommandFailedException, 
+               css::ucb::CommandFailedException,
                css::uno::RuntimeException);
 
     virtual void SAL_CALL registerPackage(
@@ -286,7 +286,7 @@ class PackageRegistryBackend
         ::rtl::OUString, css::uno::Reference<css::deployment::XPackage>,
         ::rtl::OUStringHash > t_string2ref;
     t_string2ref m_bound;
-    
+
 protected:
     ::rtl::OUString m_cachePath;
     css::uno::Reference<css::uno::XComponentContext> m_xComponentContext;
@@ -304,17 +304,17 @@ protected:
         StrCannotDetectMediaType, RID_STR_CANNOT_DETECT_MEDIA_TYPE> {};
     struct StrUnsupportedMediaType : public ::dp_misc::StaticResourceString<
         StrUnsupportedMediaType, RID_STR_UNSUPPORTED_MEDIA_TYPE> {};
-    
+
     // @@@ to be implemented by specific backend:
     virtual css::uno::Reference<css::deployment::XPackage> bindPackage_(
         ::rtl::OUString const & url, ::rtl::OUString const & mediaType,
         sal_Bool bRemoved, ::rtl::OUString const & identifier,
         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
         = 0;
-    
+
     void check();
     virtual void SAL_CALL disposing();
-    
+
     virtual ~PackageRegistryBackend();
     PackageRegistryBackend(
         css::uno::Sequence<css::uno::Any> const & args,
@@ -340,7 +340,7 @@ protected:
     */
     static void deleteTempFolder(
         ::rtl::OUString const & folderUrl);
-    
+
     ::rtl::OUString getSharedRegistrationDataURL(
         css::uno::Reference<css::deployment::XPackage> const & extension,
         css::uno::Reference<css::deployment::XPackage> const & item);
@@ -351,27 +351,27 @@ protected:
        when an extension was removed.
     */
 //    virtual void deleteDbEntry( ::rtl::OUString const & url) = 0;
-        
-        
+
+
 
 public:
     struct StrRegisteringPackage : public ::dp_misc::StaticResourceString<
         StrRegisteringPackage, RID_STR_REGISTERING_PACKAGE> {};
     struct StrRevokingPackage : public ::dp_misc::StaticResourceString<
         StrRevokingPackage, RID_STR_REVOKING_PACKAGE> {};
-    
+
     inline css::uno::Reference<css::uno::XComponentContext> const &
     getComponentContext() const { return m_xComponentContext; }
-    
+
     inline ::rtl::OUString const & getCachePath() const { return m_cachePath; }
     inline bool transientMode() const { return m_cachePath.getLength() == 0; }
 
     inline ::rtl::OUString getContext() const {return m_context; }
-    
+
     // XEventListener
     virtual void SAL_CALL disposing( css::lang::EventObject const & evt )
         throw (css::uno::RuntimeException);
-    
+
     // XPackageRegistry
     virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL bindPackage(
         ::rtl::OUString const & url, ::rtl::OUString const & mediaType,
diff --git a/main/desktop/source/deployment/registry/script/dp_lib_container.h b/main/desktop/source/deployment/registry/script/dp_lib_container.h
index 055b2e0c79..ab299fab80 100644
--- a/main/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/main/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/source/pagein/file_image.h b/main/desktop/source/pagein/file_image.h
index 46c9486988..f6f26eb581 100644
--- a/main/desktop/source/pagein/file_image.h
+++ b/main/desktop/source/pagein/file_image.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/source/pkgchk/unopkg/unopkg_main.h b/main/desktop/source/pkgchk/unopkg/unopkg_main.h
index 6c887f6b0b..d6a4155654 100644
--- a/main/desktop/source/pkgchk/unopkg/unopkg_main.h
+++ b/main/desktop/source/pkgchk/unopkg/unopkg_main.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/source/pkgchk/unopkg/unopkg_shared.h b/main/desktop/source/pkgchk/unopkg/unopkg_shared.h
index 546f245b1f..f985abb71f 100644
--- a/main/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/main/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -63,7 +63,7 @@ namespace unopkg {
     }
 };
 
-struct DeploymentResMgr :  public rtl::StaticWithInit< ResMgr *, DeploymentResMgr > 
+struct DeploymentResMgr :  public rtl::StaticWithInit< ResMgr *, DeploymentResMgr >
 {
 	ResMgr * operator () () {
         return ResMgr::CreateResMgr( "deployment", OfficeLocale::get());
@@ -80,7 +80,7 @@ struct OptionInfo
 
 struct LockFileException : public css::uno::Exception
 {
-    LockFileException(::rtl::OUString const & sMessage) : 
+    LockFileException(::rtl::OUString const & sMessage) :
         css::uno::Exception(sMessage, css::uno::Reference< css::uno::XInterface > ()) {}
 };
 
@@ -145,7 +145,7 @@ public:
         if (m_xComp.is())
             m_xComp->dispose();
     }
-    
+
     inline void reset(
         css::uno::Reference<css::lang::XComponent> const & xComp )
     {
@@ -156,7 +156,7 @@ public:
     {
         m_bDeinitUCB = true;
     }
-            
+
 };
 
 //==============================================================================
diff --git a/main/desktop/win32/source/QuickStart/QuickStart.h b/main/desktop/win32/source/QuickStart/QuickStart.h
index 76cc475472..45ef86f916 100644
--- a/main/desktop/win32/source/QuickStart/QuickStart.h
+++ b/main/desktop/win32/source/QuickStart/QuickStart.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/win32/source/QuickStart/StdAfx.h b/main/desktop/win32/source/QuickStart/StdAfx.h
index 1bfdc5d311..4247d904b9 100644
--- a/main/desktop/win32/source/QuickStart/StdAfx.h
+++ b/main/desktop/win32/source/QuickStart/StdAfx.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 // stdafx.h : include file for standard system include files,
@@ -42,7 +42,7 @@
 #include <shellapi.h>
 #if defined _MSC_VER
 #pragma warning(pop)
-#endif 
+#endif
 
 // C RunTime Header Files
 #include <stdlib.h>
diff --git a/main/desktop/win32/source/QuickStart/resource.h b/main/desktop/win32/source/QuickStart/resource.h
index 605125d683..fc023cdde8 100644
--- a/main/desktop/win32/source/QuickStart/resource.h
+++ b/main/desktop/win32/source/QuickStart/resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 //{{NO_DEPENDENCIES}}
@@ -41,7 +41,7 @@
 #define IDC_MYICON						3
 #define IDC_STATIC	                    -1
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 
diff --git a/main/desktop/win32/source/main.h b/main/desktop/win32/source/main.h
index e1c75c17aa..9fc5a8e306 100644
--- a/main/desktop/win32/source/main.h
+++ b/main/desktop/win32/source/main.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #pragma once
diff --git a/main/desktop/win32/source/rebase/Resource.h b/main/desktop/win32/source/rebase/Resource.h
index d20a12ab40..1da4afddaf 100644
--- a/main/desktop/win32/source/rebase/Resource.h
+++ b/main/desktop/win32/source/rebase/Resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/win32/source/setup/Resource.h b/main/desktop/win32/source/setup/Resource.h
index 706ee1a454..742e7fb41c 100644
--- a/main/desktop/win32/source/setup/Resource.h
+++ b/main/desktop/win32/source/setup/Resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/desktop/win32/source/wrapper.h b/main/desktop/win32/source/wrapper.h
index 85aeec2e83..0a2408986d 100644
--- a/main/desktop/win32/source/wrapper.h
+++ b/main/desktop/win32/source/wrapper.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #pragma once
@@ -133,7 +133,7 @@ extern "C" int Main()
 	SetEnvironmentVariable( TEXT("PATH"), szPathValue);
 
 	LPVOID	lpEnvironment = GetEnvironmentStrings();
-	
+
 
 	// Retrieve current directory
 
@@ -172,8 +172,8 @@ extern "C" int Main()
 
 	LPVOID lpMsgBuf;
 
-	FormatMessage( 
-		FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+	FormatMessage(
+		FORMAT_MESSAGE_ALLOCATE_BUFFER |
 		FORMAT_MESSAGE_FROM_SYSTEM,
 		NULL,
 		dwError,
diff --git a/main/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h b/main/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h
index 2529c164ac..2606c13015 100644
--- a/main/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h
+++ b/main/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 #ifndef INCLUDED_DRAWINGLAYERDLLAPI_H
 #define INCLUDED_DRAWINGLAYERDLLAPI_H
diff --git a/main/editeng/inc/editeng/editengdllapi.h b/main/editeng/inc/editeng/editengdllapi.h
index 93a7d8fc49..e04acf1ca1 100644
--- a/main/editeng/inc/editeng/editengdllapi.h
+++ b/main/editeng/inc/editeng/editengdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/embeddedobj/source/msole/platform.h b/main/embeddedobj/source/msole/platform.h
index ead46bed39..1c5acaef94 100644
--- a/main/embeddedobj/source/msole/platform.h
+++ b/main/embeddedobj/source/msole/platform.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/embeddedobj/test/Container1/nativelib/nativeview.h b/main/embeddedobj/test/Container1/nativelib/nativeview.h
index bd65f32990..4dd26dcf1c 100644
--- a/main/embeddedobj/test/Container1/nativelib/nativeview.h
+++ b/main/embeddedobj/test/Container1/nativelib/nativeview.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/embedserv/source/inc/common.h b/main/embedserv/source/inc/common.h
index 97f29a8415..a973073aae 100644
--- a/main/embedserv/source/inc/common.h
+++ b/main/embedserv/source/inc/common.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/embedserv/source/inc/embservconst.h b/main/embedserv/source/inc/embservconst.h
index 9118137418..64626110ba 100644
--- a/main/embedserv/source/inc/embservconst.h
+++ b/main/embedserv/source/inc/embservconst.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -41,7 +41,7 @@ const sal_Int32 nConstBufferSize = 32000;
 #ifdef __MINGW32__
 #define DECLSPEC_SELECTANY
 #endif
-#if defined(__MINGW32__) && !defined(INITGUID) 
+#if defined(__MINGW32__) && !defined(INITGUID)
 EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterTextServer;
 EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer;
 
diff --git a/main/embedserv/source/inc/stdafx.h b/main/embedserv/source/inc/stdafx.h
index 7119da6508..f34ffdf0b9 100644
--- a/main/embedserv/source/inc/stdafx.h
+++ b/main/embedserv/source/inc/stdafx.h
@@ -38,4 +38,4 @@ using ::std::max;
 #pragma warning(pop)
 #endif
 
-#endif 
+#endif
diff --git a/main/embedserv/source/inprocserv/inprocembobj.h b/main/embedserv/source/inprocserv/inprocembobj.h
index 328e7bfa84..d0c2629ef2 100644
--- a/main/embedserv/source/inprocserv/inprocembobj.h
+++ b/main/embedserv/source/inprocserv/inprocembobj.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -229,7 +229,7 @@ public:
     STDMETHOD(GetTypeInfo)( UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo);
     STDMETHOD(GetIDsOfNames)( REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId);
     STDMETHOD(Invoke)( DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr);
- 
+
 };
 
 } // namespace inprocserv
diff --git a/main/extensions/source/activex/main/SOActionsApproval.h b/main/extensions/source/activex/main/SOActionsApproval.h
index f45e6c5149..692388f8b9 100644
--- a/main/extensions/source/activex/main/SOActionsApproval.h
+++ b/main/extensions/source/activex/main/SOActionsApproval.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 // SOActionsApproval.h: Definition of the SOActionsApproval class
@@ -71,7 +71,7 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SODOCUMENTEVENTLISTENER)
 	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
 // ISOActionsApproval
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE approveAction( 
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE approveAction(
             /* [in] */ long nActionID,
             /* [retval][out] */ boolean *pbApproval)
 		{
diff --git a/main/extensions/source/activex/main/SOActiveX.h b/main/extensions/source/activex/main/SOActiveX.h
index 3bdb3e5a5b..871127d563 100644
--- a/main/extensions/source/activex/main/SOActiveX.h
+++ b/main/extensions/source/activex/main/SOActiveX.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 // SOActiveX.h : Declaration of the CSOActiveX
diff --git a/main/extensions/source/activex/main/SOComWindowPeer.h b/main/extensions/source/activex/main/SOComWindowPeer.h
index 9361e82007..970e496640 100644
--- a/main/extensions/source/activex/main/SOComWindowPeer.h
+++ b/main/extensions/source/activex/main/SOComWindowPeer.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 // SOComWindowPeer.h: Definition of the SOComWindowPeer class
diff --git a/main/extensions/source/activex/main/SODispatchInterceptor.h b/main/extensions/source/activex/main/SODispatchInterceptor.h
index ec94926101..ca4f4ae86e 100644
--- a/main/extensions/source/activex/main/SODispatchInterceptor.h
+++ b/main/extensions/source/activex/main/SODispatchInterceptor.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 // SODispatchInterceptor.h: Definition of the SODispatchInterceptor class
diff --git a/main/extensions/source/activex/main/StdAfx2.h b/main/extensions/source/activex/main/StdAfx2.h
index c2cf17d76b..1549c9492d 100644
--- a/main/extensions/source/activex/main/StdAfx2.h
+++ b/main/extensions/source/activex/main/StdAfx2.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 // stdafx1.h : include file for standard system include files,
diff --git a/main/extensions/source/activex/main/com_uno_helper.h b/main/extensions/source/activex/main/com_uno_helper.h
index 8beffdedfa..39154f6e83 100644
--- a/main/extensions/source/activex/main/com_uno_helper.h
+++ b/main/extensions/source/activex/main/com_uno_helper.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,38 +7,38 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #include "stdafx2.h"
 
-HRESULT ExecuteFunc( IDispatch* idispUnoObject, 
-					 OLECHAR* sFuncName, 
-					 CComVariant* params, 
-					 unsigned int count, 
+HRESULT ExecuteFunc( IDispatch* idispUnoObject,
+					 OLECHAR* sFuncName,
+					 CComVariant* params,
+					 unsigned int count,
 					 CComVariant* pResult );
 
-HRESULT GetIDispByFunc( IDispatch* idispUnoObject, 
-					  	OLECHAR* sFuncName, 
-					  	CComVariant* params, 
-					  	unsigned int count, 
+HRESULT GetIDispByFunc( IDispatch* idispUnoObject,
+					  	OLECHAR* sFuncName,
+					  	CComVariant* params,
+					  	unsigned int count,
 					  	CComPtr<IDispatch>& pdispResult );
 
-HRESULT PutPropertiesToIDisp( IDispatch* pdispObject, 
-							  OLECHAR** sMemberNames, 
-							  CComVariant* pVariant, 
+HRESULT PutPropertiesToIDisp( IDispatch* pdispObject,
+							  OLECHAR** sMemberNames,
+							  CComVariant* pVariant,
 							  unsigned int count );
 
-HRESULT GetPropertiesFromIDisp( IDispatch* pdispObject, 
-							    OLECHAR** sMemberNames, 
-							    CComVariant* pVariant, 
+HRESULT GetPropertiesFromIDisp( IDispatch* pdispObject,
+							    OLECHAR** sMemberNames,
+							    CComVariant* pVariant,
 							    unsigned int count );
diff --git a/main/extensions/source/activex/main/resource.h b/main/extensions/source/activex/main/resource.h
index c6d29c66e7..3b4db70453 100644
--- a/main/extensions/source/activex/main/resource.h
+++ b/main/extensions/source/activex/main/resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 //{{NO_DEPENDENCIES}}
@@ -35,7 +35,7 @@
 
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        201
diff --git a/main/extensions/source/macosx/spotlight/OOoContentDataParser.h b/main/extensions/source/macosx/spotlight/OOoContentDataParser.h
index b84741ab26..af8bbf1064 100644
--- a/main/extensions/source/macosx/spotlight/OOoContentDataParser.h
+++ b/main/extensions/source/macosx/spotlight/OOoContentDataParser.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -27,13 +27,13 @@
 @interface OOoContentDataParser : NSObject {
     // indicates if we are interested in an element's content
     BOOL shouldReadCharacters;
-    
+
     // the MD importer's values
     NSMutableDictionary *mdiValues;
-    
+
     // all of the text inside a document
     NSMutableString *textContent;
-    
+
     // the current element's content
     NSMutableString *runningTextContent;
 }
diff --git a/main/extensions/source/macosx/spotlight/OOoMetaDataParser.h b/main/extensions/source/macosx/spotlight/OOoMetaDataParser.h
index 7752e963ff..0ba7e92840 100644
--- a/main/extensions/source/macosx/spotlight/OOoMetaDataParser.h
+++ b/main/extensions/source/macosx/spotlight/OOoMetaDataParser.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -29,7 +29,7 @@
     BOOL shouldReadCharacters;
     //indicates if the current element is a custom metadata tag
     BOOL isCustom;
-    
+
     NSMutableDictionary *metaValues;
     NSMutableString *textCurrentElement;
     NSString *customAttribute;
diff --git a/main/extensions/source/macosx/spotlight/OOoSpotlightImporter.h b/main/extensions/source/macosx/spotlight/OOoSpotlightImporter.h
index adb91c4624..0a4e8a7e4d 100644
--- a/main/extensions/source/macosx/spotlight/OOoSpotlightImporter.h
+++ b/main/extensions/source/macosx/spotlight/OOoSpotlightImporter.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/extensions/source/macosx/spotlight/ioapi.h b/main/extensions/source/macosx/spotlight/ioapi.h
index 9a6e1c4ba2..452083ddf8 100644
--- a/main/extensions/source/macosx/spotlight/ioapi.h
+++ b/main/extensions/source/macosx/spotlight/ioapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/extensions/source/macosx/spotlight/unzip.h b/main/extensions/source/macosx/spotlight/unzip.h
index e6f010b8ea..5bcf349def 100644
--- a/main/extensions/source/macosx/spotlight/unzip.h
+++ b/main/extensions/source/macosx/spotlight/unzip.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -73,7 +73,7 @@ extern "C" {
 #endif
 
 #include <zlib.h>
-    
+
 #include "ioapi.h"
 
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
diff --git a/main/extensions/test/ole/AxTestComponents/Basic.h b/main/extensions/test/ole/AxTestComponents/Basic.h
index 0753deb9d3..75eb8f56ff 100644
--- a/main/extensions/test/ole/AxTestComponents/Basic.h
+++ b/main/extensions/test/ole/AxTestComponents/Basic.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -31,7 +31,7 @@
 //#include "AxTestComponents.h"
 /////////////////////////////////////////////////////////////////////////////
 // CBasic
-class ATL_NO_VTABLE CBasic : 
+class ATL_NO_VTABLE CBasic :
 	public CComObjectRootEx<CComSingleThreadModel>,
 	public CComCoClass<CBasic, &CLSID_Basic>,
 	public IDispatchImpl<IBasic, &IID_IBasic, &LIBID_AXTESTCOMPONENTSLib>
@@ -50,7 +50,7 @@ public:
 	END_COM_MAP()
 
 	// IBasic
-public:  
+public:
 	STDMETHOD(outMore)(/*[out]*/long* val1, /*[out]*/long* val2);
 	STDMETHOD(inMulDimArrayByte2)(LPSAFEARRAY val);
 	STDMETHOD(inMulDimArrayByte)(LPSAFEARRAY val);
@@ -79,7 +79,7 @@ public:
 	STDMETHOD(inSequenceShort)(LPSAFEARRAY ar);
 	STDMETHOD(inSequenceByte)(LPSAFEARRAY ar);
 	STDMETHOD(inSequenceLong)(LPSAFEARRAY  ar);
-	STDMETHOD(mixed1)( 
+	STDMETHOD(mixed1)(
 		/* [out][in] */ unsigned char *aChar,
 		/* [out][in] */ float *aFloat,
 		/* [out][in] */ VARIANT *aVar);
diff --git a/main/extensions/test/ole/AxTestComponents/Foo.h b/main/extensions/test/ole/AxTestComponents/Foo.h
index 1798c135ee..d9203da8bf 100644
--- a/main/extensions/test/ole/AxTestComponents/Foo.h
+++ b/main/extensions/test/ole/AxTestComponents/Foo.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -31,7 +31,7 @@
 //#include "AxTestComponents.h"
 /////////////////////////////////////////////////////////////////////////////
 // CBasic
-class ATL_NO_VTABLE CFoo : 
+class ATL_NO_VTABLE CFoo :
 	public CComObjectRootEx<CComSingleThreadModel>,
 	public CComCoClass<CFoo, &CLSID_Foo>,
 	public IFoo
diff --git a/main/extensions/test/ole/AxTestComponents/StdAfx.h b/main/extensions/test/ole/AxTestComponents/StdAfx.h
index 4bcb984e15..9006ffc1e8 100644
--- a/main/extensions/test/ole/AxTestComponents/StdAfx.h
+++ b/main/extensions/test/ole/AxTestComponents/StdAfx.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/extensions/test/ole/AxTestComponents/resource.h b/main/extensions/test/ole/AxTestComponents/resource.h
index e4bb2ce61f..b024febadb 100644
--- a/main/extensions/test/ole/AxTestComponents/resource.h
+++ b/main/extensions/test/ole/AxTestComponents/resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -29,7 +29,7 @@
 //#define IDR_FOO                         501
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        201
diff --git a/main/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h b/main/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
index 887274d6c8..7893b65d72 100644
--- a/main/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
+++ b/main/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 // EvtListener.h : Deklaration von CEvtListener
@@ -28,7 +28,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CEvtListener
-class ATL_NO_VTABLE CEvtListener : 
+class ATL_NO_VTABLE CEvtListener :
 	public CComObjectRootEx<CComSingleThreadModel>,
 	public CComCoClass<CEvtListener, &CLSID_EvtListener>,
 	public IDispatchImpl<IEvtListener, &IID_IEvtListener, &LIBID_EVENTLISTENERLib>
diff --git a/main/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h b/main/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h
index 9653a12a06..7a1788fb0f 100644
--- a/main/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h
+++ b/main/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 // stdafx.h : include file for standard system include files,
diff --git a/main/extensions/test/ole/EventListenerSample/EventListener/resource.h b/main/extensions/test/ole/EventListenerSample/EventListener/resource.h
index b15786a517..3c495f5fb9 100644
--- a/main/extensions/test/ole/EventListenerSample/EventListener/resource.h
+++ b/main/extensions/test/ole/EventListenerSample/EventListener/resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 //{{NO_DEPENDENCIES}}
@@ -27,7 +27,7 @@
 #define IDR_EVTLISTENER                 101
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        201
diff --git a/main/extensions/test/ole/MfcControl/MfcControl.h b/main/extensions/test/ole/MfcControl/MfcControl.h
index f548241a53..767af66939 100644
--- a/main/extensions/test/ole/MfcControl/MfcControl.h
+++ b/main/extensions/test/ole/MfcControl/MfcControl.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #if !defined(AFX_MFCCONTROL_H__AC221FBC_A0D8_11D4_833B_005004526AB4__INCLUDED_)
diff --git a/main/extensions/test/ole/MfcControl/MfcControlCtl.h b/main/extensions/test/ole/MfcControl/MfcControlCtl.h
index 775699f975..8e6d676eec 100644
--- a/main/extensions/test/ole/MfcControl/MfcControlCtl.h
+++ b/main/extensions/test/ole/MfcControl/MfcControlCtl.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #if !defined(AFX_MFCCONTROLCTL_H__AC221FC3_A0D8_11D4_833B_005004526AB4__INCLUDED_)
diff --git a/main/extensions/test/ole/MfcControl/MfcControlPpg.h b/main/extensions/test/ole/MfcControl/MfcControlPpg.h
index 797b9a8a27..f18fc9c5f2 100644
--- a/main/extensions/test/ole/MfcControl/MfcControlPpg.h
+++ b/main/extensions/test/ole/MfcControl/MfcControlPpg.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #if !defined(AFX_MFCCONTROLPPG_H__AC221FC5_A0D8_11D4_833B_005004526AB4__INCLUDED_)
diff --git a/main/extensions/test/ole/MfcControl/Resource.h b/main/extensions/test/ole/MfcControl/Resource.h
index 4a5b06c684..fa47edd183 100644
--- a/main/extensions/test/ole/MfcControl/Resource.h
+++ b/main/extensions/test/ole/MfcControl/Resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 //{{NO_DEPENDENCIES}}
diff --git a/main/extensions/test/ole/OleConverterVar1/smartarray.h b/main/extensions/test/ole/OleConverterVar1/smartarray.h
index 179742f217..a603421ef0 100644
--- a/main/extensions/test/ole/OleConverterVar1/smartarray.h
+++ b/main/extensions/test/ole/OleConverterVar1/smartarray.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -37,14 +37,14 @@ public:
 		rgsabound[0].cElements= count;
 		rgsabound[0].lLbound= 0;
 		m_array= SafeArrayCreate( destVartype, 1, rgsabound);
-		SafeArrayLock( m_array);	
-		
+		SafeArrayLock( m_array);
+
 		void* pData;
 		if( m_array && (SUCCEEDED( SafeArrayAccessData( m_array, (void**)&pData)) ) )
 		{
 
 			for( int i=0; i< count; i++)
-			{	
+			{
 				CComVariant varSource( parParams[i]);
 				switch (destVartype)
 				{
@@ -140,7 +140,7 @@ public:
 		}
 		SafeArrayUnaccessData( m_array);
 	}
-	~SmartArray(){ 
+	~SmartArray(){
 		SafeArrayUnlock( m_array);
 		SafeArrayDestroy( m_array );
 	}
@@ -157,7 +157,7 @@ class SmartArray<IUnknown*>
 	SAFEARRAY *m_array;
 public:
 
-	SmartArray( sourceType * parParams, int count, VARTYPE destVartype); 
+	SmartArray( sourceType * parParams, int count, VARTYPE destVartype);
 //	{
 //		ATLTRACE("SmartArray<IUnknown>");
 //		HRESULT hr= S_OK;
@@ -165,14 +165,14 @@ public:
 //		rgsabound[0].cElements= count;
 //		rgsabound[0].lLbound= 0;
 //		m_array= SafeArrayCreateVector( VT_UNKNOWN, 0, count);
-//		SafeArrayLock( m_array);	
-//		
+//		SafeArrayLock( m_array);
+//
 //		IUnknown* *pData;
 //		if( m_array && (SUCCEEDED( SafeArrayAccessData( m_array, (void**)&pData)) ) )
 //		{
 //
 //			for( int i=0; i< count; i++)
-//			{	
+//			{
 //				CComVariant varSource( parParams[i]);
 //				switch (destVartype)
 //				{
@@ -194,7 +194,7 @@ public:
 //		}
 //		SafeArrayUnaccessData( m_array);
 //	}
-	~SmartArray(){ 
+	~SmartArray(){
 		SafeArrayUnlock( m_array);
 		SafeArrayDestroy( m_array );
 	}
@@ -213,13 +213,13 @@ template <> SmartArray <IUnknown*>::SmartArray(sourceType * parParams, int count
 	rgsabound[0].cElements= count;
 	rgsabound[0].lLbound= 0;
 	m_array= SafeArrayCreateVector( VT_UNKNOWN, 0, count);
-	SafeArrayLock( m_array);	
-	
+	SafeArrayLock( m_array);
+
 	IUnknown* *pData;
 	if( m_array && (SUCCEEDED( SafeArrayAccessData( m_array, (void**)&pData)) ) )
 	{
 		for( int i=0; i< count; i++)
-		{	
+		{
 			pData[i]= parParams[i];
 			pData[i]->AddRef();
 		}
diff --git a/main/extensions/test/ole/unoTocomCalls/Test/StdAfx.h b/main/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
index ab6604670d..40b901f34c 100644
--- a/main/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
+++ b/main/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h
index c2a7a8e7b9..7a3d4a5edb 100644
--- a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h
+++ b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -29,7 +29,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CCallback
-class ATL_NO_VTABLE CCallback : 
+class ATL_NO_VTABLE CCallback :
 	public CComObjectRootEx<CComSingleThreadModel>,
 	public CComCoClass<CCallback, &CLSID_Callback>,
 	public IDispatchImpl<ICallback, &IID_ICallback, &LIBID_XCALLBACK_IMPLLib>
@@ -67,7 +67,7 @@ public:
 	STDMETHOD(inoutEnum)(/*[in,out]*/ long * inoutVal);
 	STDMETHOD(inoutStruct)(/*[in,out]*/ IDispatch** inoutVal);
 	STDMETHOD(inoutInterface)(/*[in,out]*/ IDispatch** ppdisp);
-	STDMETHOD(inoutValuesAll)( 
+	STDMETHOD(inoutValuesAll)(
             /* [out][in] */ IDispatch __RPC_FAR *__RPC_FAR *aXSimple,
             /* [out][in] */ IDispatch __RPC_FAR *__RPC_FAR *aStruct,
             /* [out][in] */ long __RPC_FAR *aEnum,
@@ -81,7 +81,7 @@ public:
             /* [out][in] */ unsigned char __RPC_FAR *aByte,
             /* [out][in] */ short __RPC_FAR *aShort,
             /* [out][in] */ long __RPC_FAR *aLong);
- 
+
 	STDMETHOD(outByte)( unsigned char* outByte);
 	STDMETHOD(outLong)(/*[out]*/ long* outLong);
 	STDMETHOD(outShort)(/*[out]*/ short *outShort);
@@ -94,7 +94,7 @@ public:
 	STDMETHOD(outSeqAny)(/*[out]*/LPSAFEARRAY* outSeq);
 	STDMETHOD(outEnum)(/*[out]*/ long* outEnum);
 	STDMETHOD(outStruct)(/*[out]*/ IDispatch** outStruct);
-	        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE outValuesAll( 
+	        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE outValuesAll(
             /* [out] */ IDispatch __RPC_FAR *__RPC_FAR *ppdisp,
             /* [out] */ IDispatch __RPC_FAR *__RPC_FAR *ppSimpleStruct,
             /* [out] */ long __RPC_FAR *aSimpleEnum,
@@ -111,15 +111,15 @@ public:
 //				);
 //
 //	STDMETHOD(outValuesAll)(
-//			/*[out]*/ IDispatch** ppdisp, 
-//			/*[out]*/ IUnknown** ppSimpleStruct, 
-//			/*[out]*/ long* aSimpleEnum, 
-//			/*[out]*/ VARIANT* ArrayAny, 
-//			/*[out]*/ VARIANT* varAny, 
-//			/*[out]*/ VARIANT_BOOL * aBool, 
-//			/*[out]*/ unsigned short* aChar, 
-//			/*[out]*/ BSTR* aString, /*[out]*/ float* aFloat, 
-//			/*[out]*/ double* aDouble, 
+//			/*[out]*/ IDispatch** ppdisp,
+//			/*[out]*/ IUnknown** ppSimpleStruct,
+//			/*[out]*/ long* aSimpleEnum,
+//			/*[out]*/ VARIANT* ArrayAny,
+//			/*[out]*/ VARIANT* varAny,
+//			/*[out]*/ VARIANT_BOOL * aBool,
+//			/*[out]*/ unsigned short* aChar,
+//			/*[out]*/ BSTR* aString, /*[out]*/ float* aFloat,
+//			/*[out]*/ double* aDouble,
 //			/*[out]*/ signed char* aByte, /*[out]*/ short* aShort, /*[out]*/long* aLong, /*[out]*/ unsigned short* aUShort, /*[out]*/ unsigned long* aULong);
 	STDMETHOD(outValuesMixed)(/*[in]*/ long val, /*[out]*/ long* pval, /*[in]*/ BSTR string);
 	STDMETHOD(outInterface)(/*[out]*/ IDispatch** ppdisp);
@@ -128,4 +128,3 @@ public:
 };
 
 #endif //__CALLBACK_H_
- 
diff --git a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h
index 8f4ea448d1..faac1379ba 100644
--- a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h
+++ b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -29,7 +29,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CSimple
-class ATL_NO_VTABLE CSimple : 
+class ATL_NO_VTABLE CSimple :
 	public CComObjectRootEx<CComSingleThreadModel>,
 	public CComCoClass<CSimple, &CLSID_Simple>,
 	public IDispatchImpl<ISimple, &IID_ISimple, &LIBID_XCALLBACK_IMPLLib>
@@ -50,7 +50,7 @@ END_COM_MAP()
 
 // ISimple
 public:
- 
+
 	STDMETHOD(get__implementedInterfaces)(/*[out, retval]*/ LPSAFEARRAY	*pVal);
 	STDMETHOD(func3)(/*[in]*/ BSTR message);
 	STDMETHOD(func2)(/*[in]*/ BSTR message);
diff --git a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
index c58fccd279..ebcd9fda49 100644
--- a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
+++ b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h
index c857ef7b4d..b05ac5acb7 100644
--- a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h
+++ b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -30,7 +30,7 @@
 #define IDR_SIMPLESTRUCT                103
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        201
diff --git a/main/fileaccess/inc/fileaccess/dllapi.h b/main/fileaccess/inc/fileaccess/dllapi.h
index 975277669e..e9c7446403 100644
--- a/main/fileaccess/inc/fileaccess/dllapi.h
+++ b/main/fileaccess/inc/fileaccess/dllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/filter/inc/filter/msfilter/msfilterdllapi.h b/main/filter/inc/filter/msfilter/msfilterdllapi.h
index 5a1382708f..4f7651111e 100644
--- a/main/filter/inc/filter/msfilter/msfilterdllapi.h
+++ b/main/filter/inc/filter/msfilter/msfilterdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/forms/source/xforms/warnings_guard_unicode_regex.h b/main/forms/source/xforms/warnings_guard_unicode_regex.h
index 10566e84ea..fd988f2141 100644
--- a/main/forms/source/xforms/warnings_guard_unicode_regex.h
+++ b/main/forms/source/xforms/warnings_guard_unicode_regex.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/formula/inc/formula/formuladllapi.h b/main/formula/inc/formula/formuladllapi.h
index fb6c279c89..2c9813264a 100644
--- a/main/formula/inc/formula/formuladllapi.h
+++ b/main/formula/inc/formula/formuladllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,23 +7,23 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
 #ifndef INCLUDED_FORMULADLLAPI_H
 #define INCLUDED_FORMULADLLAPI_H
-                                                                                                                             
+
 #include "sal/types.h"
 
 #if defined(FORMULA_DLLIMPLEMENTATION)
@@ -32,5 +32,5 @@
 #define FORMULA_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define FORMULA_DLLPRIVATE SAL_DLLPRIVATE
-                                                                                    
+
 #endif /* INCLUDED_FORMULADLLAPI_H */
diff --git a/main/fpicker/source/aqua/SalAquaConstants.h b/main/fpicker/source/aqua/SalAquaConstants.h
index c9c957c163..1fb8a4dc66 100644
--- a/main/fpicker/source/aqua/SalAquaConstants.h
+++ b/main/fpicker/source/aqua/SalAquaConstants.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/fpicker/source/win32/filepicker/afxres.h b/main/fpicker/source/win32/filepicker/afxres.h
index 57038f161a..4ad4195f5e 100644
--- a/main/fpicker/source/win32/filepicker/afxres.h
+++ b/main/fpicker/source/win32/filepicker/afxres.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #include <windows.h>
diff --git a/main/fpicker/source/win32/filepicker/platform_vista.h b/main/fpicker/source/win32/filepicker/platform_vista.h
index 55043775b6..7944ce7122 100644
--- a/main/fpicker/source/win32/filepicker/platform_vista.h
+++ b/main/fpicker/source/win32/filepicker/platform_vista.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/fpicker/source/win32/filepicker/platform_xp.h b/main/fpicker/source/win32/filepicker/platform_xp.h
index bc79ff306e..6caf33c2da 100644
--- a/main/fpicker/source/win32/filepicker/platform_xp.h
+++ b/main/fpicker/source/win32/filepicker/platform_xp.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/fpicker/source/win32/filepicker/resource.h b/main/fpicker/source/win32/filepicker/resource.h
index 2715913c2e..7ac1bae724 100644
--- a/main/fpicker/source/win32/filepicker/resource.h
+++ b/main/fpicker/source/win32/filepicker/resource.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 //{{NO_DEPENDENCIES}}
@@ -31,7 +31,7 @@
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        119
diff --git a/main/fpicker/source/win32/filepicker/vistatypes.h b/main/fpicker/source/win32/filepicker/vistatypes.h
index 9d03dc4ea2..ff5984c641 100644
--- a/main/fpicker/source/win32/filepicker/vistatypes.h
+++ b/main/fpicker/source/win32/filepicker/vistatypes.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/framework/inc/acceleratorconst.h b/main/framework/inc/acceleratorconst.h
index da89875d97..4da4c99baa 100644
--- a/main/framework/inc/acceleratorconst.h
+++ b/main/framework/inc/acceleratorconst.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -36,9 +36,9 @@
 // other includes
 
 namespace framework{
-    
+
 #define DOCTYPE_ACCELERATORS            DECLARE_ASCII("<!DOCTYPE accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"accelerator.dtd\">")
-    
+
 #define ATTRIBUTE_TYPE_CDATA		    DECLARE_ASCII("CDATA")
 
 #define XMLNS_ACCEL                     DECLARE_ASCII("accel")
@@ -68,7 +68,7 @@ namespace framework{
 // same items with full qualified name space
 #define NS_ELEMENT_ACCELERATORLIST      DECLARE_ASCII("http://openoffice.org/2001/accel^acceleratorlist")
 #define NS_ELEMENT_ITEM                 DECLARE_ASCII("http://openoffice.org/2001/accel^item"           )
-                       
+
 #define NS_XMLNS_ACCEL					DECLARE_ASCII("http://openoffice.org/2001/accel")
 #define NS_XMLNS_XLINK					DECLARE_ASCII("http://www.w3.org/1999/xlink"    )
 
diff --git a/main/framework/inc/arguments.h b/main/framework/inc/arguments.h
index 7df4d4ce82..d072a9d709 100644
--- a/main/framework/inc/arguments.h
+++ b/main/framework/inc/arguments.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/framework/inc/commands.h b/main/framework/inc/commands.h
index 6495d4f798..95c3a976ea 100644
--- a/main/framework/inc/commands.h
+++ b/main/framework/inc/commands.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/framework/inc/dispatchcommands.h b/main/framework/inc/dispatchcommands.h
index 59bd88ee18..0823b37e28 100644
--- a/main/framework/inc/dispatchcommands.h
+++ b/main/framework/inc/dispatchcommands.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/framework/inc/framework/fwedllapi.h b/main/framework/inc/framework/fwedllapi.h
index bd25a385c4..2c46183655 100644
--- a/main/framework/inc/framework/fwedllapi.h
+++ b/main/framework/inc/framework/fwedllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #ifndef INCLUDED_FWEDLLAPI_H
diff --git a/main/framework/inc/fwidllapi.h b/main/framework/inc/fwidllapi.h
index d5caeb43f1..5091473666 100644
--- a/main/framework/inc/fwidllapi.h
+++ b/main/framework/inc/fwidllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #ifndef INCLUDED_FWIDLLAPI_H
diff --git a/main/framework/inc/fwkdllapi.h b/main/framework/inc/fwkdllapi.h
index b37cb5604c..01adc5b67d 100644
--- a/main/framework/inc/fwkdllapi.h
+++ b/main/framework/inc/fwkdllapi.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 #ifndef INCLUDED_FWKDLLAPI_H
diff --git a/main/framework/inc/general.h b/main/framework/inc/general.h
index d24513858b..52530e86db 100644
--- a/main/framework/inc/general.h
+++ b/main/framework/inc/general.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -42,7 +42,7 @@
 //-----------------------------------------------------------------------------
 /** will make our code more readable if we can use such short name css instead
     of typing ::com::sun::star everytimes.
-    
+
     On the other side we had so many problems with "using namespace" so we don't use
     it here any longer.
  */
diff --git a/main/framework/inc/loadstate.h b/main/framework/inc/loadstate.h
index 6f05d66ba2..6a89226e73 100644
--- a/main/framework/inc/loadstate.h
+++ b/main/framework/inc/loadstate.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/framework/inc/mediadescriptor.h b/main/framework/inc/mediadescriptor.h
index 4bae306e60..fba041b06f 100644
--- a/main/framework/inc/mediadescriptor.h
+++ b/main/framework/inc/mediadescriptor.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/framework/inc/properties.h b/main/framework/inc/properties.h
index 8ad6eb2a6c..5cdc13d59c 100644
--- a/main/framework/inc/properties.h
+++ b/main/framework/inc/properties.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/framework/inc/protocols.h b/main/framework/inc/protocols.h
index 9914d02a1a..dee9870085 100644
--- a/main/framework/inc/protocols.h
+++ b/main/framework/inc/protocols.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -142,7 +142,7 @@ class ProtocolCheck
             case E_SERVICE           : return (sURL.compareTo(SPECIALPROTOCOL_SERVICE        ,SPECIALPROTOCOL_SERVICE.getLength()        ) == 0);
             case E_MAILTO            : return (sURL.compareTo(SPECIALPROTOCOL_MAILTO         ,SPECIALPROTOCOL_MAILTO.getLength()         ) == 0);
             case E_NEWS              : return (sURL.compareTo(SPECIALPROTOCOL_NEWS           ,SPECIALPROTOCOL_NEWS.getLength()           ) == 0);
-            default                  : return sal_False;            
+            default                  : return sal_False;
         }
         return sal_False;
     }
diff --git a/main/framework/inc/queries.h b/main/framework/inc/queries.h
index e2c21f4751..417041b2b4 100644
--- a/main/framework/inc/queries.h
+++ b/main/framework/inc/queries.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/framework/inc/services.h b/main/framework/inc/services.h
index 348e8236ac..d8b6932498 100644
--- a/main/framework/inc/services.h
+++ b/main/framework/inc/services.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
diff --git a/main/framework/inc/stdtypes.h b/main/framework/inc/stdtypes.h
index 017371bf43..27f113f5d5 100644
--- a/main/framework/inc/stdtypes.h
+++ b/main/framework/inc/stdtypes.h
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -122,7 +122,7 @@ class OUStringList : public ::comphelper::SequenceAsVector< ::rtl::OUString >
         {
             return ::std::find(begin(), end(), sElement);
         }
... 20784 lines suppressed ...