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 22:14:56 UTC

(openoffice) branch trunk updated: pre-commit auto remove trailing whitespace from XML files (#384)

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new b3b486c6f1 pre-commit auto remove trailing whitespace from XML files (#384)
b3b486c6f1 is described below

commit b3b486c6f12b7baba6a5d71c7012f6454f487e5a
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Fri Jul 25 08:14:52 2025 +1000

    pre-commit auto remove trailing whitespace from XML files (#384)
    
    Auto cleaned up all the XML files for unneeded trailing whitespace.
    
    Around 8k lines changed a smaller whitespace PR this time
---
 .pre-commit-config.yaml                            |    2 +-
 .../java/java_uno_accessbridge/build.xml           |    8 +-
 main/animations/source/animcore/animcore.xml       |   10 +-
 main/avmedia/source/framework/soundhandler.xml     |    8 +-
 main/basctl/uiconfig/basicide/menubar/menubar.xml  |    8 +-
 .../uiconfig/basicide/statusbar/statusbar.xml      |    8 +-
 .../basctl/uiconfig/basicide/toolbar/dialogbar.xml |    8 +-
 .../uiconfig/basicide/toolbar/fullscreenbar.xml    |    8 +-
 .../basicide/toolbar/insertcontrolsbar.xml         |    8 +-
 main/basctl/uiconfig/basicide/toolbar/macrobar.xml |    8 +-
 .../uiconfig/basicide/toolbar/standardbar.xml      |    8 +-
 .../uiconfig/basicide/toolbar/translationbar.xml   |    8 +-
 main/basctl/util/basctl.xml                        |   10 +-
 main/bean/java/officebean/build.xml                |   10 +-
 main/bridges/java/java_uno/build.xml               |   10 +-
 main/chart2/uiconfig/accelerator/en-US/default.xml |    8 +-
 main/chart2/uiconfig/menubar/menubar.xml           |   10 +-
 main/chart2/uiconfig/statusbar/statusbar.xml       |    8 +-
 main/chart2/uiconfig/toolbar/arrowshapes.xml       |    8 +-
 main/chart2/uiconfig/toolbar/basicshapes.xml       |    8 +-
 main/chart2/uiconfig/toolbar/calloutshapes.xml     |    8 +-
 main/chart2/uiconfig/toolbar/drawbar.xml           |    8 +-
 main/chart2/uiconfig/toolbar/flowchartshapes.xml   |    8 +-
 main/chart2/uiconfig/toolbar/standardbar.xml       |    8 +-
 main/chart2/uiconfig/toolbar/starshapes.xml        |    8 +-
 main/chart2/uiconfig/toolbar/symbolshapes.xml      |    8 +-
 main/chart2/uiconfig/toolbar/toolbar.xml           |    8 +-
 main/codemaker/test/javamaker/build.xml            |    8 +-
 main/connectivity/java/dbtools/build.xml           |    8 +-
 main/connectivity/java/sdbc_hsqldb/build.xml       |    8 +-
 main/connectivity/java/sdbc_jdbc/build.xml         |    8 +-
 main/connectivity/java/sdbc_jdbc/jdbc.xml          |   10 +-
 main/connectivity/java/sdbc_postgresql/build.xml   |    8 +-
 main/connectivity/source/cpool/dbpool.xml          |   10 +-
 main/connectivity/source/dbtools/dbt.xml           |    8 +-
 main/connectivity/source/drivers/adabas/adabas.xml |   10 +-
 main/connectivity/source/drivers/ado/ado.xml       |   10 +-
 .../source/drivers/calc/CalcDriver.xml             |    8 +-
 main/connectivity/source/drivers/dbase/dbase.xml   |    8 +-
 main/connectivity/source/drivers/evoab2/evoab.xml  |    8 +-
 main/connectivity/source/drivers/file/file.xml     |    8 +-
 main/connectivity/source/drivers/flat/flat.xml     |    8 +-
 main/connectivity/source/drivers/hsqldb/hsqldb.xml |   10 +-
 main/connectivity/source/drivers/jdbc/jdbc.xml     |   10 +-
 main/connectivity/source/drivers/macab/macab.xml   |   12 +-
 main/connectivity/source/drivers/mysql/mysql.xml   |   10 +-
 main/connectivity/source/drivers/odbc/odbc.xml     |   10 +-
 .../test/cfg_data/instance/uno/components.xml      |   24 +-
 .../test/cfg_data/template/uno/components.xml      |    8 +-
 main/dbaccess/prj/dba.xml                          |    8 +-
 main/dbaccess/prj/dbu.xml                          |   10 +-
 main/dbaccess/uiconfig/dbapp/menubar/menubar.xml   |    8 +-
 .../uiconfig/dbapp/statusbar/statusbar.xml         |    8 +-
 .../uiconfig/dbapp/toolbar/formobjectbar.xml       |    8 +-
 .../uiconfig/dbapp/toolbar/queryobjectbar.xml      |    8 +-
 .../uiconfig/dbapp/toolbar/reportobjectbar.xml     |    8 +-
 .../uiconfig/dbapp/toolbar/tableobjectbar.xml      |    8 +-
 main/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml   |    8 +-
 .../dbaccess/uiconfig/dbbrowser/menubar/compat.xml |    8 +-
 .../uiconfig/dbbrowser/toolbar/toolbar.xml         |    8 +-
 main/dbaccess/uiconfig/dbquery/menubar/menubar.xml |    8 +-
 .../uiconfig/dbquery/toolbar/designobjectbar.xml   |    8 +-
 .../uiconfig/dbquery/toolbar/sqlobjectbar.xml      |    8 +-
 main/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml |    8 +-
 .../uiconfig/dbrelation/menubar/menubar.xml        |    8 +-
 .../uiconfig/dbrelation/toolbar/toolbar.xml        |    8 +-
 main/dbaccess/uiconfig/dbtable/menubar/menubar.xml |    8 +-
 main/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml |    8 +-
 main/dbaccess/uiconfig/dbtdata/menubar/menubar.xml |    8 +-
 main/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml |    8 +-
 .../desktop/test/deployment/active/description.xml |    8 +-
 main/desktop/test/deployment/active/manifest.xml   |    8 +-
 main/desktop/test/deployment/boxt/description.xml  |    8 +-
 main/desktop/test/deployment/boxt/manifest.xml     |    8 +-
 .../test/deployment/locationtest/description.xml   |   12 +-
 .../test/deployment/locationtest/manifest.xml      |    8 +-
 .../test/deployment/passive/description.xml        |    8 +-
 main/desktop/test/deployment/passive/manifest.xml  |    8 +-
 .../update1/change1.update.xml                     |   10 +-
 .../update2/change1.update.xml                     |   10 +-
 .../update/default_url/update/default1.update.xml  |   10 +-
 .../update/default_url/update/default2.update.xml  |   10 +-
 .../deployment/update/default_url/update/feed1.xml |    8 +-
 .../update/defect/update/fail1.update.xml          |   10 +-
 .../update/defect/update/fail2.update.xml          |   10 +-
 .../update/defect/update/fail3.update.xml          |   10 +-
 .../update/defect/update/fail4.update.xml          |   10 +-
 .../update/defect/update/info3.update.xml          |   10 +-
 .../update/update-dependencies.update.xml          |   12 +-
 .../update/license/update/lic1.update.xml          |   10 +-
 .../update/license/update/lic2.update.xml          |   10 +-
 .../update/license/update/lic3.update.xml          |   10 +-
 .../update/publisher/update/pub1.update.xml        |   18 +-
 .../update/publisher/update/pub2.update.xml        |   18 +-
 .../update/publisher/update/pub3.update.xml        |   18 +-
 .../update/publisher/update/pub4.update.xml        |   18 +-
 .../update/publisher/update/pub5.update.xml        |   18 +-
 .../update/publisher/update/pub6.update.xml        |   16 +-
 .../update/publisher/update/pub7.update.xml        |   16 +-
 .../update/simple/update/plain1.update.xml         |   10 +-
 .../update/simple/update/plain2.update.xml         |   10 +-
 .../update/simple/update/plain3.update.xml         |   10 +-
 .../update/updatefeed/update/feed1.update.xml      |   10 +-
 .../deployment/update/updatefeed/update/feed1.xml  |    8 +-
 .../update/updatefeed/update/feed2.update.xml      |   10 +-
 .../updateinfocreation/build/description.xml       |   12 +-
 .../update/updateinfocreation/build/manifest.xml   |    8 +-
 .../update/website_update/update/web1.update.xml   |   10 +-
 .../update/website_update/update/web2.update.xml   |   10 +-
 .../update/website_update/update/web3.update.xml   |   10 +-
 .../update/website_update/update/web4.update.xml   |   10 +-
 .../update/website_update/update/web5.update.xml   |   10 +-
 .../website_update/update/web6/description.xml     |   12 +-
 .../website_update/update/web7/description.xml     |   14 +-
 .../update/wrong_url/update/url1.update.xml        |   10 +-
 .../update/wrong_url/update/url2.update.xml        |   10 +-
 .../wrong_url/update/wrongdownload1.update.xml     |   10 +-
 .../wrong_url/update/wrongdownload2.update.xml     |   10 +-
 .../wrong_url/update/wrongdownload3.update.xml     |   10 +-
 main/dtrans/source/cnttype/mcnttype.xml            |    8 +-
 main/dtrans/source/generic/dtrans.xml              |    8 +-
 main/dtrans/source/os2/clipb/sysdtrans.xml         |    8 +-
 main/dtrans/source/win32/clipb/sysdtrans.xml       |    8 +-
 main/dtrans/source/win32/dnd/dnd.xml               |    8 +-
 main/dtrans/source/win32/ftransl/ftransl.xml       |    8 +-
 .../uiconfig/sbibliography/menubar/menubar.xml     |    8 +-
 .../source/macosx/spotlight/mdimporter/schema.xml  |   12 +-
 main/extensions/source/propctrlr/pcr.xml           |    8 +-
 main/extensions/source/update/check/updchk.xml     |   12 +-
 main/extensions/source/update/feed/updatefeed.xml  |   14 +-
 main/extensions/source/update/ui/updchkui.xml      |   12 +-
 main/fileaccess/source/fileacc.xml                 |    8 +-
 main/filter/source/placeware/placeware.xml         |    8 +-
 main/forms/util/frm.xml                            |    8 +-
 main/formula/prj/for.xml                           |    8 +-
 main/fpicker/source/aqua/fps_aqua.xml              |    8 +-
 main/fpicker/source/unx/gnome/fps_gnome.xml        |   20 +-
 main/fpicker/source/unx/kde4/fps_kde4.xml          |   16 +-
 main/fpicker/source/win32/filepicker/fps.xml       |   16 +-
 main/fpicker/source/win32/folderpicker/fop.xml     |   20 +-
 main/framework/source/unotypes/fwk.xml             |   24 +-
 main/framework/source/unotypes/fwl.xml             |    8 +-
 main/framework/source/unotypes/lgd.xml             |    8 +-
 .../uiconfig/startmodule/statusbar/statusbar.xml   |    8 +-
 .../uiconfig/startmodule/toolbar/standardbar.xml   |    8 +-
 main/framework/util/lgd.xml                        |    8 +-
 main/helpauthoring/META-INF/manifest.xml           |    8 +-
 main/i18npool/source/localedata/data/af_NA.xml     |    8 +-
 main/i18npool/source/localedata/data/af_ZA.xml     |    8 +-
 main/i18npool/source/localedata/data/ak_GH.xml     |    8 +-
 main/i18npool/source/localedata/data/am_ET.xml     |    8 +-
 main/i18npool/source/localedata/data/ar_DZ.xml     |    8 +-
 main/i18npool/source/localedata/data/ar_EG.xml     |    8 +-
 main/i18npool/source/localedata/data/ar_LB.xml     |    8 +-
 main/i18npool/source/localedata/data/ar_OM.xml     |    8 +-
 main/i18npool/source/localedata/data/ar_SA.xml     |    8 +-
 main/i18npool/source/localedata/data/ar_TN.xml     |    8 +-
 main/i18npool/source/localedata/data/ast_ES.xml    |    8 +-
 main/i18npool/source/localedata/data/az_AZ.xml     |    8 +-
 main/i18npool/source/localedata/data/be_BY.xml     |    8 +-
 main/i18npool/source/localedata/data/bg_BG.xml     |    8 +-
 main/i18npool/source/localedata/data/bn_BD.xml     |    8 +-
 main/i18npool/source/localedata/data/bn_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/br_FR.xml     |    8 +-
 main/i18npool/source/localedata/data/bs_BA.xml     |    8 +-
 main/i18npool/source/localedata/data/ca_ES.xml     |    8 +-
 main/i18npool/source/localedata/data/cs_CZ.xml     |    8 +-
 main/i18npool/source/localedata/data/cv_RU.xml     |    8 +-
 main/i18npool/source/localedata/data/cy_GB.xml     |    8 +-
 main/i18npool/source/localedata/data/da_DK.xml     |    8 +-
 main/i18npool/source/localedata/data/de_AT.xml     |    8 +-
 main/i18npool/source/localedata/data/de_CH.xml     |    8 +-
 main/i18npool/source/localedata/data/de_DE.xml     |    8 +-
 main/i18npool/source/localedata/data/de_LI.xml     |    8 +-
 main/i18npool/source/localedata/data/de_LU.xml     |    8 +-
 main/i18npool/source/localedata/data/dsb_DE.xml    |    8 +-
 main/i18npool/source/localedata/data/dz_BT.xml     |   12 +-
 main/i18npool/source/localedata/data/ee_GH.xml     |    8 +-
 main/i18npool/source/localedata/data/el_GR.xml     |    8 +-
 main/i18npool/source/localedata/data/en_AU.xml     |    8 +-
 main/i18npool/source/localedata/data/en_BZ.xml     |    8 +-
 main/i18npool/source/localedata/data/en_CA.xml     |    8 +-
 main/i18npool/source/localedata/data/en_GB.xml     |    8 +-
 main/i18npool/source/localedata/data/en_GH.xml     |    8 +-
 main/i18npool/source/localedata/data/en_IE.xml     |    8 +-
 main/i18npool/source/localedata/data/en_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/en_JM.xml     |    8 +-
 main/i18npool/source/localedata/data/en_NA.xml     |    8 +-
 main/i18npool/source/localedata/data/en_NZ.xml     |    8 +-
 main/i18npool/source/localedata/data/en_PH.xml     |    8 +-
 main/i18npool/source/localedata/data/en_TT.xml     |    8 +-
 main/i18npool/source/localedata/data/en_US.xml     |    8 +-
 main/i18npool/source/localedata/data/en_ZA.xml     |    8 +-
 main/i18npool/source/localedata/data/en_ZW.xml     |    8 +-
 main/i18npool/source/localedata/data/eo.xml        |    8 +-
 main/i18npool/source/localedata/data/es_AR.xml     |    8 +-
 main/i18npool/source/localedata/data/es_BO.xml     |    8 +-
 main/i18npool/source/localedata/data/es_CL.xml     |    8 +-
 main/i18npool/source/localedata/data/es_CO.xml     |    8 +-
 main/i18npool/source/localedata/data/es_CR.xml     |    8 +-
 main/i18npool/source/localedata/data/es_DO.xml     |    8 +-
 main/i18npool/source/localedata/data/es_EC.xml     |    8 +-
 main/i18npool/source/localedata/data/es_ES.xml     |    8 +-
 main/i18npool/source/localedata/data/es_GT.xml     |    8 +-
 main/i18npool/source/localedata/data/es_HN.xml     |    8 +-
 main/i18npool/source/localedata/data/es_MX.xml     |    8 +-
 main/i18npool/source/localedata/data/es_NI.xml     |    8 +-
 main/i18npool/source/localedata/data/es_PA.xml     |    8 +-
 main/i18npool/source/localedata/data/es_PE.xml     |    8 +-
 main/i18npool/source/localedata/data/es_PR.xml     |    8 +-
 main/i18npool/source/localedata/data/es_PY.xml     |    8 +-
 main/i18npool/source/localedata/data/es_SV.xml     |    8 +-
 main/i18npool/source/localedata/data/es_UY.xml     |    8 +-
 main/i18npool/source/localedata/data/es_VE.xml     |    8 +-
 main/i18npool/source/localedata/data/et_EE.xml     |    8 +-
 main/i18npool/source/localedata/data/eu.xml        |    8 +-
 main/i18npool/source/localedata/data/fa_IR.xml     |   10 +-
 main/i18npool/source/localedata/data/fi_FI.xml     |    8 +-
 main/i18npool/source/localedata/data/fo_FO.xml     |    8 +-
 main/i18npool/source/localedata/data/fr_BE.xml     |    8 +-
 main/i18npool/source/localedata/data/fr_CA.xml     |    8 +-
 main/i18npool/source/localedata/data/fr_CH.xml     |    8 +-
 main/i18npool/source/localedata/data/fr_FR.xml     |    8 +-
 main/i18npool/source/localedata/data/fr_LU.xml     |    8 +-
 main/i18npool/source/localedata/data/fr_MC.xml     |    8 +-
 main/i18npool/source/localedata/data/fur_IT.xml    |    8 +-
 main/i18npool/source/localedata/data/fy_NL.xml     |    8 +-
 main/i18npool/source/localedata/data/ga_IE.xml     |    8 +-
 main/i18npool/source/localedata/data/gl_ES.xml     |    8 +-
 main/i18npool/source/localedata/data/gsc_FR.xml    |    8 +-
 main/i18npool/source/localedata/data/gu_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/gug_PY.xml    |    8 +-
 main/i18npool/source/localedata/data/ha_GH.xml     |    8 +-
 main/i18npool/source/localedata/data/haw_US.xml    |    8 +-
 main/i18npool/source/localedata/data/he_IL.xml     |    8 +-
 main/i18npool/source/localedata/data/hi_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/hil_PH.xml    |    8 +-
 main/i18npool/source/localedata/data/hr_HR.xml     |    8 +-
 main/i18npool/source/localedata/data/hsb_DE.xml    |    8 +-
 main/i18npool/source/localedata/data/ht_HT.xml     |    8 +-
 main/i18npool/source/localedata/data/hu_HU.xml     |    8 +-
 main/i18npool/source/localedata/data/hy_AM.xml     |    8 +-
 main/i18npool/source/localedata/data/ia.xml        |    8 +-
 main/i18npool/source/localedata/data/id_ID.xml     |    8 +-
 main/i18npool/source/localedata/data/is_IS.xml     |    8 +-
 main/i18npool/source/localedata/data/it_CH.xml     |    8 +-
 main/i18npool/source/localedata/data/it_IT.xml     |    8 +-
 main/i18npool/source/localedata/data/ja_JP.xml     |    8 +-
 main/i18npool/source/localedata/data/jbo.xml       |    8 +-
 main/i18npool/source/localedata/data/ka_GE.xml     |    8 +-
 main/i18npool/source/localedata/data/kab_DZ.xml    |    8 +-
 main/i18npool/source/localedata/data/kk_KZ.xml     |    8 +-
 main/i18npool/source/localedata/data/kl_GL.xml     |    8 +-
 main/i18npool/source/localedata/data/km_KH.xml     |    8 +-
 main/i18npool/source/localedata/data/kn_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/ko_KR.xml     |    8 +-
 main/i18npool/source/localedata/data/ku_TR.xml     |    8 +-
 main/i18npool/source/localedata/data/ky_KG.xml     |    8 +-
 main/i18npool/source/localedata/data/la_VA.xml     |    8 +-
 main/i18npool/source/localedata/data/lb_LU.xml     |    8 +-
 main/i18npool/source/localedata/data/lg_UG.xml     |    8 +-
 main/i18npool/source/localedata/data/lif_NP.xml    |    8 +-
 main/i18npool/source/localedata/data/ln_CD.xml     |    8 +-
 main/i18npool/source/localedata/data/lo_LA.xml     |    8 +-
 main/i18npool/source/localedata/data/lt_LT.xml     |    8 +-
 main/i18npool/source/localedata/data/mai_IN.xml    |    8 +-
 main/i18npool/source/localedata/data/mk_MK.xml     |    8 +-
 main/i18npool/source/localedata/data/ml_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/mn_MN.xml     |    8 +-
 main/i18npool/source/localedata/data/mr_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/ms_MY.xml     |    8 +-
 main/i18npool/source/localedata/data/mt_MT.xml     |    8 +-
 main/i18npool/source/localedata/data/my_MM.xml     |    8 +-
 main/i18npool/source/localedata/data/nb_NO.xml     |    8 +-
 main/i18npool/source/localedata/data/ne_NP.xml     |    8 +-
 main/i18npool/source/localedata/data/nl_BE.xml     |    8 +-
 main/i18npool/source/localedata/data/nl_NL.xml     |    8 +-
 main/i18npool/source/localedata/data/nn_NO.xml     |    8 +-
 main/i18npool/source/localedata/data/no_NO.xml     |    8 +-
 main/i18npool/source/localedata/data/nr_ZA.xml     |    8 +-
 main/i18npool/source/localedata/data/nso_ZA.xml    |    8 +-
 main/i18npool/source/localedata/data/oc_FR.xml     |    8 +-
 main/i18npool/source/localedata/data/om_ET.xml     |    8 +-
 main/i18npool/source/localedata/data/or_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/pa_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/pl_PL.xml     |    8 +-
 main/i18npool/source/localedata/data/plt_MG.xml    |    8 +-
 main/i18npool/source/localedata/data/pt_BR.xml     |    8 +-
 main/i18npool/source/localedata/data/pt_PT.xml     |    8 +-
 main/i18npool/source/localedata/data/ro_RO.xml     |    8 +-
 main/i18npool/source/localedata/data/ru_RU.xml     |    8 +-
 main/i18npool/source/localedata/data/rue_SK.xml    |    8 +-
 main/i18npool/source/localedata/data/rw_RW.xml     |    8 +-
 main/i18npool/source/localedata/data/sc_IT.xml     |    8 +-
 main/i18npool/source/localedata/data/sg_CF.xml     |    8 +-
 main/i18npool/source/localedata/data/sh_ME.xml     |    8 +-
 main/i18npool/source/localedata/data/sh_RS.xml     |    8 +-
 main/i18npool/source/localedata/data/sh_YU.xml     |    8 +-
 main/i18npool/source/localedata/data/shs_CA.xml    |    8 +-
 main/i18npool/source/localedata/data/sk_SK.xml     |    8 +-
 main/i18npool/source/localedata/data/sl_SI.xml     |    8 +-
 main/i18npool/source/localedata/data/so_SO.xml     |    8 +-
 main/i18npool/source/localedata/data/sr_ME.xml     |    8 +-
 main/i18npool/source/localedata/data/sr_RS.xml     |    8 +-
 main/i18npool/source/localedata/data/sr_YU.xml     |    8 +-
 main/i18npool/source/localedata/data/ss_ZA.xml     |    8 +-
 main/i18npool/source/localedata/data/st_ZA.xml     |    8 +-
 main/i18npool/source/localedata/data/sv_FI.xml     |    8 +-
 main/i18npool/source/localedata/data/sw_TZ.xml     |    8 +-
 main/i18npool/source/localedata/data/ta_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/te_IN.xml     |    8 +-
 main/i18npool/source/localedata/data/tg_TJ.xml     |    8 +-
 main/i18npool/source/localedata/data/th_TH.xml     |    8 +-
 main/i18npool/source/localedata/data/ti_ER.xml     |    8 +-
 main/i18npool/source/localedata/data/tk_TM.xml     |    8 +-
 main/i18npool/source/localedata/data/tn_ZA.xml     |    8 +-
 main/i18npool/source/localedata/data/tpi_PG.xml    |    8 +-
 main/i18npool/source/localedata/data/tr_TR.xml     |    8 +-
 main/i18npool/source/localedata/data/ts_ZA.xml     |    8 +-
 main/i18npool/source/localedata/data/ug_CN.xml     |    8 +-
 main/i18npool/source/localedata/data/uk_UA.xml     |    8 +-
 main/i18npool/source/localedata/data/ur_PK.xml     |    8 +-
 main/i18npool/source/localedata/data/uz_UZ.xml     |    8 +-
 main/i18npool/source/localedata/data/ve_ZA.xml     |    8 +-
 main/i18npool/source/localedata/data/vi_VN.xml     |    8 +-
 main/i18npool/source/localedata/data/wa_BE.xml     |    8 +-
 main/i18npool/source/localedata/data/xh_ZA.xml     |    8 +-
 main/i18npool/source/localedata/data/yi_US.xml     |    8 +-
 main/i18npool/source/localedata/data/zh_CN.xml     |    8 +-
 main/i18npool/source/localedata/data/zh_HK.xml     |    8 +-
 main/i18npool/source/localedata/data/zh_MO.xml     |    8 +-
 main/i18npool/source/localedata/data/zh_SG.xml     |    8 +-
 main/i18npool/source/localedata/data/zh_TW.xml     |    8 +-
 main/i18npool/source/localedata/data/zu_ZA.xml     |    8 +-
 main/i18npool/xml/BreakIterator.xml                |    8 +-
 main/i18npool/xml/Calendar.xml                     |    8 +-
 main/i18npool/xml/ChapterCollator.xml              |    8 +-
 main/i18npool/xml/CharacterClassification.xml      |    8 +-
 main/i18npool/xml/Collator.xml                     |    8 +-
 main/i18npool/xml/DefaultNumberingProvider.xml     |    8 +-
 main/i18npool/xml/IndexEntrySupplier.xml           |    8 +-
 main/i18npool/xml/LocaleData.xml                   |    8 +-
 main/i18npool/xml/NumberFormatCodeMapper.xml       |    8 +-
 main/i18npool/xml/OrdinalSuffix.xml                |    8 +-
 main/i18npool/xml/TextSearch.xml                   |    8 +-
 main/i18npool/xml/Transliteration.xml              |    8 +-
 main/instsetoo_native/data/releases.xml            |    8 +-
 main/instsetoo_native/util/update.xml              |    8 +-
 main/io/source/acceptor/acceptor.xml               |    8 +-
 main/io/source/connector/connectr.xml              |    8 +-
 main/io/source/stm/stm.xml                         |   10 +-
 main/javainstaller2/build.xml                      |   28 +-
 main/javainstaller2/nbproject/private/private.xml  |    8 +-
 main/javainstaller2/nbproject/project.xml          |    8 +-
 main/jurt/java/jurt-test/build.xml                 |    8 +-
 main/jurt/java/jurt/build.xml                      |    8 +-
 .../OpenOfficeorg/javavendors_freebsd.xml          |   14 +-
 .../OpenOfficeorg/javavendors_linux.xml            |    8 +-
 .../OpenOfficeorg/javavendors_macosx.xml           |    8 +-
 .../OpenOfficeorg/javavendors_os2.xml              |    8 +-
 .../OpenOfficeorg/javavendors_template.xml         |   16 +-
 .../OpenOfficeorg/javavendors_unx.xml              |   12 +-
 .../OpenOfficeorg/javavendors_wnt.xml              |    8 +-
 main/jvmfwk/java/jreproperties/build.xml           |    8 +-
 main/jvmfwk/source/javasettings_template.xml       |   12 +-
 main/jvmfwk/source/javasettingsunopkginstall.xml   |    8 +-
 main/l10ntools/java/jpropex/build.xml              |    8 +-
 main/l10ntools/java/l10nconv/build.xml             |    8 +-
 main/l10ntools/java/receditor/build.xml            |    8 +-
 main/l10ntools/layout/zoom.xml                     |    8 +-
 main/linguistic/xml/linguistic.xml                 |    8 +-
 main/mysqlc/source/description.xml                 |   14 +-
 main/mysqlc/source/manifest.xml                    |    8 +-
 main/mysqlc/source/mysqlc.xml                      |   12 +-
 .../Components/SimpleLicense/description.xml       |   10 +-
 .../DialogWithHelp/META-INF/manifest.xml           |    8 +-
 .../Extensions/DialogWithHelp/description.xml      |    8 +-
 .../FirstSteps/build_FirstUnoContact.xml           |   22 +-
 .../FlatXmlFilter_cpp/FlatXmlFilter_cpp.uno.xml    |   10 +-
 .../SayHello/META-INF/manifest.xml                 |    8 +-
 .../SayHello/SayHello/parcel-descriptor.xml        |    8 +-
 .../ScriptingFramework/SayHello/build.xml          |   14 +-
 .../ScriptSelector/META-INF/manifest.xml           |    8 +-
 .../ScriptSelector/parcel-descriptor.xml           |    8 +-
 .../ScriptingFramework/ScriptSelector/build.xml    |   14 +-
 main/odk/examples/cpp/custompanel/description.xml  |    8 +-
 main/odk/examples/cpp/custompanel/manifest.xml     |    8 +-
 main/odk/examples/java/ConverterServlet/web.xml    |    8 +-
 .../MinimalComponent/BuildMinimalComponent.xml     |    8 +-
 main/oox/source/export/presetShapeDefinitions.xml  |    8 +-
 .../source/export/presetTextWarpDefinitions.xml    |    8 +-
 main/qadevOOo/java/OOoRunner/build.xml             |    8 +-
 main/qadevOOo/java/OOoRunnerLight/build.xml        |    8 +-
 .../source/unourl_resolver/uuresolver.xml          |    8 +-
 .../sun/star/report/pentaho/styles/stylemapper.xml |    8 +-
 main/reportbuilder/prj/rpt.xml                     |    8 +-
 main/reportbuilder/template/manifest.xml           |    8 +-
 main/reportbuilder/template/pre.xml                |    2 +-
 main/reportbuilder/util/description.xml            |   10 +-
 main/reportbuilder/util/manifest.xml               |    8 +-
 main/reportdesign/prj/rpt.xml                      |    8 +-
 .../uiconfig/dbreport/menubar/menubar.xml          |    8 +-
 .../uiconfig/dbreport/statusbar/statusbar.xml      |    8 +-
 .../uiconfig/dbreport/toolbar/Formatting.xml       |    8 +-
 .../uiconfig/dbreport/toolbar/alignmentbar.xml     |    8 +-
 .../uiconfig/dbreport/toolbar/arrowshapes.xml      |    8 +-
 .../uiconfig/dbreport/toolbar/basicshapes.xml      |    8 +-
 .../uiconfig/dbreport/toolbar/calloutshapes.xml    |    8 +-
 .../uiconfig/dbreport/toolbar/drawbar.xml          |    8 +-
 .../uiconfig/dbreport/toolbar/flowchartshapes.xml  |    8 +-
 .../uiconfig/dbreport/toolbar/reportcontrols.xml   |    8 +-
 .../uiconfig/dbreport/toolbar/resizebar.xml        |    8 +-
 .../dbreport/toolbar/sectionalignmentbar.xml       |    8 +-
 .../uiconfig/dbreport/toolbar/sectionshrinkbar.xml |    8 +-
 .../uiconfig/dbreport/toolbar/starshapes.xml       |    8 +-
 .../uiconfig/dbreport/toolbar/symbolshapes.xml     |    8 +-
 .../uiconfig/dbreport/toolbar/toolbar.xml          |    8 +-
 main/ridljar/java/ridl/build.xml                   |    8 +-
 main/ridljar/java/unoloader/build.xml              |    8 +-
 main/sal/test/unloading/samplelib1.xml             |    8 +-
 main/sc/uiconfig/layout/insert-sheet.xml           |    8 +-
 main/sc/uiconfig/layout/move-copy-sheet.xml        |    8 +-
 main/sc/uiconfig/layout/sort-options.xml           |    8 +-
 main/sc/uiconfig/layout/string-input.xml           |    8 +-
 main/sc/uiconfig/scalc/menubar/menubar.xml         |    8 +-
 main/sc/uiconfig/scalc/statusbar/statusbar.xml     |    8 +-
 main/sc/uiconfig/scalc/toolbar/alignmentbar.xml    |    8 +-
 main/sc/uiconfig/scalc/toolbar/arrowshapes.xml     |    8 +-
 main/sc/uiconfig/scalc/toolbar/basicshapes.xml     |    8 +-
 main/sc/uiconfig/scalc/toolbar/calloutshapes.xml   |    8 +-
 main/sc/uiconfig/scalc/toolbar/colorbar.xml        |    8 +-
 main/sc/uiconfig/scalc/toolbar/drawbar.xml         |    8 +-
 main/sc/uiconfig/scalc/toolbar/drawobjectbar.xml   |    8 +-
 .../uiconfig/scalc/toolbar/extrusionobjectbar.xml  |    8 +-
 main/sc/uiconfig/scalc/toolbar/findbar.xml         |    8 +-
 main/sc/uiconfig/scalc/toolbar/flowchartshapes.xml |    8 +-
 .../uiconfig/scalc/toolbar/fontworkobjectbar.xml   |    8 +-
 .../uiconfig/scalc/toolbar/fontworkshapetype.xml   |    8 +-
 main/sc/uiconfig/scalc/toolbar/formatobjectbar.xml |    8 +-
 main/sc/uiconfig/scalc/toolbar/formcontrols.xml    |    8 +-
 main/sc/uiconfig/scalc/toolbar/formdesign.xml      |    8 +-
 main/sc/uiconfig/scalc/toolbar/formsfilterbar.xml  |    8 +-
 .../uiconfig/scalc/toolbar/formsnavigationbar.xml  |    8 +-
 .../uiconfig/scalc/toolbar/formtextobjectbar.xml   |    8 +-
 main/sc/uiconfig/scalc/toolbar/fullscreenbar.xml   |    8 +-
 main/sc/uiconfig/scalc/toolbar/graffilterbar.xml   |    8 +-
 .../sc/uiconfig/scalc/toolbar/graphicobjectbar.xml |    8 +-
 main/sc/uiconfig/scalc/toolbar/insertbar.xml       |    8 +-
 main/sc/uiconfig/scalc/toolbar/insertcellsbar.xml  |    8 +-
 main/sc/uiconfig/scalc/toolbar/mediaobjectbar.xml  |    8 +-
 .../sc/uiconfig/scalc/toolbar/moreformcontrols.xml |    8 +-
 main/sc/uiconfig/scalc/toolbar/standardbar.xml     |    8 +-
 main/sc/uiconfig/scalc/toolbar/starshapes.xml      |    8 +-
 main/sc/uiconfig/scalc/toolbar/symbolshapes.xml    |    8 +-
 main/sc/uiconfig/scalc/toolbar/textobjectbar.xml   |    8 +-
 main/sc/uiconfig/scalc/toolbar/toolbar.xml         |    8 +-
 main/sc/uiconfig/scalc/toolbar/viewerbar.xml       |    8 +-
 .../AccessibleEditableTextPara_HeaderFooter.xml    |    8 +-
 .../xml/AccessibleEditableTextPara_PreviewCell.xml |    8 +-
 .../xml/AccessibleEditableTextPara_PreviewNote.xml |    8 +-
 main/sc/xml/ScAccessibleCell.xml                   |    8 +-
 main/sc/xml/ScAccessibleCsvCell.xml                |    8 +-
 main/sc/xml/ScAccessibleCsvGrid.xml                |    8 +-
 main/sc/xml/ScAccessibleCsvRuler.xml               |    8 +-
 main/sc/xml/ScAccessibleDocument.xml               |    8 +-
 main/sc/xml/ScAccessibleDocumentPagePreview.xml    |    8 +-
 main/sc/xml/ScAccessiblePageHeader.xml             |    8 +-
 main/sc/xml/ScAccessiblePageHeaderArea.xml         |    8 +-
 main/sc/xml/ScAccessiblePreviewCell.xml            |    8 +-
 main/sc/xml/ScAccessiblePreviewHeaderCell.xml      |    8 +-
 main/sc/xml/ScAccessiblePreviewTable.xml           |    8 +-
 main/sc/xml/ScAccessibleSpreadsheet.xml            |    8 +-
 main/sc/xml/ScAnnotationObj.xml                    |    8 +-
 main/sc/xml/ScAnnotationShapeObj.xml               |    8 +-
 main/sc/xml/ScAnnotationsObj.xml                   |    8 +-
 main/sc/xml/ScAreaLinkObj.xml                      |    8 +-
 main/sc/xml/ScAreaLinksObj.xml                     |    8 +-
 main/sc/xml/ScAutoFormatFieldObj.xml               |    8 +-
 main/sc/xml/ScAutoFormatObj.xml                    |    8 +-
 main/sc/xml/ScAutoFormatsObj.xml                   |    8 +-
 main/sc/xml/ScCellCursorObj.xml                    |    8 +-
 main/sc/xml/ScCellFieldObj.xml                     |    8 +-
 main/sc/xml/ScCellFieldsObj.xml                    |    8 +-
 main/sc/xml/ScCellFormatsEnumeration.xml           |    8 +-
 main/sc/xml/ScCellFormatsObj.xml                   |    8 +-
 main/sc/xml/ScCellObj.xml                          |    8 +-
 main/sc/xml/ScCellRangeObj.xml                     |    8 +-
 main/sc/xml/ScCellRangesObj.xml                    |    8 +-
 main/sc/xml/ScCellSearchObj.xml                    |    8 +-
 main/sc/xml/ScCellTextCursor.xml                   |    8 +-
 main/sc/xml/ScCellsEnumeration.xml                 |    8 +-
 main/sc/xml/ScCellsObj.xml                         |    8 +-
 main/sc/xml/ScChartObj.xml                         |    8 +-
 main/sc/xml/ScChartsObj.xml                        |    8 +-
 main/sc/xml/ScConsolidationDescriptor.xml          |    8 +-
 main/sc/xml/ScDDELinkObj.xml                       |    8 +-
 main/sc/xml/ScDDELinksObj.xml                      |    8 +-
 main/sc/xml/ScDataPilotFieldGroupItemObj.xml       |    8 +-
 main/sc/xml/ScDataPilotFieldGroupObj.xml           |    8 +-
 main/sc/xml/ScDataPilotFieldGroupsObj.xml          |    8 +-
 main/sc/xml/ScDataPilotFieldObj.xml                |    8 +-
 main/sc/xml/ScDataPilotFieldsObj.xml               |    8 +-
 main/sc/xml/ScDataPilotItemObj.xml                 |    8 +-
 main/sc/xml/ScDataPilotItemsObj.xml                |    8 +-
 main/sc/xml/ScDataPilotTableObj.xml                |    8 +-
 main/sc/xml/ScDataPilotTablesObj.xml               |    8 +-
 main/sc/xml/ScDatabaseRangeObj.xml                 |    8 +-
 main/sc/xml/ScDatabaseRangesObj.xml                |    8 +-
 main/sc/xml/ScDocumentConfiguration.xml            |    8 +-
 main/sc/xml/ScDrawPageObj.xml                      |    8 +-
 main/sc/xml/ScDrawPagesObj.xml                     |    8 +-
 main/sc/xml/ScFilterDescriptorBase.xml             |    8 +-
 main/sc/xml/ScFunctionListObj.xml                  |    8 +-
 main/sc/xml/ScHeaderFieldObj.xml                   |    8 +-
 main/sc/xml/ScHeaderFieldsObj.xml                  |    8 +-
 main/sc/xml/ScHeaderFooterContentObj.xml           |    8 +-
 main/sc/xml/ScHeaderFooterTextCursor.xml           |    8 +-
 main/sc/xml/ScHeaderFooterTextObj.xml              |    8 +-
 ...IndexEnumeration_CellAnnotationsEnumeration.xml |    8 +-
 ...ScIndexEnumeration_CellAreaLinksEnumeration.xml |    8 +-
 .../xml/ScIndexEnumeration_DDELinksEnumeration.xml |    8 +-
 ...IndexEnumeration_DataPilotFieldsEnumeration.xml |    8 +-
 ...cIndexEnumeration_DataPilotItemsEnumeration.xml |    8 +-
 ...IndexEnumeration_DataPilotTablesEnumeration.xml |    8 +-
 ...cIndexEnumeration_DatabaseRangesEnumeration.xml |    8 +-
 ...xEnumeration_FunctionDescriptionEnumeration.xml |    8 +-
 .../ScIndexEnumeration_LabelRangesEnumeration.xml  |    8 +-
 .../ScIndexEnumeration_NamedRangesEnumeration.xml  |    8 +-
 .../ScIndexEnumeration_ScenariosEnumeration.xml    |    8 +-
 ...IndexEnumeration_SheetCellRangesEnumeration.xml |    8 +-
 .../ScIndexEnumeration_SheetLinksEnumeration.xml   |    8 +-
 ...Enumeration_SpreadsheetViewPanesEnumeration.xml |    8 +-
 .../ScIndexEnumeration_SpreadsheetsEnumeration.xml |    8 +-
 ...cIndexEnumeration_SubTotalFieldsEnumeration.xml |    8 +-
 ...IndexEnumeration_TableAutoFormatEnumeration.xml |    8 +-
 .../ScIndexEnumeration_TableChartsEnumeration.xml  |    8 +-
 .../ScIndexEnumeration_TableColumnsEnumeration.xml |    8 +-
 ...numeration_TableConditionalEntryEnumeration.xml |    8 +-
 .../ScIndexEnumeration_TableRowsEnumeration.xml    |    8 +-
 .../ScIndexEnumeration_TextFieldEnumeration.xml    |    8 +-
 main/sc/xml/ScLabelRangeObj.xml                    |    8 +-
 main/sc/xml/ScLabelRangesObj.xml                   |    8 +-
 main/sc/xml/ScModelObj.xml                         |    8 +-
 main/sc/xml/ScNamedRangeObj.xml                    |    8 +-
 main/sc/xml/ScNamedRangesObj.xml                   |    8 +-
 main/sc/xml/ScPageObj.xml                          |    8 +-
 main/sc/xml/ScRecentFunctionsObj.xml               |    8 +-
 main/sc/xml/ScScenariosObj.xml                     |    8 +-
 main/sc/xml/ScShapeObj.xml                         |    8 +-
 main/sc/xml/ScSheetLinkObj.xml                     |    8 +-
 main/sc/xml/ScSheetLinksObj.xml                    |    8 +-
 main/sc/xml/ScSpreadsheetSettings.xml              |    8 +-
 main/sc/xml/ScSpreadsheetSettingsObj.xml           |   10 +-
 main/sc/xml/ScStyleFamiliesObj.xml                 |    8 +-
 main/sc/xml/ScStyleFamilyObj.xml                   |    8 +-
 main/sc/xml/ScStyleObj.xml                         |    8 +-
 main/sc/xml/ScSubTotalDescriptorBase.xml           |    8 +-
 main/sc/xml/ScSubTotalFieldObj.xml                 |    8 +-
 main/sc/xml/ScTabViewObj.xml                       |    8 +-
 main/sc/xml/ScTableColumnObj.xml                   |    8 +-
 main/sc/xml/ScTableColumnsObj.xml                  |    8 +-
 main/sc/xml/ScTableConditionalEntry.xml            |    8 +-
 main/sc/xml/ScTableConditionalFormat.xml           |    8 +-
 main/sc/xml/ScTableRowObj.xml                      |    8 +-
 main/sc/xml/ScTableRowsObj.xml                     |    8 +-
 main/sc/xml/ScTableSheetObj.xml                    |    8 +-
 main/sc/xml/ScTableSheetsObj.xml                   |    8 +-
 main/sc/xml/ScTableValidationObj.xml               |    8 +-
 main/sc/xml/ScUniqueCellFormatsEnumeration.xml     |    8 +-
 main/sc/xml/ScUniqueCellFormatsObj.xml             |    8 +-
 main/sc/xml/ScViewPaneObj.xml                      |    8 +-
 main/sc/xml/ScXMLExport.xml                        |    8 +-
 main/sc/xml/ScXMLImport.xml                        |    8 +-
 .../beanshell/Capitalise/parcel-descriptor.xml     |    8 +-
 .../beanshell/HelloWorld/parcel-descriptor.xml     |    8 +-
 .../beanshell/Highlight/parcel-descriptor.xml      |    8 +-
 .../InteractiveBeanShell/parcel-descriptor.xml     |    8 +-
 .../beanshell/MemoryUsage/parcel-descriptor.xml    |    8 +-
 .../beanshell/WordCount/parcel-descriptor.xml      |    8 +-
 .../examples/java/HelloWorld/parcel-descriptor.xml |   10 +-
 .../examples/java/Highlight/parcel-descriptor.xml  |    8 +-
 .../java/MemoryUsage/parcel-descriptor.xml         |    8 +-
 main/scripting/examples/java/build.xml             |   20 +-
 .../examples/java/debugger/parcel-descriptor.xml   |    8 +-
 .../examples/java/selector/parcel-descriptor.xml   |    8 +-
 .../ExportSheetsToHTML/parcel-descriptor.xml       |    8 +-
 .../javascript/HelloWorld/parcel-descriptor.xml    |    8 +-
 .../javascript/Highlight/parcel-descriptor.xml     |    8 +-
 main/scripting/java/build.xml                      |   16 +-
 .../netbeans/modules/office/resources/layer.xml    |   14 +-
 .../modules/office/resources/mime-resolver.xml     |   10 +-
 main/scripting/source/basprov/basprov.xml          |   34 +-
 main/scripting/source/dlgprov/dlgprov.xml          |   52 +-
 .../source/protocolhandler/protocolhandler.xml     |    8 +-
 main/scripting/source/provider/provider.xml        |    8 +-
 main/scripting/source/runtimemgr/runtimemgr.xml    |    8 +-
 main/scripting/source/storage/storage.xml          |    8 +-
 .../source/stringresource/stringresource.xml       |   26 +-
 main/scripting/source/vbaevents/vbaevents.xml      |   16 +-
 main/scripting/workben/bindings/calckeybinding.xml |    8 +-
 main/scripting/workben/bindings/calcmenubar.xml    |    8 +-
 main/scripting/workben/bindings/drawkeybinding.xml |    8 +-
 main/scripting/workben/bindings/drawmenubar.xml    |    8 +-
 main/scripting/workben/bindings/eventbindings.xml  |    8 +-
 .../workben/bindings/impresskeybinding.xml         |    8 +-
 main/scripting/workben/bindings/impressmenubar.xml |    8 +-
 main/scripting/workben/bindings/manifest.xml       |    8 +-
 .../workben/bindings/writerkeybinding.xml          |    8 +-
 main/scripting/workben/bindings/writermenubar.xml  |    8 +-
 main/scripting/workben/build.xml                   |   40 +-
 main/sd/uiconfig/sdraw/menubar/menubar.xml         |    8 +-
 main/sd/uiconfig/sdraw/statusbar/statusbar.xml     |    8 +-
 main/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml    |    8 +-
 main/sd/uiconfig/sdraw/toolbar/alignmentbar.xml    |    8 +-
 main/sd/uiconfig/sdraw/toolbar/arrowsbar.xml       |    8 +-
 main/sd/uiconfig/sdraw/toolbar/arrowshapes.xml     |    8 +-
 main/sd/uiconfig/sdraw/toolbar/basicshapes.xml     |    8 +-
 main/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml |    8 +-
 main/sd/uiconfig/sdraw/toolbar/calloutshapes.xml   |    8 +-
 main/sd/uiconfig/sdraw/toolbar/choosemodebar.xml   |    8 +-
 main/sd/uiconfig/sdraw/toolbar/colorbar.xml        |    8 +-
 main/sd/uiconfig/sdraw/toolbar/commentsbar.xml     |    8 +-
 main/sd/uiconfig/sdraw/toolbar/connectorsbar.xml   |    8 +-
 .../sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml |    8 +-
 main/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml     |    8 +-
 .../uiconfig/sdraw/toolbar/extrusionobjectbar.xml  |    8 +-
 main/sd/uiconfig/sdraw/toolbar/findbar.xml         |    8 +-
 main/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml |    8 +-
 .../uiconfig/sdraw/toolbar/fontworkobjectbar.xml   |    8 +-
 .../uiconfig/sdraw/toolbar/fontworkshapetype.xml   |    8 +-
 main/sd/uiconfig/sdraw/toolbar/formcontrols.xml    |    8 +-
 main/sd/uiconfig/sdraw/toolbar/formdesign.xml      |    8 +-
 main/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml  |    8 +-
 .../uiconfig/sdraw/toolbar/formsnavigationbar.xml  |    8 +-
 .../uiconfig/sdraw/toolbar/formtextobjectbar.xml   |    8 +-
 main/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml   |    8 +-
 .../uiconfig/sdraw/toolbar/gluepointsobjectbar.xml |    8 +-
 main/sd/uiconfig/sdraw/toolbar/graffilterbar.xml   |    8 +-
 .../sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml |    8 +-
 main/sd/uiconfig/sdraw/toolbar/insertbar.xml       |    8 +-
 main/sd/uiconfig/sdraw/toolbar/linesbar.xml        |    8 +-
 .../uiconfig/sdraw/toolbar/masterviewtoolbar.xml   |    8 +-
 main/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml  |    8 +-
 .../sd/uiconfig/sdraw/toolbar/moreformcontrols.xml |    8 +-
 .../sd/uiconfig/sdraw/toolbar/optimizetablebar.xml |    8 +-
 main/sd/uiconfig/sdraw/toolbar/positionbar.xml     |    8 +-
 main/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml   |    8 +-
 main/sd/uiconfig/sdraw/toolbar/standardbar.xml     |    8 +-
 main/sd/uiconfig/sdraw/toolbar/starshapes.xml      |    8 +-
 main/sd/uiconfig/sdraw/toolbar/symbolshapes.xml    |    8 +-
 main/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml  |    8 +-
 main/sd/uiconfig/sdraw/toolbar/textbar.xml         |    8 +-
 main/sd/uiconfig/sdraw/toolbar/textobjectbar.xml   |    8 +-
 main/sd/uiconfig/sdraw/toolbar/toolbar.xml         |    8 +-
 main/sd/uiconfig/sdraw/toolbar/viewerbar.xml       |    8 +-
 main/sd/uiconfig/simpress/menubar/menubar.xml      |    8 +-
 main/sd/uiconfig/simpress/statusbar/statusbar.xml  |    8 +-
 main/sd/uiconfig/simpress/toolbar/3dobjectsbar.xml |    8 +-
 main/sd/uiconfig/simpress/toolbar/alignmentbar.xml |    8 +-
 main/sd/uiconfig/simpress/toolbar/arrowsbar.xml    |    8 +-
 main/sd/uiconfig/simpress/toolbar/arrowshapes.xml  |    8 +-
 main/sd/uiconfig/simpress/toolbar/basicshapes.xml  |    8 +-
 .../uiconfig/simpress/toolbar/bezierobjectbar.xml  |    8 +-
 .../sd/uiconfig/simpress/toolbar/calloutshapes.xml |    8 +-
 .../sd/uiconfig/simpress/toolbar/choosemodebar.xml |    8 +-
 main/sd/uiconfig/simpress/toolbar/colorbar.xml     |    8 +-
 main/sd/uiconfig/simpress/toolbar/commentsbar.xml  |    8 +-
 .../sd/uiconfig/simpress/toolbar/commontaskbar.xml |    8 +-
 .../sd/uiconfig/simpress/toolbar/connectorsbar.xml |    8 +-
 .../uiconfig/simpress/toolbar/drawingobjectbar.xml |    8 +-
 main/sd/uiconfig/simpress/toolbar/ellipsesbar.xml  |    8 +-
 .../simpress/toolbar/extrusionobjectbar.xml        |    8 +-
 main/sd/uiconfig/simpress/toolbar/findbar.xml      |    8 +-
 .../uiconfig/simpress/toolbar/flowchartshapes.xml  |    8 +-
 .../simpress/toolbar/fontworkobjectbar.xml         |    8 +-
 .../simpress/toolbar/fontworkshapetype.xml         |    8 +-
 main/sd/uiconfig/simpress/toolbar/formcontrols.xml |    8 +-
 main/sd/uiconfig/simpress/toolbar/formdesign.xml   |    8 +-
 .../uiconfig/simpress/toolbar/formsfilterbar.xml   |    8 +-
 .../simpress/toolbar/formsnavigationbar.xml        |    8 +-
 .../simpress/toolbar/formtextobjectbar.xml         |    8 +-
 .../sd/uiconfig/simpress/toolbar/fullscreenbar.xml |    8 +-
 .../simpress/toolbar/gluepointsobjectbar.xml       |    8 +-
 .../sd/uiconfig/simpress/toolbar/graffilterbar.xml |    8 +-
 .../uiconfig/simpress/toolbar/graphicobjectbar.xml |    8 +-
 main/sd/uiconfig/simpress/toolbar/insertbar.xml    |    8 +-
 main/sd/uiconfig/simpress/toolbar/linesbar.xml     |    8 +-
 .../simpress/toolbar/masterviewtoolbar.xml         |    8 +-
 .../uiconfig/simpress/toolbar/mediaobjectbar.xml   |    8 +-
 .../uiconfig/simpress/toolbar/moreformcontrols.xml |    8 +-
 .../uiconfig/simpress/toolbar/optimizetablebar.xml |    8 +-
 .../uiconfig/simpress/toolbar/outlinetoolbar.xml   |    8 +-
 main/sd/uiconfig/simpress/toolbar/positionbar.xml  |    8 +-
 .../sd/uiconfig/simpress/toolbar/rectanglesbar.xml |    8 +-
 .../simpress/toolbar/slideviewobjectbar.xml        |    8 +-
 .../uiconfig/simpress/toolbar/slideviewtoolbar.xml |    8 +-
 main/sd/uiconfig/simpress/toolbar/standardbar.xml  |    8 +-
 main/sd/uiconfig/simpress/toolbar/starshapes.xml   |    8 +-
 main/sd/uiconfig/simpress/toolbar/symbolshapes.xml |    8 +-
 .../uiconfig/simpress/toolbar/tableobjectbar.xml   |    8 +-
 main/sd/uiconfig/simpress/toolbar/textbar.xml      |    8 +-
 .../sd/uiconfig/simpress/toolbar/textobjectbar.xml |    8 +-
 main/sd/uiconfig/simpress/toolbar/toolbar.xml      |    8 +-
 main/sd/uiconfig/simpress/toolbar/viewerbar.xml    |    8 +-
 main/sd/xml/effects.xml                            |   12 +-
 main/sd/xml/transitions-ogl.xml                    |    8 +-
 main/sd/xml/transitions.xml                        |   20 +-
 main/sdext/source/pdfimport/config/description.xml |   10 +-
 main/sdext/source/pdfimport/config/manifest.xml    |    8 +-
 .../testdocs/graphicformats_pdfi_unittest_draw.xml |    8 +-
 .../graphicformats_pdfi_unittest_impress.xml       |    8 +-
 .../graphicformats_pdfi_unittest_writer.xml        |    8 +-
 .../test/testdocs/pictxt_pdfi_unittest_draw.xml    | 1168 ++++++++++----------
 .../test/testdocs/pictxt_pdfi_unittest_impress.xml | 1168 ++++++++++----------
 .../test/testdocs/pictxt_pdfi_unittest_writer.xml  |   68 +-
 .../test/testdocs/txtpic_pdfi_unittest_draw.xml    | 1168 ++++++++++----------
 .../test/testdocs/txtpic_pdfi_unittest_impress.xml | 1168 ++++++++++----------
 .../test/testdocs/txtpic_pdfi_unittest_writer.xml  |   68 +-
 .../test/testdocs/txtpictxt_pdfi_unittest_draw.xml | 1168 ++++++++++----------
 .../testdocs/txtpictxt_pdfi_unittest_impress.xml   | 1168 ++++++++++----------
 .../testdocs/txtpictxt_pdfi_unittest_writer.xml    |   68 +-
 .../testdocs/verticaltext_pdfi_unittest_draw.xml   |    8 +-
 .../verticaltext_pdfi_unittest_impress.xml         |    8 +-
 .../testdocs/verticaltext_pdfi_unittest_writer.xml |    8 +-
 .../bundledextensions/ooo_bundled_extensions.xml   |   22 +-
 main/sfx2/util/sfx.xml                             |    8 +-
 main/shell/source/backends/localebe/localebe.xml   |   12 +-
 main/shell/source/backends/macbe/macbe.xml         |    8 +-
 main/shell/source/backends/wininetbe/wininetbe.xml |   12 +-
 main/shell/source/unix/exec/syssh.xml              |   14 +-
 main/shell/source/win32/syssh.xml                  |   14 +-
 main/solenv/ant/aoo-ant.xml                        |    8 +-
 main/solenv/ant/externals.xml                      |    8 +-
 main/solenv/ant/idl.xml                            |    8 +-
 main/solenv/src/default_description.xml            |    8 +-
 main/starmath/xml/math.xml                         |    8 +-
 main/stoc/source/bootstrap/bootstrap.xml           |   24 +-
 main/stoc/source/corereflection/corefl.xml         |    8 +-
 main/stoc/source/inspect/insp.xml                  |    8 +-
 main/stoc/source/invocation/inv.xml                |   16 +-
 .../source/invocation_adapterfactory/invadp.xml    |    8 +-
 main/stoc/source/javaloader/javaloader.xml         |    8 +-
 main/stoc/source/javavm/jen.xml                    |    8 +-
 main/stoc/source/namingservice/namingservice.xml   |    8 +-
 main/stoc/source/stocservices/stocserv.xml         |    8 +-
 main/stoc/test/excomp/excomp1.xml                  |   10 +-
 main/stoc/test/excomp/excomp2.xml                  |   10 +-
 main/store/util/store.xml                          |    8 +-
 main/svtools/prj/svtools.xml                       |    8 +-
 main/svx/uiconfig/layout/zoom.xml                  |    8 +-
 main/svx/workben/msview/msview.xml                 |   16 +-
 main/svx/xml/AccessibleControlShape.xml            |    8 +-
 main/svx/xml/AccessibleEditableTextPara.xml        |    8 +-
 main/svx/xml/AccessibleGraphicShape.xml            |    8 +-
 main/svx/xml/AccessibleImageBullet.xml             |    8 +-
 main/svx/xml/AccessibleOLEShape.xml                |    8 +-
 main/svx/xml/AccessibleShape.xml                   |    8 +-
 main/svx/xml/SvxDrawPage.xml                       |    8 +-
 main/svx/xml/SvxGraphCtrlAccessibleContext.xml     |    8 +-
 main/svx/xml/SvxGraphicExporter.xml                |    8 +-
 main/svx/xml/SvxGraphicObject.xml                  |    8 +-
 main/svx/xml/SvxShape.xml                          |    8 +-
 main/svx/xml/SvxShapeCircle.xml                    |    8 +-
 main/svx/xml/SvxShapeCollection.xml                |    8 +-
 main/svx/xml/SvxShapeConnector.xml                 |    8 +-
 main/svx/xml/SvxShapeControl.xml                   |    8 +-
 main/svx/xml/SvxShapeDimensioning.xml              |    8 +-
 main/svx/xml/SvxShapeGroup.xml                     |    8 +-
 main/svx/xml/SvxShapePolyPolygon.xml               |    8 +-
 main/svx/xml/SvxShapePolyPolygonBezier.xml         |    8 +-
 main/svx/xml/SvxUnoNumberingRules.xml              |    8 +-
 main/svx/xml/SvxUnoText.xml                        |    8 +-
 main/svx/xml/SvxUnoTextContent.xml                 |    8 +-
 main/svx/xml/SvxUnoTextContentEnum.xml             |    8 +-
 main/svx/xml/SvxUnoTextCursor.xml                  |    8 +-
 main/svx/xml/SvxUnoTextField.xml                   |    8 +-
 main/svx/xml/SvxUnoTextRange.xml                   |    8 +-
 main/svx/xml/SvxUnoTextRangeEnumeration.xml        |    8 +-
 main/sw/uiconfig/layout/wordcount.xml              |    8 +-
 main/sw/uiconfig/sglobal/menubar/menubar.xml       |    8 +-
 main/sw/uiconfig/sglobal/statusbar/statusbar.xml   |    8 +-
 main/sw/uiconfig/sglobal/toolbar/alignmentbar.xml  |    8 +-
 main/sw/uiconfig/sglobal/toolbar/arrowshapes.xml   |    8 +-
 main/sw/uiconfig/sglobal/toolbar/basicshapes.xml   |    8 +-
 .../uiconfig/sglobal/toolbar/bezierobjectbar.xml   |    8 +-
 main/sw/uiconfig/sglobal/toolbar/calloutshapes.xml |    8 +-
 main/sw/uiconfig/sglobal/toolbar/colorbar.xml      |    8 +-
 main/sw/uiconfig/sglobal/toolbar/drawbar.xml       |    8 +-
 .../uiconfig/sglobal/toolbar/drawingobjectbar.xml  |    8 +-
 .../uiconfig/sglobal/toolbar/drawtextobjectbar.xml |    8 +-
 .../sglobal/toolbar/extrusionobjectbar.xml         |    8 +-
 main/sw/uiconfig/sglobal/toolbar/findbar.xml       |    8 +-
 .../uiconfig/sglobal/toolbar/flowchartshapes.xml   |    8 +-
 .../uiconfig/sglobal/toolbar/fontworkobjectbar.xml |    8 +-
 .../uiconfig/sglobal/toolbar/fontworkshapetype.xml |    8 +-
 main/sw/uiconfig/sglobal/toolbar/formcontrols.xml  |    8 +-
 main/sw/uiconfig/sglobal/toolbar/formdesign.xml    |    8 +-
 .../sw/uiconfig/sglobal/toolbar/formsfilterbar.xml |    8 +-
 .../sglobal/toolbar/formsnavigationbar.xml         |    8 +-
 .../uiconfig/sglobal/toolbar/formtextobjectbar.xml |    8 +-
 .../sw/uiconfig/sglobal/toolbar/frameobjectbar.xml |    8 +-
 main/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml |    8 +-
 main/sw/uiconfig/sglobal/toolbar/graffilterbar.xml |    8 +-
 .../uiconfig/sglobal/toolbar/graphicobjectbar.xml  |    8 +-
 main/sw/uiconfig/sglobal/toolbar/insertbar.xml     |    8 +-
 .../uiconfig/sglobal/toolbar/insertobjectbar.xml   |    8 +-
 .../sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml |    8 +-
 .../uiconfig/sglobal/toolbar/moreformcontrols.xml  |    8 +-
 main/sw/uiconfig/sglobal/toolbar/numobjectbar.xml  |    8 +-
 main/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml  |    8 +-
 .../uiconfig/sglobal/toolbar/optimizetablebar.xml  |    8 +-
 main/sw/uiconfig/sglobal/toolbar/standardbar.xml   |    8 +-
 main/sw/uiconfig/sglobal/toolbar/starshapes.xml    |    8 +-
 main/sw/uiconfig/sglobal/toolbar/symbolshapes.xml  |    8 +-
 .../sw/uiconfig/sglobal/toolbar/tableobjectbar.xml |    8 +-
 main/sw/uiconfig/sglobal/toolbar/textobjectbar.xml |    8 +-
 main/sw/uiconfig/sglobal/toolbar/toolbar.xml       |    8 +-
 main/sw/uiconfig/sglobal/toolbar/viewerbar.xml     |    8 +-
 main/sw/uiconfig/sweb/menubar/menubar.xml          |    8 +-
 main/sw/uiconfig/sweb/statusbar/statusbar.xml      |    8 +-
 main/sw/uiconfig/sweb/toolbar/arrowshapes.xml      |    8 +-
 main/sw/uiconfig/sweb/toolbar/basicshapes.xml      |    8 +-
 main/sw/uiconfig/sweb/toolbar/bezierobjectbar.xml  |    8 +-
 main/sw/uiconfig/sweb/toolbar/calloutshapes.xml    |    8 +-
 main/sw/uiconfig/sweb/toolbar/colorbar.xml         |    8 +-
 main/sw/uiconfig/sweb/toolbar/drawingobjectbar.xml |    8 +-
 .../sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml |    8 +-
 .../uiconfig/sweb/toolbar/extrusionobjectbar.xml   |    8 +-
 main/sw/uiconfig/sweb/toolbar/findbar.xml          |    8 +-
 main/sw/uiconfig/sweb/toolbar/flowchartshapes.xml  |    8 +-
 .../sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml |    8 +-
 .../sw/uiconfig/sweb/toolbar/fontworkshapetype.xml |    8 +-
 main/sw/uiconfig/sweb/toolbar/formcontrols.xml     |    8 +-
 main/sw/uiconfig/sweb/toolbar/formdesign.xml       |    8 +-
 main/sw/uiconfig/sweb/toolbar/formsfilterbar.xml   |    8 +-
 .../uiconfig/sweb/toolbar/formsnavigationbar.xml   |    8 +-
 .../sw/uiconfig/sweb/toolbar/formtextobjectbar.xml |    8 +-
 main/sw/uiconfig/sweb/toolbar/frameobjectbar.xml   |    8 +-
 main/sw/uiconfig/sweb/toolbar/fullscreenbar.xml    |    8 +-
 main/sw/uiconfig/sweb/toolbar/graffilterbar.xml    |    8 +-
 main/sw/uiconfig/sweb/toolbar/graphicobjectbar.xml |    8 +-
 main/sw/uiconfig/sweb/toolbar/insertbar.xml        |    8 +-
 main/sw/uiconfig/sweb/toolbar/mediaobjectbar.xml   |    8 +-
 main/sw/uiconfig/sweb/toolbar/numobjectbar.xml     |    8 +-
 main/sw/uiconfig/sweb/toolbar/oleobjectbar.xml     |    8 +-
 main/sw/uiconfig/sweb/toolbar/optimizetablebar.xml |    8 +-
 main/sw/uiconfig/sweb/toolbar/standardbar.xml      |    8 +-
 main/sw/uiconfig/sweb/toolbar/starshapes.xml       |    8 +-
 main/sw/uiconfig/sweb/toolbar/symbolshapes.xml     |    8 +-
 main/sw/uiconfig/sweb/toolbar/tableobjectbar.xml   |    8 +-
 main/sw/uiconfig/sweb/toolbar/textobjectbar.xml    |    8 +-
 main/sw/uiconfig/sweb/toolbar/toolbar.xml          |    8 +-
 main/sw/uiconfig/sweb/toolbar/viewerbar.xml        |    8 +-
 main/sw/uiconfig/swform/menubar/menubar.xml        |    8 +-
 main/sw/uiconfig/swform/statusbar/statusbar.xml    |    8 +-
 main/sw/uiconfig/swform/toolbar/alignmentbar.xml   |    8 +-
 main/sw/uiconfig/swform/toolbar/arrowshapes.xml    |    8 +-
 main/sw/uiconfig/swform/toolbar/basicshapes.xml    |    8 +-
 .../sw/uiconfig/swform/toolbar/bezierobjectbar.xml |    8 +-
 main/sw/uiconfig/swform/toolbar/calloutshapes.xml  |    8 +-
 main/sw/uiconfig/swform/toolbar/colorbar.xml       |    8 +-
 main/sw/uiconfig/swform/toolbar/drawbar.xml        |    8 +-
 .../uiconfig/swform/toolbar/drawingobjectbar.xml   |    8 +-
 .../uiconfig/swform/toolbar/drawtextobjectbar.xml  |    8 +-
 .../uiconfig/swform/toolbar/extrusionobjectbar.xml |    8 +-
 .../sw/uiconfig/swform/toolbar/flowchartshapes.xml |    8 +-
 .../uiconfig/swform/toolbar/fontworkobjectbar.xml  |    8 +-
 .../uiconfig/swform/toolbar/fontworkshapetype.xml  |    8 +-
 main/sw/uiconfig/swform/toolbar/formcontrols.xml   |    8 +-
 main/sw/uiconfig/swform/toolbar/formdesign.xml     |    8 +-
 main/sw/uiconfig/swform/toolbar/formsfilterbar.xml |    8 +-
 .../uiconfig/swform/toolbar/formsnavigationbar.xml |    8 +-
 .../uiconfig/swform/toolbar/formtextobjectbar.xml  |    8 +-
 main/sw/uiconfig/swform/toolbar/frameobjectbar.xml |    8 +-
 main/sw/uiconfig/swform/toolbar/fullscreenbar.xml  |    8 +-
 main/sw/uiconfig/swform/toolbar/graffilterbar.xml  |    8 +-
 .../uiconfig/swform/toolbar/graphicobjectbar.xml   |    8 +-
 main/sw/uiconfig/swform/toolbar/insertbar.xml      |    8 +-
 .../sw/uiconfig/swform/toolbar/insertobjectbar.xml |    8 +-
 main/sw/uiconfig/swform/toolbar/mediaobjectbar.xml |    8 +-
 .../uiconfig/swform/toolbar/moreformcontrols.xml   |    8 +-
 main/sw/uiconfig/swform/toolbar/numobjectbar.xml   |    8 +-
 main/sw/uiconfig/swform/toolbar/oleobjectbar.xml   |    8 +-
 .../uiconfig/swform/toolbar/optimizetablebar.xml   |    8 +-
 main/sw/uiconfig/swform/toolbar/standardbar.xml    |    8 +-
 main/sw/uiconfig/swform/toolbar/starshapes.xml     |    8 +-
 main/sw/uiconfig/swform/toolbar/symbolshapes.xml   |    8 +-
 main/sw/uiconfig/swform/toolbar/tableobjectbar.xml |    8 +-
 main/sw/uiconfig/swform/toolbar/textobjectbar.xml  |    8 +-
 main/sw/uiconfig/swform/toolbar/toolbar.xml        |    8 +-
 main/sw/uiconfig/swform/toolbar/viewerbar.xml      |    8 +-
 main/sw/uiconfig/swreport/menubar/menubar.xml      |    8 +-
 main/sw/uiconfig/swreport/statusbar/statusbar.xml  |    8 +-
 main/sw/uiconfig/swreport/toolbar/alignmentbar.xml |    8 +-
 main/sw/uiconfig/swreport/toolbar/arrowshapes.xml  |    8 +-
 main/sw/uiconfig/swreport/toolbar/basicshapes.xml  |    8 +-
 .../uiconfig/swreport/toolbar/bezierobjectbar.xml  |    8 +-
 .../sw/uiconfig/swreport/toolbar/calloutshapes.xml |    8 +-
 main/sw/uiconfig/swreport/toolbar/colorbar.xml     |    8 +-
 main/sw/uiconfig/swreport/toolbar/drawbar.xml      |    8 +-
 .../uiconfig/swreport/toolbar/drawingobjectbar.xml |    8 +-
 .../swreport/toolbar/drawtextobjectbar.xml         |    8 +-
 .../swreport/toolbar/extrusionobjectbar.xml        |    8 +-
 .../uiconfig/swreport/toolbar/flowchartshapes.xml  |    8 +-
 .../swreport/toolbar/fontworkobjectbar.xml         |    8 +-
 .../swreport/toolbar/fontworkshapetype.xml         |    8 +-
 main/sw/uiconfig/swreport/toolbar/formcontrols.xml |    8 +-
 main/sw/uiconfig/swreport/toolbar/formdesign.xml   |    8 +-
 .../uiconfig/swreport/toolbar/formsfilterbar.xml   |    8 +-
 .../swreport/toolbar/formsnavigationbar.xml        |    8 +-
 .../swreport/toolbar/formtextobjectbar.xml         |    8 +-
 .../uiconfig/swreport/toolbar/frameobjectbar.xml   |    8 +-
 .../sw/uiconfig/swreport/toolbar/fullscreenbar.xml |    8 +-
 .../sw/uiconfig/swreport/toolbar/graffilterbar.xml |    8 +-
 .../uiconfig/swreport/toolbar/graphicobjectbar.xml |    8 +-
 main/sw/uiconfig/swreport/toolbar/insertbar.xml    |    8 +-
 .../uiconfig/swreport/toolbar/insertobjectbar.xml  |    8 +-
 .../uiconfig/swreport/toolbar/mediaobjectbar.xml   |    8 +-
 .../uiconfig/swreport/toolbar/moreformcontrols.xml |    8 +-
 main/sw/uiconfig/swreport/toolbar/numobjectbar.xml |    8 +-
 main/sw/uiconfig/swreport/toolbar/oleobjectbar.xml |    8 +-
 .../uiconfig/swreport/toolbar/optimizetablebar.xml |    8 +-
 main/sw/uiconfig/swreport/toolbar/standardbar.xml  |    8 +-
 main/sw/uiconfig/swreport/toolbar/starshapes.xml   |    8 +-
 main/sw/uiconfig/swreport/toolbar/symbolshapes.xml |    8 +-
 .../uiconfig/swreport/toolbar/tableobjectbar.xml   |    8 +-
 .../sw/uiconfig/swreport/toolbar/textobjectbar.xml |    8 +-
 main/sw/uiconfig/swreport/toolbar/toolbar.xml      |    8 +-
 main/sw/uiconfig/swreport/toolbar/viewerbar.xml    |    8 +-
 main/sw/uiconfig/swriter/menubar/menubar.xml       |    8 +-
 main/sw/uiconfig/swriter/statusbar/statusbar.xml   |    8 +-
 main/sw/uiconfig/swriter/toolbar/alignmentbar.xml  |    8 +-
 main/sw/uiconfig/swriter/toolbar/arrowshapes.xml   |    8 +-
 main/sw/uiconfig/swriter/toolbar/basicshapes.xml   |    8 +-
 .../uiconfig/swriter/toolbar/bezierobjectbar.xml   |    8 +-
 main/sw/uiconfig/swriter/toolbar/calloutshapes.xml |    8 +-
 main/sw/uiconfig/swriter/toolbar/colorbar.xml      |    8 +-
 main/sw/uiconfig/swriter/toolbar/drawbar.xml       |    8 +-
 .../uiconfig/swriter/toolbar/drawingobjectbar.xml  |    8 +-
 .../uiconfig/swriter/toolbar/drawtextobjectbar.xml |    8 +-
 .../swriter/toolbar/extrusionobjectbar.xml         |    8 +-
 main/sw/uiconfig/swriter/toolbar/findbar.xml       |    8 +-
 .../uiconfig/swriter/toolbar/flowchartshapes.xml   |    8 +-
 .../uiconfig/swriter/toolbar/fontworkobjectbar.xml |    8 +-
 .../uiconfig/swriter/toolbar/fontworkshapetype.xml |    8 +-
 main/sw/uiconfig/swriter/toolbar/formcontrols.xml  |    8 +-
 main/sw/uiconfig/swriter/toolbar/formdesign.xml    |    8 +-
 .../sw/uiconfig/swriter/toolbar/formsfilterbar.xml |    8 +-
 .../swriter/toolbar/formsnavigationbar.xml         |    8 +-
 .../uiconfig/swriter/toolbar/formtextobjectbar.xml |    8 +-
 .../sw/uiconfig/swriter/toolbar/frameobjectbar.xml |    8 +-
 main/sw/uiconfig/swriter/toolbar/fullscreenbar.xml |    8 +-
 main/sw/uiconfig/swriter/toolbar/graffilterbar.xml |    8 +-
 .../uiconfig/swriter/toolbar/graphicobjectbar.xml  |    8 +-
 main/sw/uiconfig/swriter/toolbar/insertbar.xml     |    8 +-
 .../sw/uiconfig/swriter/toolbar/mediaobjectbar.xml |    8 +-
 .../uiconfig/swriter/toolbar/moreformcontrols.xml  |    8 +-
 main/sw/uiconfig/swriter/toolbar/numobjectbar.xml  |    8 +-
 main/sw/uiconfig/swriter/toolbar/oleobjectbar.xml  |    8 +-
 .../uiconfig/swriter/toolbar/optimizetablebar.xml  |    8 +-
 main/sw/uiconfig/swriter/toolbar/standardbar.xml   |    8 +-
 main/sw/uiconfig/swriter/toolbar/starshapes.xml    |    8 +-
 main/sw/uiconfig/swriter/toolbar/symbolshapes.xml  |    8 +-
 .../sw/uiconfig/swriter/toolbar/tableobjectbar.xml |    8 +-
 main/sw/uiconfig/swriter/toolbar/textobjectbar.xml |    8 +-
 main/sw/uiconfig/swriter/toolbar/toolbar.xml       |    8 +-
 main/sw/uiconfig/swriter/toolbar/viewerbar.xml     |    8 +-
 main/sw/uiconfig/swxform/menubar/menubar.xml       |    8 +-
 main/sw/uiconfig/swxform/statusbar/statusbar.xml   |    8 +-
 main/sw/uiconfig/swxform/toolbar/alignmentbar.xml  |    8 +-
 main/sw/uiconfig/swxform/toolbar/arrowshapes.xml   |    8 +-
 main/sw/uiconfig/swxform/toolbar/basicshapes.xml   |    8 +-
 .../uiconfig/swxform/toolbar/bezierobjectbar.xml   |    8 +-
 main/sw/uiconfig/swxform/toolbar/calloutshapes.xml |    8 +-
 main/sw/uiconfig/swxform/toolbar/colorbar.xml      |    8 +-
 main/sw/uiconfig/swxform/toolbar/drawbar.xml       |    8 +-
 .../uiconfig/swxform/toolbar/drawingobjectbar.xml  |    8 +-
 .../uiconfig/swxform/toolbar/drawtextobjectbar.xml |    8 +-
 .../swxform/toolbar/extrusionobjectbar.xml         |    8 +-
 main/sw/uiconfig/swxform/toolbar/findbar.xml       |    8 +-
 .../uiconfig/swxform/toolbar/flowchartshapes.xml   |    8 +-
 .../uiconfig/swxform/toolbar/fontworkobjectbar.xml |    8 +-
 .../uiconfig/swxform/toolbar/fontworkshapetype.xml |    8 +-
 main/sw/uiconfig/swxform/toolbar/formcontrols.xml  |    8 +-
 main/sw/uiconfig/swxform/toolbar/formdesign.xml    |    8 +-
 .../sw/uiconfig/swxform/toolbar/formsfilterbar.xml |    8 +-
 .../swxform/toolbar/formsnavigationbar.xml         |    8 +-
 .../uiconfig/swxform/toolbar/formtextobjectbar.xml |    8 +-
 .../sw/uiconfig/swxform/toolbar/frameobjectbar.xml |    8 +-
 main/sw/uiconfig/swxform/toolbar/fullscreenbar.xml |    8 +-
 main/sw/uiconfig/swxform/toolbar/graffilterbar.xml |    8 +-
 .../uiconfig/swxform/toolbar/graphicobjectbar.xml  |    8 +-
 main/sw/uiconfig/swxform/toolbar/insertbar.xml     |    8 +-
 .../uiconfig/swxform/toolbar/insertobjectbar.xml   |    8 +-
 .../sw/uiconfig/swxform/toolbar/mediaobjectbar.xml |    8 +-
 .../uiconfig/swxform/toolbar/moreformcontrols.xml  |    8 +-
 main/sw/uiconfig/swxform/toolbar/numobjectbar.xml  |    8 +-
 main/sw/uiconfig/swxform/toolbar/oleobjectbar.xml  |    8 +-
 .../uiconfig/swxform/toolbar/optimizetablebar.xml  |    8 +-
 main/sw/uiconfig/swxform/toolbar/standardbar.xml   |    8 +-
 main/sw/uiconfig/swxform/toolbar/starshapes.xml    |    8 +-
 main/sw/uiconfig/swxform/toolbar/symbolshapes.xml  |    8 +-
 .../sw/uiconfig/swxform/toolbar/tableobjectbar.xml |    8 +-
 main/sw/uiconfig/swxform/toolbar/textobjectbar.xml |    8 +-
 main/sw/uiconfig/swxform/toolbar/toolbar.xml       |    8 +-
 main/sw/uiconfig/swxform/toolbar/viewerbar.xml     |    8 +-
 .../swext/mediawiki/src/uno-extension-manifest.xml |   42 +-
 main/test/java/test-tools/build.xml                |   10 +-
 main/test/java/test/build.xml                      |   10 +-
 .../ui/java/ConvwatchGUIProject/build.xml          |   28 +-
 .../ConvwatchGUIProject/nbproject/build-impl.xml   |   12 +-
 .../nbproject/private/private.xml                  |    8 +-
 .../java/ConvwatchGUIProject/nbproject/project.xml |    8 +-
 .../source/awt/non-interactable-containers.xml     |    8 +-
 main/toolkit/uiconfig/layout/message-box.xml       |    8 +-
 main/toolkit/uiconfig/layout/tab-dialog.xml        |    8 +-
 main/toolkit/workben/layout/adjust.xml             |    8 +-
 main/toolkit/workben/layout/align-test.xml         |    8 +-
 main/toolkit/workben/layout/align.xml              |    8 +-
 main/toolkit/workben/layout/boxtest.xml            |    8 +-
 main/toolkit/workben/layout/dialogbuttons-ok.xml   |    8 +-
 .../toolkit/workben/layout/dialogbuttons-reset.xml |    8 +-
 main/toolkit/workben/layout/dialogbuttons-save.xml |    8 +-
 main/toolkit/workben/layout/dialogbuttons-yes.xml  |    8 +-
 main/toolkit/workben/layout/editor-normal.xml      |    8 +-
 main/toolkit/workben/layout/editor.xml             |    8 +-
 main/toolkit/workben/layout/empty.xml              |    8 +-
 main/toolkit/workben/layout/flow-container.xml     |    8 +-
 main/toolkit/workben/layout/flow.xml               |    8 +-
 main/toolkit/workben/layout/insert-sheet.xml       |    8 +-
 .../workben/layout/interactable-containers.xml     |    8 +-
 main/toolkit/workben/layout/layout-flat.xml        |    8 +-
 main/toolkit/workben/layout/layout.xml             |    8 +-
 main/toolkit/workben/layout/message-box.xml        |    8 +-
 main/toolkit/workben/layout/more.xml               |    8 +-
 main/toolkit/workben/layout/move-copy-sheet.xml    |    8 +-
 .../workben/layout/non-interactable-containers.xml |    8 +-
 main/toolkit/workben/layout/number-format.xml      |    8 +-
 main/toolkit/workben/layout/numeric.xml            |    8 +-
 main/toolkit/workben/layout/paragraph.xml          |    8 +-
 main/toolkit/workben/layout/plugin.xml             |    8 +-
 main/toolkit/workben/layout/radio-groups.xml       |    8 +-
 main/toolkit/workben/layout/recover.xml            |   14 +-
 main/toolkit/workben/layout/scroller.xml           |    8 +-
 main/toolkit/workben/layout/sequence.xml           |    8 +-
 main/toolkit/workben/layout/shutdown.xml           |    8 +-
 main/toolkit/workben/layout/simple-paragraph.xml   |    8 +-
 main/toolkit/workben/layout/sort-options.xml       |    8 +-
 main/toolkit/workben/layout/sortdlg.xml            |    8 +-
 main/toolkit/workben/layout/splitter.xml           |    8 +-
 main/toolkit/workben/layout/string-input.xml       |    8 +-
 main/toolkit/workben/layout/tab-dialog.xml         |    8 +-
 main/toolkit/workben/layout/tabcontrol.xml         |    8 +-
 main/toolkit/workben/layout/table.xml              |    8 +-
 main/toolkit/workben/layout/test.xml               |    8 +-
 main/toolkit/workben/layout/wordcount-plain.xml    |    8 +-
 main/toolkit/workben/layout/wordcount-tight.xml    |    8 +-
 main/toolkit/workben/layout/wordcount.xml          |    8 +-
 main/toolkit/workben/layout/zoom-1.xml             |    8 +-
 main/toolkit/workben/layout/zoom-2.xml             |    8 +-
 main/toolkit/workben/layout/zoom-indent.xml        |    8 +-
 main/toolkit/workben/layout/zoom-plain.xml         |    8 +-
 main/toolkit/workben/layout/zoom.xml               |    8 +-
 main/ucb/source/cacher/cached.xml                  |    8 +-
 main/ucb/source/core/ucb.xml                       |    8 +-
 main/ucb/source/sorter/srtrs.xml                   |    8 +-
 main/ucb/source/ucp/file/ucpfile.xml               |    8 +-
 main/ucb/source/ucp/ftp/ucpftp.xml                 |   10 +-
 main/ucb/source/ucp/gio/ucpgio.xml                 |    8 +-
 main/ucb/source/ucp/gvfs/ucpgvfs.xml               |    8 +-
 main/ucb/source/ucp/hierarchy/ucphier.xml          |    8 +-
 main/ucb/source/ucp/odma/ucpodma.xml               |    8 +-
 main/ucb/source/ucp/package/ucppkg.xml             |    8 +-
 main/ucb/source/ucp/tdoc/ucptdoc.xml               |    8 +-
 main/ucb/source/ucp/webdav/ucpdav.xml              |    8 +-
 main/uui/util/uui.xml                              |    8 +-
 .../qa/cppunittests/sl/helloworld.odt.flat.xml     |    8 +-
 main/writerfilter/qa/cppunittests/xxml/test.xml    |    8 +-
 main/writerfilter/source/dmapper/FFData.xml        |   10 +-
 main/writerfilter/source/doctok/dopbase.xml        |    8 +-
 main/writerfilter/source/ooxml/model.xml           |    8 +-
 main/xmerge/build.xml                              |   42 +-
 main/xmerge/java/XMergeBridge/build.xml            |   10 +-
 main/xmerge/java/aportisdoc/build.xml              |   10 +-
 .../src/main/resources/META-INF/converter.xml      |    8 +-
 main/xmerge/java/htmlsoff/build.xml                |   10 +-
 .../src/main/resources/META-INF/converter.xml      |   10 +-
 main/xmerge/java/pexcel/build.xml                  |   10 +-
 .../src/main/resources/META-INF/converter.xml      |   10 +-
 main/xmerge/java/pocketword/build.xml              |   10 +-
 .../src/main/resources/META-INF/converter.xml      |    8 +-
 main/xmerge/java/xmerge/build.xml                  |   10 +-
 .../org/openoffice/xmerge/util/registry/build.xml  |   10 +-
 main/xmerge/source/inc/antbuild.xml                |    8 +-
 main/xmerge/source/minicalc/build.xml              |   20 +-
 main/xmerge/source/minicalc/converter.xml          |    8 +-
 main/xmerge/source/wordsmith/build.xml             |   18 +-
 main/xmerge/source/wordsmith/converter.xml         |    8 +-
 main/xmerge/util/build.xml                         |   20 +-
 main/xmerge/workben/build.xml                      |   10 +-
 main/xmlhelp/java/LuceneHelpWrapper/build.xml      |    8 +-
 main/xmlhelp/util/ucpchelp.xml                     |    8 +-
 main/xmloff/xml/components.xml                     |   60 +-
 main/xmlscript/test/test.xml                       |   36 +-
 .../xmlsecurity/test_docs/tools/httpserv/build.xml |   28 +-
 .../tools/httpserv/nbproject/build-impl.xml        |   12 +-
 .../test_docs/tools/httpserv/nbproject/project.xml |    8 +-
 main/xmlsecurity/tools/examples/demo-sample.xml    |    8 +-
 main/xmlsecurity/tools/examples/enc-1.xml          |   16 +-
 main/xmlsecurity/tools/examples/enc-2.xml          |   24 +-
 main/xmlsecurity/tools/examples/s-in-e-1.xml       |   18 +-
 main/xmlsecurity/tools/examples/s-in-e-2.xml       |   18 +-
 main/xmlsecurity/tools/examples/sign-0.xml         |    8 +-
 main/xmlsecurity/tools/examples/sign-1.xml         |    8 +-
 main/xmlsecurity/tools/examples/sign-2.xml         |    8 +-
 main/xmlsecurity/tools/examples/sign-3.xml         |    8 +-
 main/xmlsecurity/tools/examples/sign-4.xml         |    8 +-
 main/xmlsecurity/tools/examples/sign-5.xml         |    8 +-
 main/xmlsecurity/tools/examples/warmup.xml         |    8 +-
 test/build.xml                                     |   16 +-
 test/smoketestdoc/aoo-ant.xml                      |    8 +-
 test/smoketestdoc/build.xml                        |    8 +-
 test/smoketestdoc/data/Events.xml                  |    8 +-
 test/smoketestdoc/data/Global.xml                  |  100 +-
 test/smoketestdoc/data/OptionsDlg.xml              |    8 +-
 test/smoketestdoc/data/Test_10er.xml               |  134 +--
 test/smoketestdoc/data/Test_DB.xml                 |   44 +-
 test/smoketestdoc/data/Test_Ext.xml                |   26 +-
 test/smoketestdoc/data/content.xml                 |    8 +-
 test/smoketestdoc/data/dialog-lb.xml               |    8 +-
 test/smoketestdoc/data/dialog-lc.xml               |    8 +-
 test/smoketestdoc/data/manifest.xml                |    8 +-
 test/smoketestdoc/data/meta.xml                    |    8 +-
 test/smoketestdoc/data/script-lb.xml               |    8 +-
 test/smoketestdoc/data/script-lc.xml               |    8 +-
 test/smoketestdoc/data/settings.xml                |    8 +-
 test/smoketestdoc/data/styles.xml                  |    8 +-
 test/smoketestdoc/idl.xml                          |    8 +-
 test/smoketestdoc/manifest.xml                     |    8 +-
 test/testassistant.feature/feature.xml             |    8 +-
 test/testassistant/contexts.xml                    |    8 +-
 test/testassistant/plugin.xml                      |    8 +-
 test/testuno/builder.xml                           |    8 +-
 1143 files changed, 8732 insertions(+), 8732 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a0d4704edc..16a6821d51 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -38,7 +38,7 @@ repos:
       - id: mixed-line-ending
         files: ^main/.*\.(c|h)xx$|^main/.*\.java$|\.(asp|c|cl|common|dxp|el|h|hrc|idl|in|ini|m|md|mk|mm|mod|pas|php|pl|pm|py|rc|rdf|sh|xba|xcs|xdl|xhp|xlb|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$|^test/testgui/.*$
       - id: trailing-whitespace
-        files: (m|M)akefile$|\.(asp|bat|c|cl|common|dxp|el|h|hrc|hxx|idl|in|ini|java|m|mk|mm|mod|pas|php|pl|pm|py|rc|rdf|sh|vbs|xba|xcs|xdl|xhp|xlb|xmi|xsd|ya?ml)$
+        files: (m|M)akefile$|\.(asp|bat|c|cl|common|dxp|el|h|hrc|hxx|idl|in|ini|java|m|mk|mm|mod|pas|php|pl|pm|py|rc|rdf|sh|vbs|xba|xcs|xdl|xhp|xlb|xmi|xml|xsd|ya?ml)$
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.1
     hooks:
diff --git a/main/accessibility/java/java_uno_accessbridge/build.xml b/main/accessibility/java/java_uno_accessbridge/build.xml
index 55d230f585..253c51c45b 100644
--- a/main/accessibility/java/java_uno_accessbridge/build.xml
+++ b/main/accessibility/java/java_uno_accessbridge/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/animations/source/animcore/animcore.xml b/main/animations/source/animcore/animcore.xml
index ec87177994..686201a4ff 100644
--- a/main/animations/source/animcore/animcore.xml
+++ b/main/animations/source/animcore/animcore.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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,7 +28,7 @@
 	<component-description>
 		<author> Christian Lippka </author>
 		<name> todo </name>
-		<description> 
+		<description>
 			This component provides ...
 		</description>
 		<loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
diff --git a/main/avmedia/source/framework/soundhandler.xml b/main/avmedia/source/framework/soundhandler.xml
index 8de01835e9..04f2c93e57 100644
--- a/main/avmedia/source/framework/soundhandler.xml
+++ b/main/avmedia/source/framework/soundhandler.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/basctl/uiconfig/basicide/menubar/menubar.xml b/main/basctl/uiconfig/basicide/menubar/menubar.xml
index 3ee157925e..3b8fa50fd2 100644
--- a/main/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/main/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
 	<menu:menu menu:id=".uno:PickList">
diff --git a/main/basctl/uiconfig/basicide/statusbar/statusbar.xml b/main/basctl/uiconfig/basicide/statusbar/statusbar.xml
index ef82c19b28..4b4978470c 100644
--- a/main/basctl/uiconfig/basicide/statusbar/statusbar.xml
+++ b/main/basctl/uiconfig/basicide/statusbar/statusbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
  <statusbar:statusbaritem xlink:href=".uno:StatusGetTitle" statusbar:align="left" statusbar:autosize="true" statusbar:width="240"/>
diff --git a/main/basctl/uiconfig/basicide/toolbar/dialogbar.xml b/main/basctl/uiconfig/basicide/toolbar/dialogbar.xml
index b1981bca16..9c633a2e34 100644
--- a/main/basctl/uiconfig/basicide/toolbar/dialogbar.xml
+++ b/main/basctl/uiconfig/basicide/toolbar/dialogbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml b/main/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml
index b5e968f005..008cb1428b 100644
--- a/main/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml
+++ b/main/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml b/main/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml
index 4e7402ef45..903036de1e 100644
--- a/main/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml
+++ b/main/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/basctl/uiconfig/basicide/toolbar/macrobar.xml b/main/basctl/uiconfig/basicide/toolbar/macrobar.xml
index da8d7e8aff..f9fb4259c4 100644
--- a/main/basctl/uiconfig/basicide/toolbar/macrobar.xml
+++ b/main/basctl/uiconfig/basicide/toolbar/macrobar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/basctl/uiconfig/basicide/toolbar/standardbar.xml b/main/basctl/uiconfig/basicide/toolbar/standardbar.xml
index 3178732ed6..83b3b6aca2 100644
--- a/main/basctl/uiconfig/basicide/toolbar/standardbar.xml
+++ b/main/basctl/uiconfig/basicide/toolbar/standardbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/basctl/uiconfig/basicide/toolbar/translationbar.xml b/main/basctl/uiconfig/basicide/toolbar/translationbar.xml
index 495e8ffdff..50c03994b3 100644
--- a/main/basctl/uiconfig/basicide/toolbar/translationbar.xml
+++ b/main/basctl/uiconfig/basicide/toolbar/translationbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/basctl/util/basctl.xml b/main/basctl/util/basctl.xml
index e9a603426d..5df4fc0d0a 100644
--- a/main/basctl/util/basctl.xml
+++ b/main/basctl/util/basctl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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,5 +41,5 @@
         <language>c++</language>
         <status value="beta"/>
         <supported-service>com.sun.star.drawing.AccessibleShape</supported-service>
-    </component-description>    
+    </component-description>
 </module-description>
diff --git a/main/bean/java/officebean/build.xml b/main/bean/java/officebean/build.xml
index 4bd205702a..cb233dfa05 100644
--- a/main/bean/java/officebean/build.xml
+++ b/main/bean/java/officebean/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,20 +8,20 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 
 
-  
+
 <project name="officebean" default="main" basedir=".">
 
     <property file="../../../ant.properties"/>
diff --git a/main/bridges/java/java_uno/build.xml b/main/bridges/java/java_uno/build.xml
index 66ca85856b..381b883674 100644
--- a/main/bridges/java/java_uno/build.xml
+++ b/main/bridges/java/java_uno/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,20 +8,20 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 
 
-  
+
 <project name="java_uno" default="main" basedir=".">
 
     <property file="../../../ant.properties"/>
diff --git a/main/chart2/uiconfig/accelerator/en-US/default.xml b/main/chart2/uiconfig/accelerator/en-US/default.xml
index 538e4577b6..33437dc92c 100644
--- a/main/chart2/uiconfig/accelerator/en-US/default.xml
+++ b/main/chart2/uiconfig/accelerator/en-US/default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
 	<accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
diff --git a/main/chart2/uiconfig/menubar/menubar.xml b/main/chart2/uiconfig/menubar/menubar.xml
index 36acf4b683..c4cde3881f 100644
--- a/main/chart2/uiconfig/menubar/menubar.xml
+++ b/main/chart2/uiconfig/menubar/menubar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
 	<menu:menu menu:id=".uno:PickList">
@@ -136,7 +136,7 @@
                 <menu:menuitem menu:id=".uno:DiagramType"/>
                 <menu:menuitem menu:id=".uno:DataRanges"/>
 			    <menu:menuitem menu:id=".uno:View3D"/>
-            
+
 		</menu:menupopup>
 	</menu:menu>
 	<menu:menu menu:id=".uno:ToolsMenu">
diff --git a/main/chart2/uiconfig/statusbar/statusbar.xml b/main/chart2/uiconfig/statusbar/statusbar.xml
index 17cb7dcd3c..999b156401 100644
--- a/main/chart2/uiconfig/statusbar/statusbar.xml
+++ b/main/chart2/uiconfig/statusbar/statusbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
  <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="208"/>
diff --git a/main/chart2/uiconfig/toolbar/arrowshapes.xml b/main/chart2/uiconfig/toolbar/arrowshapes.xml
index 68637e9c68..de5193bd9d 100644
--- a/main/chart2/uiconfig/toolbar/arrowshapes.xml
+++ b/main/chart2/uiconfig/toolbar/arrowshapes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/chart2/uiconfig/toolbar/basicshapes.xml b/main/chart2/uiconfig/toolbar/basicshapes.xml
index e7ca96a540..0b5625f9b1 100644
--- a/main/chart2/uiconfig/toolbar/basicshapes.xml
+++ b/main/chart2/uiconfig/toolbar/basicshapes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/chart2/uiconfig/toolbar/calloutshapes.xml b/main/chart2/uiconfig/toolbar/calloutshapes.xml
index 98173262f9..00d77f2db3 100644
--- a/main/chart2/uiconfig/toolbar/calloutshapes.xml
+++ b/main/chart2/uiconfig/toolbar/calloutshapes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/chart2/uiconfig/toolbar/drawbar.xml b/main/chart2/uiconfig/toolbar/drawbar.xml
index a45fd77578..3936d79b74 100644
--- a/main/chart2/uiconfig/toolbar/drawbar.xml
+++ b/main/chart2/uiconfig/toolbar/drawbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/chart2/uiconfig/toolbar/flowchartshapes.xml b/main/chart2/uiconfig/toolbar/flowchartshapes.xml
index 2b0dbc6902..12b2b45300 100644
--- a/main/chart2/uiconfig/toolbar/flowchartshapes.xml
+++ b/main/chart2/uiconfig/toolbar/flowchartshapes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/chart2/uiconfig/toolbar/standardbar.xml b/main/chart2/uiconfig/toolbar/standardbar.xml
index b38a0c5f05..cf648a6f79 100644
--- a/main/chart2/uiconfig/toolbar/standardbar.xml
+++ b/main/chart2/uiconfig/toolbar/standardbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/chart2/uiconfig/toolbar/starshapes.xml b/main/chart2/uiconfig/toolbar/starshapes.xml
index 77a9795b02..14a5aa4480 100644
--- a/main/chart2/uiconfig/toolbar/starshapes.xml
+++ b/main/chart2/uiconfig/toolbar/starshapes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/chart2/uiconfig/toolbar/symbolshapes.xml b/main/chart2/uiconfig/toolbar/symbolshapes.xml
index 3dfc36f5ec..a7f7d2f98e 100644
--- a/main/chart2/uiconfig/toolbar/symbolshapes.xml
+++ b/main/chart2/uiconfig/toolbar/symbolshapes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/chart2/uiconfig/toolbar/toolbar.xml b/main/chart2/uiconfig/toolbar/toolbar.xml
index 4ae04f541b..7564fc48fe 100644
--- a/main/chart2/uiconfig/toolbar/toolbar.xml
+++ b/main/chart2/uiconfig/toolbar/toolbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/codemaker/test/javamaker/build.xml b/main/codemaker/test/javamaker/build.xml
index 5c2dc14c4c..3a112019a6 100644
--- a/main/codemaker/test/javamaker/build.xml
+++ b/main/codemaker/test/javamaker/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/java/dbtools/build.xml b/main/connectivity/java/dbtools/build.xml
index aeacf81186..1278ddee6d 100644
--- a/main/connectivity/java/dbtools/build.xml
+++ b/main/connectivity/java/dbtools/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/java/sdbc_hsqldb/build.xml b/main/connectivity/java/sdbc_hsqldb/build.xml
index 822f39e413..d3b166cec9 100644
--- a/main/connectivity/java/sdbc_hsqldb/build.xml
+++ b/main/connectivity/java/sdbc_hsqldb/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/java/sdbc_jdbc/build.xml b/main/connectivity/java/sdbc_jdbc/build.xml
index e3a674d31f..51725a5255 100644
--- a/main/connectivity/java/sdbc_jdbc/build.xml
+++ b/main/connectivity/java/sdbc_jdbc/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/java/sdbc_jdbc/jdbc.xml b/main/connectivity/java/sdbc_jdbc/jdbc.xml
index 0628acadc7..6816aa50b5 100644
--- a/main/connectivity/java/sdbc_jdbc/jdbc.xml
+++ b/main/connectivity/java/sdbc_jdbc/jdbc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>	jdbc	</module-name>
@@ -33,7 +33,7 @@
 		<status value="final"/>
 		<supported-service>	com.sun.star.sdbc.Driver	</supported-service>
 		<service-dependency>	...	</service-dependency>
-	</component-description>	  
+	</component-description>
 	<project-build-dependency>cppuhelper</project-build-dependency>
 	<project-build-dependency>cppu</project-build-dependency>
 	<project-build-dependency>sal</project-build-dependency>
diff --git a/main/connectivity/java/sdbc_postgresql/build.xml b/main/connectivity/java/sdbc_postgresql/build.xml
index 9b507812b3..a4daf7eb60 100644
--- a/main/connectivity/java/sdbc_postgresql/build.xml
+++ b/main/connectivity/java/sdbc_postgresql/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/cpool/dbpool.xml b/main/connectivity/source/cpool/dbpool.xml
index e43e90bea5..794bd3670a 100644
--- a/main/connectivity/source/cpool/dbpool.xml
+++ b/main/connectivity/source/cpool/dbpool.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>dbpool</module-name>
@@ -32,7 +32,7 @@
 		<language>c++</language>
 		<status value="final"/>
 		<supported-service>com.sun.star.sdbc.ConnectionPool</supported-service>
-	</component-description>	  
+	</component-description>
 	<project-build-dependency>cppuhelper</project-build-dependency>
 	<project-build-dependency>cppu</project-build-dependency>
 	<project-build-dependency>sal</project-build-dependency>
diff --git a/main/connectivity/source/dbtools/dbt.xml b/main/connectivity/source/dbtools/dbt.xml
index 33feb1ff34..7da86b34d3 100644
--- a/main/connectivity/source/dbtools/dbt.xml
+++ b/main/connectivity/source/dbtools/dbt.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>dbt</module-name>
diff --git a/main/connectivity/source/drivers/adabas/adabas.xml b/main/connectivity/source/drivers/adabas/adabas.xml
index bef395d95e..dfb63c6c20 100644
--- a/main/connectivity/source/drivers/adabas/adabas.xml
+++ b/main/connectivity/source/drivers/adabas/adabas.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>adabas</module-name>
@@ -32,7 +32,7 @@
 		<language>c++</language>
 		<status value="final"/>
 		<supported-service>com.sun.star.sdbc.Driver</supported-service>
-	</component-description>	  
+	</component-description>
 	<project-build-dependency>cppuhelper</project-build-dependency>
 	<project-build-dependency>cppu</project-build-dependency>
 	<project-build-dependency>sal</project-build-dependency>
diff --git a/main/connectivity/source/drivers/ado/ado.xml b/main/connectivity/source/drivers/ado/ado.xml
index a3f53de2a5..20ac68b5d7 100644
--- a/main/connectivity/source/drivers/ado/ado.xml
+++ b/main/connectivity/source/drivers/ado/ado.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>	ado	</module-name>
@@ -32,7 +32,7 @@
 		<language>c++</language>
 		<status value="final"/>
 		<supported-service>	com.sun.star.sdbc.Driver</supported-service>
-	</component-description>	  
+	</component-description>
 	<project-build-dependency>cppuhelper</project-build-dependency>
 	<project-build-dependency>cppu</project-build-dependency>
 	<project-build-dependency>sal</project-build-dependency>
diff --git a/main/connectivity/source/drivers/calc/CalcDriver.xml b/main/connectivity/source/drivers/calc/CalcDriver.xml
index 056aa23fa5..e4b15acc64 100644
--- a/main/connectivity/source/drivers/calc/CalcDriver.xml
+++ b/main/connectivity/source/drivers/calc/CalcDriver.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description>
 	<module-name>file</module-name>
diff --git a/main/connectivity/source/drivers/dbase/dbase.xml b/main/connectivity/source/drivers/dbase/dbase.xml
index 2511f67840..7b9e1a3c4f 100644
--- a/main/connectivity/source/drivers/dbase/dbase.xml
+++ b/main/connectivity/source/drivers/dbase/dbase.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description>
 	<module-name>file</module-name>
diff --git a/main/connectivity/source/drivers/evoab2/evoab.xml b/main/connectivity/source/drivers/evoab2/evoab.xml
index a6a02f1f48..9c4e5b5778 100644
--- a/main/connectivity/source/drivers/evoab2/evoab.xml
+++ b/main/connectivity/source/drivers/evoab2/evoab.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description>
 	<module-name>evoab</module-name>
diff --git a/main/connectivity/source/drivers/file/file.xml b/main/connectivity/source/drivers/file/file.xml
index a54d8bfc86..cf768e4d64 100644
--- a/main/connectivity/source/drivers/file/file.xml
+++ b/main/connectivity/source/drivers/file/file.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description>
 	<module-name>file</module-name>
diff --git a/main/connectivity/source/drivers/flat/flat.xml b/main/connectivity/source/drivers/flat/flat.xml
index 409f61656d..68bb19b80b 100644
--- a/main/connectivity/source/drivers/flat/flat.xml
+++ b/main/connectivity/source/drivers/flat/flat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description>
 	<module-name>file</module-name>
diff --git a/main/connectivity/source/drivers/hsqldb/hsqldb.xml b/main/connectivity/source/drivers/hsqldb/hsqldb.xml
index 3eb9b7db28..ce4cb8e04b 100644
--- a/main/connectivity/source/drivers/hsqldb/hsqldb.xml
+++ b/main/connectivity/source/drivers/hsqldb/hsqldb.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>hsqldb</module-name>
@@ -32,7 +32,7 @@
 		<language>c++</language>
 		<status value="final"/>
 		<supported-service>com.sun.star.sdbcx.Driver</supported-service>
-	</component-description>	  
+	</component-description>
 	<project-build-dependency>cppuhelper</project-build-dependency>
 	<project-build-dependency>cppu</project-build-dependency>
 	<project-build-dependency>sal</project-build-dependency>
diff --git a/main/connectivity/source/drivers/jdbc/jdbc.xml b/main/connectivity/source/drivers/jdbc/jdbc.xml
index 0628acadc7..6816aa50b5 100644
--- a/main/connectivity/source/drivers/jdbc/jdbc.xml
+++ b/main/connectivity/source/drivers/jdbc/jdbc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>	jdbc	</module-name>
@@ -33,7 +33,7 @@
 		<status value="final"/>
 		<supported-service>	com.sun.star.sdbc.Driver	</supported-service>
 		<service-dependency>	...	</service-dependency>
-	</component-description>	  
+	</component-description>
 	<project-build-dependency>cppuhelper</project-build-dependency>
 	<project-build-dependency>cppu</project-build-dependency>
 	<project-build-dependency>sal</project-build-dependency>
diff --git a/main/connectivity/source/drivers/macab/macab.xml b/main/connectivity/source/drivers/macab/macab.xml
index 83ff1a9c77..84b06ac6d6 100644
--- a/main/connectivity/source/drivers/macab/macab.xml
+++ b/main/connectivity/source/drivers/macab/macab.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>	macab1	</module-name>
@@ -31,7 +31,7 @@
 		<status value="alpha"/>
 		<supported-service>com.sun.star.sdbc.Driver</supported-service>
 		<service-dependency>	...	</service-dependency>
-	</component-description>	  
+	</component-description>
 	<project-build-dependency>	cppuhelper	</project-build-dependency>
 	<project-build-dependency>	cppu		</project-build-dependency>
 	<project-build-dependency>	sal			</project-build-dependency>
@@ -66,7 +66,7 @@
 	<type>	com.sun.star.lang.XServiceInfo				</type>
 	<type>	com.sun.star.lang.XUnoTunnel				</type>
 	<type>	com.sun.star.java.XJavaThreadRegister_11	</type>
-	<type>	com.sun.star.java.XJavaVM					</type>	
+	<type>	com.sun.star.java.XJavaVM					</type>
 	<type>	com.sun.star.sdbc.FetchDirection			</type>
 	<type>	com.sun.star.sdbc.XConnection				</type>
 	<type>	com.sun.star.sdbc.XStatement				</type>
diff --git a/main/connectivity/source/drivers/mysql/mysql.xml b/main/connectivity/source/drivers/mysql/mysql.xml
index 14ea474af0..6e2fc4596e 100644
--- a/main/connectivity/source/drivers/mysql/mysql.xml
+++ b/main/connectivity/source/drivers/mysql/mysql.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>odbc</module-name>
@@ -33,7 +33,7 @@
 		<status value="final"/>
 		<supported-service>com.sun.star.sdbc.Driver</supported-service>
 		<supported-service>com.sun.star.sdbcx.Driver</supported-service>
-	</component-description>	  
+	</component-description>
 	<project-build-dependency>cppuhelper</project-build-dependency>
 	<project-build-dependency>cppu</project-build-dependency>
 	<project-build-dependency>sal</project-build-dependency>
diff --git a/main/connectivity/source/drivers/odbc/odbc.xml b/main/connectivity/source/drivers/odbc/odbc.xml
index ed5e58efef..e85f5a953d 100644
--- a/main/connectivity/source/drivers/odbc/odbc.xml
+++ b/main/connectivity/source/drivers/odbc/odbc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
 	<module-name>odbc</module-name>
@@ -32,7 +32,7 @@
 		<language>c++</language>
 		<status value="final"/>
 		<supported-service>com.sun.star.sdbc.Driver</supported-service>
-	</component-description>	  
+	</component-description>
 	<project-build-dependency>cppuhelper</project-build-dependency>
 	<project-build-dependency>cppu</project-build-dependency>
 	<project-build-dependency>sal</project-build-dependency>
diff --git a/main/cppuhelper/test/cfg_data/instance/uno/components.xml b/main/cppuhelper/test/cfg_data/instance/uno/components.xml
index 10acc98055..e0b71259ca 100644
--- a/main/cppuhelper/test/cfg_data/instance/uno/components.xml
+++ b/main/cppuhelper/test/cfg_data/instance/uno/components.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 
 <components cfg:package="uno"
@@ -25,7 +25,7 @@
             xmlns:cfg="http://openoffice.org/2000/registry/instance"
 	    xmlns="http://openoffice.org/2000/uno/Components">
 
-	    
+
 <services cfg:type="set" cfg:element-type="service">
 
  <service cfg:name="com.sun.star.script.Converter">
@@ -33,7 +33,7 @@
    com.sun.star.comp.stoc.TypeConverter
   </available-implementations>
  </service>
- 
+
  <service cfg:name="com.sun.star.bootstrap.TestComponent0">
   <available-implementations cfg:type="string" cfg:derivedBy="list">
    com.sun.star.comp.bootstrap.TestComponent0
@@ -43,7 +43,7 @@
    <cfg:any cfg:name="serviceprop1" cfg:type="string">value of serviceprop1</cfg:any>
   </context-properties>
  </service>
- 
+
 </services>
 
 
@@ -54,7 +54,7 @@
   <url cfg:type="string">tcv.dll</url>
   <supported-services cfg:type="string" cfg:derivedBy="list">com.sun.star.script.Converter</supported-services>
  </implementation>
- 
+
  <implementation cfg:name="com.sun.star.comp.bootstrap.TestComponent0">
   <activator cfg:type="string">com.sun.star.loader.SharedLibrary</activator>
   <url cfg:type="string">cfg_test.dll</url>
@@ -64,7 +64,7 @@
    <cfg:any cfg:name="implprop1" cfg:type="string">value of implprop1</cfg:any>
   </context-properties>
  </implementation>
- 
+
 </implementations>
 
 
@@ -73,7 +73,7 @@
  <singleton cfg:name="com.sun.star.script.theConverter">
   <used-service cfg:type="string">com.sun.star.script.Converter</used-service>
  </singleton>
- 
+
  <singleton cfg:name="com.sun.star.bootstrap.theTestComponent0">
   <used-service cfg:type="string">com.sun.star.bootstrap.TestComponent0</used-service>
   <initial-arguments cfg:type="set" cfg:element-type="cfg:any">
@@ -82,14 +82,14 @@
    <cfg:any cfg:name="2" cfg:type="string">third argument</cfg:any>
   </initial-arguments>
  </singleton>
- 
+
 </singletons>
 
 
 <global-context-properties cfg:type="set" cfg:element-type="cfg:any">
 
  <cfg:any cfg:name="TestValue" cfg:type="int">5</cfg:any>
- 
+
 </global-context-properties>
 
 
diff --git a/main/cppuhelper/test/cfg_data/template/uno/components.xml b/main/cppuhelper/test/cfg_data/template/uno/components.xml
index d53318d051..14e4c05941 100644
--- a/main/cppuhelper/test/cfg_data/template/uno/components.xml
+++ b/main/cppuhelper/test/cfg_data/template/uno/components.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 
 <components cfg:package="uno"
diff --git a/main/dbaccess/prj/dba.xml b/main/dbaccess/prj/dba.xml
index 4a47e4210a..8520b6b923 100644
--- a/main/dbaccess/prj/dba.xml
+++ b/main/dbaccess/prj/dba.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/prj/dbu.xml b/main/dbaccess/prj/dbu.xml
index 4586798206..8f80a7d928 100644
--- a/main/dbaccess/prj/dbu.xml
+++ b/main/dbaccess/prj/dbu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 
 
@@ -132,7 +132,7 @@
 		<status value="final"/>
 		<supported-service>com.sun.star.accessibility.Accessible</supported-service>
 		<supported-service>com.sun.star.accessibility.AccessibleContext</supported-service>
-	</component-description>	
+	</component-description>
 	<component-description>
 		<author>Ocke Janssen</author>
 		<name>com.sun.star.comp.dbu.OColumnControl</name>
diff --git a/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index 143b1f5715..3007bed99f 100644
--- a/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
 	<menu:menu menu:id=".uno:PickList">
diff --git a/main/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml b/main/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml
index 81be8562e6..650305a2c1 100644
--- a/main/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml
+++ b/main/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
  <statusbar:statusbaritem xlink:href=".uno:DBStatusType" statusbar:align="left" statusbar:autosize="true" statusbar:width="50"/>
diff --git a/main/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml b/main/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
index a18895ac1e..f579ede872 100644
--- a/main/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
+++ b/main/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbapp/toolbar/queryobjectbar.xml b/main/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml
index 5c821ea64d..b6aaea5615 100644
--- a/main/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml
+++ b/main/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbapp/toolbar/reportobjectbar.xml b/main/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml
index ccfc8110bf..368ada8f6c 100644
--- a/main/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml
+++ b/main/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbapp/toolbar/tableobjectbar.xml b/main/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml
index bea9a4c398..2190aaf8ec 100644
--- a/main/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml
+++ b/main/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbapp/toolbar/toolbar.xml b/main/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
index 3fb0493238..445ec76a68 100644
--- a/main/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
+++ b/main/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbbrowser/menubar/compat.xml b/main/dbaccess/uiconfig/dbbrowser/menubar/compat.xml
index cca89cb9d5..5a04f249c1 100644
--- a/main/dbaccess/uiconfig/dbbrowser/menubar/compat.xml
+++ b/main/dbaccess/uiconfig/dbbrowser/menubar/compat.xml
@@ -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,15 +7,15 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <compat/>
diff --git a/main/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml b/main/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml
index a846487a98..332e26668c 100644
--- a/main/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml
+++ b/main/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbquery/menubar/menubar.xml b/main/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index eaa21e9e9c..f796de3293 100644
--- a/main/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/main/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
 	<menu:menu menu:id=".uno:PickList">
diff --git a/main/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml b/main/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
index 901e55a98a..a355de6918 100644
--- a/main/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
+++ b/main/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbquery/toolbar/sqlobjectbar.xml b/main/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
index 95dd2e4d75..3e79de247b 100644
--- a/main/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
+++ b/main/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbquery/toolbar/toolbar.xml b/main/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml
index 6c526bd009..8d5cc2f3a5 100644
--- a/main/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml
+++ b/main/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbrelation/menubar/menubar.xml b/main/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 337d3c87de..c883565e3d 100644
--- a/main/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/main/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
 	<menu:menu menu:id=".uno:PickList">
diff --git a/main/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml b/main/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml
index 2a47dc239d..ebf5d5260f 100644
--- a/main/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml
+++ b/main/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbtable/menubar/menubar.xml b/main/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index 1483c4779e..b31e42c1e2 100644
--- a/main/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/main/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
 	<menu:menu menu:id=".uno:PickList">
diff --git a/main/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml b/main/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml
index 90090662b2..33103a7bf4 100644
--- a/main/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml
+++ b/main/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/dbtdata/menubar/menubar.xml b/main/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index ffbeac3b9f..ee7f1ddac3 100644
--- a/main/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/main/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
 	<menu:menu menu:id=".uno:PickList">
diff --git a/main/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml b/main/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml
index f5a39c382e..ca28ca4f0e 100644
--- a/main/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml
+++ b/main/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/test/deployment/active/description.xml b/main/desktop/test/deployment/active/description.xml
index e3c6e47634..d36afce236 100644
--- a/main/desktop/test/deployment/active/description.xml
+++ b/main/desktop/test/deployment/active/description.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/test/deployment/active/manifest.xml b/main/desktop/test/deployment/active/manifest.xml
index a7df7f9162..718cf09688 100644
--- a/main/desktop/test/deployment/active/manifest.xml
+++ b/main/desktop/test/deployment/active/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/test/deployment/boxt/description.xml b/main/desktop/test/deployment/boxt/description.xml
index 248a17d2f7..7edbcdbe80 100644
--- a/main/desktop/test/deployment/boxt/description.xml
+++ b/main/desktop/test/deployment/boxt/description.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/test/deployment/boxt/manifest.xml b/main/desktop/test/deployment/boxt/manifest.xml
index 0cfa42d5e5..83c33a6af1 100644
--- a/main/desktop/test/deployment/boxt/manifest.xml
+++ b/main/desktop/test/deployment/boxt/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/test/deployment/locationtest/description.xml b/main/desktop/test/deployment/locationtest/description.xml
index 3a3bacd919..de27b3e17f 100644
--- a/main/desktop/test/deployment/locationtest/description.xml
+++ b/main/desktop/test/deployment/locationtest/description.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,25 +8,25 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/description/2006"
-     xmlns:xlink="http://www.w3.org/1999/xlink" 
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:d="http://openoffice.org/extensions/description/2006" >
   <identifier value="org.openoffice.extensions.testarea.desktop.location"/>
   <version value="1.0" />
   <dependencies >
     <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
-  </dependencies> 
+  </dependencies>
   <update-information>
     <src xlink:href="http://update.services.openoffice.org/ProductUpdateService/check.Update?product=extension&amp;extensionid=org.openoffice.extensions.testarea.desktop.updateinfo&amp;refresh=true"/>
   </update-information>
diff --git a/main/desktop/test/deployment/locationtest/manifest.xml b/main/desktop/test/deployment/locationtest/manifest.xml
index 1890fe22cf..8cd7dbecd5 100644
--- a/main/desktop/test/deployment/locationtest/manifest.xml
+++ b/main/desktop/test/deployment/locationtest/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <manifest:manifest>
  <manifest:file-entry manifest:full-path="LocationTest.jar" manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
diff --git a/main/desktop/test/deployment/passive/description.xml b/main/desktop/test/deployment/passive/description.xml
index c8c89c1e0e..5f5c1e0d7f 100644
--- a/main/desktop/test/deployment/passive/description.xml
+++ b/main/desktop/test/deployment/passive/description.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/test/deployment/passive/manifest.xml b/main/desktop/test/deployment/passive/manifest.xml
index cf9c02533c..52e1adea2b 100644
--- a/main/desktop/test/deployment/passive/manifest.xml
+++ b/main/desktop/test/deployment/passive/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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/test/deployment/update/changing_display_name/update1/change1.update.xml b/main/desktop/test/deployment/update/changing_display_name/update1/change1.update.xml
index 941513b4fb..63de8b6bfb 100644
--- a/main/desktop/test/deployment/update/changing_display_name/update1/change1.update.xml
+++ b/main/desktop/test/deployment/update/changing_display_name/update1/change1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice/framework/desktop/changing_display_name/change1" />
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/changing_display_name/update1/change1.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/changing_display_name/update2/change1.update.xml b/main/desktop/test/deployment/update/changing_display_name/update2/change1.update.xml
index b78012820b..38218d19bf 100644
--- a/main/desktop/test/deployment/update/changing_display_name/update2/change1.update.xml
+++ b/main/desktop/test/deployment/update/changing_display_name/update2/change1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice/framework/desktop/changing_display_name/change1" />
-    <version value="3.0" />    
+    <version value="3.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/changing_display_name/update2/change1.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/default_url/update/default1.update.xml b/main/desktop/test/deployment/update/default_url/update/default1.update.xml
index 9e47438605..bd4810e302 100644
--- a/main/desktop/test/deployment/update/default_url/update/default1.update.xml
+++ b/main/desktop/test/deployment/update/default_url/update/default1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.default1.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/default_url/update/default1.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/default_url/update/default2.update.xml b/main/desktop/test/deployment/update/default_url/update/default2.update.xml
index be0f35cd14..8d6c1bb216 100644
--- a/main/desktop/test/deployment/update/default_url/update/default2.update.xml
+++ b/main/desktop/test/deployment/update/default_url/update/default2.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.default2.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/default_url/update/default2.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/default_url/update/feed1.xml b/main/desktop/test/deployment/update/default_url/update/feed1.xml
index 7919ab2164..b71922c1a9 100644
--- a/main/desktop/test/deployment/update/default_url/update/feed1.xml
+++ b/main/desktop/test/deployment/update/default_url/update/feed1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-US">
 
diff --git a/main/desktop/test/deployment/update/defect/update/fail1.update.xml b/main/desktop/test/deployment/update/defect/update/fail1.update.xml
index 51c0df5470..c37cd92040 100644
--- a/main/desktop/test/deployment/update/defect/update/fail1.update.xml
+++ b/main/desktop/test/deployment/update/defect/update/fail1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.fail1.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/defect/update/fail1.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/defect/update/fail2.update.xml b/main/desktop/test/deployment/update/defect/update/fail2.update.xml
index 39113cc47c..337fed00e4 100644
--- a/main/desktop/test/deployment/update/defect/update/fail2.update.xml
+++ b/main/desktop/test/deployment/update/defect/update/fail2.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.fail2.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/defect/update/fail2.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/defect/update/fail3.update.xml b/main/desktop/test/deployment/update/defect/update/fail3.update.xml
index 90a140fc10..fd0d6b061c 100644
--- a/main/desktop/test/deployment/update/defect/update/fail3.update.xml
+++ b/main/desktop/test/deployment/update/defect/update/fail3.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.fail3.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/defect/update/fail3.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/defect/update/fail4.update.xml b/main/desktop/test/deployment/update/defect/update/fail4.update.xml
index 574a47e4f5..91f39563ab 100644
--- a/main/desktop/test/deployment/update/defect/update/fail4.update.xml
+++ b/main/desktop/test/deployment/update/defect/update/fail4.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.fail4.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/defect/update/fail4.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/defect/update/info3.update.xml b/main/desktop/test/deployment/update/defect/update/info3.update.xml
index f754534838..7ff28623d1 100644
--- a/main/desktop/test/deployment/update/defect/update/info3.update.xml
+++ b/main/desktop/test/deployment/update/defect/update/info3.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.info3.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <<update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/defect/update/info3.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml b/main/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
index 5668bef1ee..a8332c0507 100644
--- a/main/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
+++ b/main/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 
 
@@ -58,10 +58,10 @@
 
   <publisher>
     <name xlink:href="http://extensions.openoffice.org/testarea/desktop/dependencies/publisher_en.html" lang="en">My Extension Company</name>
-  </publisher>    
+  </publisher>
 
   <release-notes>
     <src xlink:href="http://extensions.openoffice.org/testarea/desktop/dependencies/release-notes_en.html" lang="en" />
-  </release-notes> 
+  </release-notes>
 
 </description>
diff --git a/main/desktop/test/deployment/update/license/update/lic1.update.xml b/main/desktop/test/deployment/update/license/update/lic1.update.xml
index 955d16fc25..ba68905203 100644
--- a/main/desktop/test/deployment/update/license/update/lic1.update.xml
+++ b/main/desktop/test/deployment/update/license/update/lic1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.lic1.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/license/update/lic1.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/license/update/lic2.update.xml b/main/desktop/test/deployment/update/license/update/lic2.update.xml
index 912af79ff9..d0b7431565 100644
--- a/main/desktop/test/deployment/update/license/update/lic2.update.xml
+++ b/main/desktop/test/deployment/update/license/update/lic2.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.lic2.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/license/update/lic2.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/license/update/lic3.update.xml b/main/desktop/test/deployment/update/license/update/lic3.update.xml
index e4c25d8f73..a36e333494 100644
--- a/main/desktop/test/deployment/update/license/update/lic3.update.xml
+++ b/main/desktop/test/deployment/update/license/update/lic3.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.lic3.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/license/update/lic3.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/publisher/update/pub1.update.xml b/main/desktop/test/deployment/update/publisher/update/pub1.update.xml
index eb964ec864..e8e90ebf6e 100644
--- a/main/desktop/test/deployment/update/publisher/update/pub1.update.xml
+++ b/main/desktop/test/deployment/update/publisher/update/pub1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,23 +8,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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
+
+    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub1"/>
 
-    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub1"/> 
-    
     <publisher>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de.html" lang="de">My OpenOffice de</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en.html" lang="en">My OpenOffice en</name>
@@ -35,7 +35,7 @@
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US-region1.html" lang="en-US-region1">My OpenOffice en-US-region1</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US-region2.html" lang="en-US-region2">My OpenOffice en-US-region2</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-region3.html" lang="en-region3">My OpenOffice en-region3</name>
-    </publisher>    
+    </publisher>
 
     <release-notes>
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de.html" lang="de" />
@@ -47,7 +47,7 @@
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-US-region1.html" lang="en-US-region1" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-US-region2.html" lang="en-US-region2" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-region3.html" lang="en-region3" />
-    </release-notes> 
+    </release-notes>
 
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/update/pub1.oxt" />
diff --git a/main/desktop/test/deployment/update/publisher/update/pub2.update.xml b/main/desktop/test/deployment/update/publisher/update/pub2.update.xml
index 522e51d201..f8fa2c0109 100644
--- a/main/desktop/test/deployment/update/publisher/update/pub2.update.xml
+++ b/main/desktop/test/deployment/update/publisher/update/pub2.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,23 +8,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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
+
+    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub2"/>
 
-    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub2"/> 
-    
     <publisher>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de.html" lang="de">My OpenOffice de</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en.html" lang="en">My OpenOffice en</name>
@@ -34,7 +34,7 @@
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US-region1.html" lang="en-US-region1">My OpenOffice en-US-region1</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US-region2.html" lang="en-US-region2">My OpenOffice en-US-region2</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-region3.html" lang="en-region3">My OpenOffice en-region3</name>
-    </publisher>    
+    </publisher>
 
     <release-notes>
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de.html" lang="de" />
@@ -45,7 +45,7 @@
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-US-region1.html" lang="en-US-region1" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-US-region2.html" lang="en-US-region2" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-region3.html" lang="en-region3" />
-    </release-notes> 
+    </release-notes>
 
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/update/pub2.oxt" />
diff --git a/main/desktop/test/deployment/update/publisher/update/pub3.update.xml b/main/desktop/test/deployment/update/publisher/update/pub3.update.xml
index f176e30315..b3f2c9ac2a 100644
--- a/main/desktop/test/deployment/update/publisher/update/pub3.update.xml
+++ b/main/desktop/test/deployment/update/publisher/update/pub3.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,23 +8,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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
+
+    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub3"/>
 
-    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub3"/> 
-    
     <publisher>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de.html" lang="de">My OpenOffice de</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en.html" lang="en">My OpenOffice en</name>
@@ -32,7 +32,7 @@
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de-DE-altmark.html" lang="de-DE-altmark">My OpenOffice de-DE-altmark</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-GB.html" lang="en-GB">My OpenOffice en-GB</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-region3.html" lang="en-region3">My OpenOffice en-region3</name>
-    </publisher>    
+    </publisher>
 
     <release-notes>
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de.html" lang="de" />
@@ -41,7 +41,7 @@
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de-DE-altmark.html" lang="de-DE-altmark" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-GB.html" lang="en-GB" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-region3.html" lang="en-region3" />
-    </release-notes> 
+    </release-notes>
 
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/update/pub3.oxt" />
diff --git a/main/desktop/test/deployment/update/publisher/update/pub4.update.xml b/main/desktop/test/deployment/update/publisher/update/pub4.update.xml
index 59ad7c05dc..43cb04bb12 100644
--- a/main/desktop/test/deployment/update/publisher/update/pub4.update.xml
+++ b/main/desktop/test/deployment/update/publisher/update/pub4.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,30 +8,30 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
+
+    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub4"/>
 
-    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub4"/> 
-    
     <publisher>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de.html" lang="de">My OpenOffice de</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de-DE.html" lang="de-DE">My OpenOffice de-DE</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de-DE-altmark.html" lang="de-DE-altmark">My OpenOffice de-DE-altmark</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-GB.html" lang="en-GB">My OpenOffice en-GB</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-region3.html" lang="en-region3">My OpenOffice en-region3</name>
-    </publisher>    
+    </publisher>
 
     <release-notes>
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de.html" lang="de" />
@@ -39,7 +39,7 @@
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de-DE-altmark.html" lang="de-DE-altmark" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-GB.html" lang="en-GB" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-region3.html" lang="en-region3" />
-    </release-notes> 
+    </release-notes>
 
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/update/pub4.oxt" />
diff --git a/main/desktop/test/deployment/update/publisher/update/pub5.update.xml b/main/desktop/test/deployment/update/publisher/update/pub5.update.xml
index 1774b3a713..14018802bc 100644
--- a/main/desktop/test/deployment/update/publisher/update/pub5.update.xml
+++ b/main/desktop/test/deployment/update/publisher/update/pub5.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,34 +8,34 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
+
+    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub5"/>
 
-    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub5"/> 
-    
     <publisher>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de.html" lang="de">My OpenOffice de</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de-DE.html" lang="de-DE">My OpenOffice de-DE</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de-DE-altmark.html" lang="de-DE-altmark">My OpenOffice de-DE-altmark</name>
-    </publisher>    
+    </publisher>
 
     <release-notes>
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de.html" lang="de" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de-DE.html" lang="de-DE" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de-DE-altmark.html" lang="de-DE-altmark" />
-    </release-notes> 
+    </release-notes>
 
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/update/pub5.oxt" />
diff --git a/main/desktop/test/deployment/update/publisher/update/pub6.update.xml b/main/desktop/test/deployment/update/publisher/update/pub6.update.xml
index 715e6d8c37..a3f66c4f60 100644
--- a/main/desktop/test/deployment/update/publisher/update/pub6.update.xml
+++ b/main/desktop/test/deployment/update/publisher/update/pub6.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,23 +8,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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
+
+    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub6"/>
 
-    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub6"/> 
-    
     <publisher>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de.html" lang="de">My OpenOffice de</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en.html" lang="en">My OpenOffice en</name>
@@ -35,7 +35,7 @@
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US-region1.html" lang="en-US-region1">My OpenOffice en-US-region1</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US-region2.html" lang="en-US-region2">My OpenOffice en-US-region2</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-region3.html" lang="en-region3">My OpenOffice en-region3</name>
-    </publisher>    
+    </publisher>
 
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/update/pub6.oxt" />
diff --git a/main/desktop/test/deployment/update/publisher/update/pub7.update.xml b/main/desktop/test/deployment/update/publisher/update/pub7.update.xml
index 74efb1f0d3..c6b397d768 100644
--- a/main/desktop/test/deployment/update/publisher/update/pub7.update.xml
+++ b/main/desktop/test/deployment/update/publisher/update/pub7.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,23 +8,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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
+
+    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub7"/>
 
-    <identifier value="org.openoffice/framework/desktop/test/deployment/update/publisher/pub7"/> 
-    
     <release-notes>
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de.html" lang="de" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en.html" lang="en" />
@@ -35,7 +35,7 @@
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-US-region1.html" lang="en-US-region1" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-US-region2.html" lang="en-US-region2" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en-region3.html" lang="en-region3" />
-    </release-notes> 
+    </release-notes>
 
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/update/pub7.oxt" />
diff --git a/main/desktop/test/deployment/update/simple/update/plain1.update.xml b/main/desktop/test/deployment/update/simple/update/plain1.update.xml
index 1e66c8c062..b16a61f733 100644
--- a/main/desktop/test/deployment/update/simple/update/plain1.update.xml
+++ b/main/desktop/test/deployment/update/simple/update/plain1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.plain1.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/simple/update/plain1.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/simple/update/plain2.update.xml b/main/desktop/test/deployment/update/simple/update/plain2.update.xml
index 7199bce58c..e87d2fdb68 100644
--- a/main/desktop/test/deployment/update/simple/update/plain2.update.xml
+++ b/main/desktop/test/deployment/update/simple/update/plain2.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.plain2.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/simple/update/plain2.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/simple/update/plain3.update.xml b/main/desktop/test/deployment/update/simple/update/plain3.update.xml
index 73793fba43..f0e1b9a76e 100644
--- a/main/desktop/test/deployment/update/simple/update/plain3.update.xml
+++ b/main/desktop/test/deployment/update/simple/update/plain3.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.plain3.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/simple/update/plain3.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/updatefeed/update/feed1.update.xml b/main/desktop/test/deployment/update/updatefeed/update/feed1.update.xml
index 4e2e0867ba..01ae01e497 100644
--- a/main/desktop/test/deployment/update/updatefeed/update/feed1.update.xml
+++ b/main/desktop/test/deployment/update/updatefeed/update/feed1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.feed1.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/updatefeed/update/feed1.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/updatefeed/update/feed1.xml b/main/desktop/test/deployment/update/updatefeed/update/feed1.xml
index aea5c45e37..234c889ab2 100644
--- a/main/desktop/test/deployment/update/updatefeed/update/feed1.xml
+++ b/main/desktop/test/deployment/update/updatefeed/update/feed1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-US">
 
diff --git a/main/desktop/test/deployment/update/updatefeed/update/feed2.update.xml b/main/desktop/test/deployment/update/updatefeed/update/feed2.update.xml
index 381ecd284c..082a58a336 100644
--- a/main/desktop/test/deployment/update/updatefeed/update/feed2.update.xml
+++ b/main/desktop/test/deployment/update/updatefeed/update/feed2.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.feed2.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/updatefeed/update/feed2.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/updateinfocreation/build/description.xml b/main/desktop/test/deployment/update/updateinfocreation/build/description.xml
index 3447848285..3f70c2309b 100644
--- a/main/desktop/test/deployment/update/updateinfocreation/build/description.xml
+++ b/main/desktop/test/deployment/update/updateinfocreation/build/description.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,25 +8,25 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/description/2006"
-     xmlns:xlink="http://www.w3.org/1999/xlink" 
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:d="http://openoffice.org/extensions/description/2006" >
   <identifier value="org.openoffice.extensions.testarea.desktop.updateinfo"/>
   <version value="2.0" />
   <dependencies >
     <OpenOffice.org-minimal-version value="2.1" d:name="OpenOffice.org 2.1"/>
-  </dependencies> 
+  </dependencies>
   <update-information>
     <src xlink:href="http://update.services.openoffice.org/ProductUpdateService/check.Update?product=extension&amp;extensionid=org.openoffice.extensions.testarea.desktop.updateinfo&amp;refresh=true"/>
   </update-information>
diff --git a/main/desktop/test/deployment/update/updateinfocreation/build/manifest.xml b/main/desktop/test/deployment/update/updateinfocreation/build/manifest.xml
index f0227aefd2..e6d054442c 100644
--- a/main/desktop/test/deployment/update/updateinfocreation/build/manifest.xml
+++ b/main/desktop/test/deployment/update/updateinfocreation/build/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <manifest:manifest>
  <manifest:file-entry manifest:full-path="TestExtension.jar" manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
diff --git a/main/desktop/test/deployment/update/website_update/update/web1.update.xml b/main/desktop/test/deployment/update/website_update/update/web1.update.xml
index 63f4124484..0e6b0f8eab 100644
--- a/main/desktop/test/deployment/update/website_update/update/web1.update.xml
+++ b/main/desktop/test/deployment/update/website_update/update/web1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,20 +8,20 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
 
     <identifier value="org.openoffice/framework/desktop/test/deployment/update/website_update/web1"/>
 
diff --git a/main/desktop/test/deployment/update/website_update/update/web2.update.xml b/main/desktop/test/deployment/update/website_update/update/web2.update.xml
index c0a9756b9f..0ba2822a98 100644
--- a/main/desktop/test/deployment/update/website_update/update/web2.update.xml
+++ b/main/desktop/test/deployment/update/website_update/update/web2.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,20 +8,20 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
 
     <identifier value="org.openoffice/framework/desktop/test/deployment/update/website_update/web2"/>
 
diff --git a/main/desktop/test/deployment/update/website_update/update/web3.update.xml b/main/desktop/test/deployment/update/website_update/update/web3.update.xml
index 35691e8eee..48fcaa50cd 100644
--- a/main/desktop/test/deployment/update/website_update/update/web3.update.xml
+++ b/main/desktop/test/deployment/update/website_update/update/web3.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,20 +8,20 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
 
     <identifier value="org.openoffice/framework/desktop/test/deployment/update/website_update/web3"/>
 
diff --git a/main/desktop/test/deployment/update/website_update/update/web4.update.xml b/main/desktop/test/deployment/update/website_update/update/web4.update.xml
index 2bf93cdf21..bacdd491b0 100644
--- a/main/desktop/test/deployment/update/website_update/update/web4.update.xml
+++ b/main/desktop/test/deployment/update/website_update/update/web4.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,20 +8,20 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
 
     <identifier value="org.openoffice/framework/desktop/test/deployment/update/website_update/web4"/>
 
diff --git a/main/desktop/test/deployment/update/website_update/update/web5.update.xml b/main/desktop/test/deployment/update/website_update/update/web5.update.xml
index fefa6c723d..92374c50af 100644
--- a/main/desktop/test/deployment/update/website_update/update/web5.update.xml
+++ b/main/desktop/test/deployment/update/website_update/update/web5.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,20 +8,20 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
+    <version value="2.0" />
 
     <identifier value="org.openoffice/framework/desktop/test/deployment/update/website_update/web5"/>
 
diff --git a/main/desktop/test/deployment/update/website_update/update/web6/description.xml b/main/desktop/test/deployment/update/website_update/update/web6/description.xml
index a1cc3c4bad..02801ee678 100644
--- a/main/desktop/test/deployment/update/website_update/update/web6/description.xml
+++ b/main/desktop/test/deployment/update/website_update/update/web6/description.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/description/2006"
     xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
-    <identifier value="org.openoffice/framework/desktop/test/deployment/update/website_update/web6"/> 
+    <version value="2.0" />
+    <identifier value="org.openoffice/framework/desktop/test/deployment/update/website_update/web6"/>
     <display-name>
       <name lang="en">web-based update test 1</name>
     </display-name>
diff --git a/main/desktop/test/deployment/update/website_update/update/web7/description.xml b/main/desktop/test/deployment/update/website_update/update/web7/description.xml
index bdcec4c1db..a83edb510c 100644
--- a/main/desktop/test/deployment/update/website_update/update/web7/description.xml
+++ b/main/desktop/test/deployment/update/website_update/update/web7/description.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/description/2006"
     xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="2.0" />    
-    <identifier value="org.openoffice/framework/desktop/test/deployment/update/website_update/web7"/> 
+    <version value="2.0" />
+    <identifier value="org.openoffice/framework/desktop/test/deployment/update/website_update/web7"/>
     <display-name>
       <name lang="en">web-based update test 1</name>
     </display-name>
@@ -38,7 +38,7 @@
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US-region2.html" lang="en-US-region2">My OpenOffice en-US-region2</name>
       <name xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-region3.html" lang="en-region3">My OpenOffice en-region3</name>
     </publisher>
-    
+
     <release-notes>
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de.html" lang="de" />
       <src xlink:href="http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en.html" lang="en" />
diff --git a/main/desktop/test/deployment/update/wrong_url/update/url1.update.xml b/main/desktop/test/deployment/update/wrong_url/update/url1.update.xml
index abf9920d1c..e07e34039c 100644
--- a/main/desktop/test/deployment/update/wrong_url/update/url1.update.xml
+++ b/main/desktop/test/deployment/update/wrong_url/update/url1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.url1.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/wrong_url/notavailable/url1.oxt" />
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/wrong_url/update/url1.oxt" />
diff --git a/main/desktop/test/deployment/update/wrong_url/update/url2.update.xml b/main/desktop/test/deployment/update/wrong_url/update/url2.update.xml
index ff0753883a..8914dc0d9a 100644
--- a/main/desktop/test/deployment/update/wrong_url/update/url2.update.xml
+++ b/main/desktop/test/deployment/update/wrong_url/update/url2.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.url2.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/wrong_url/update/url2.oxt" />
     </update-download>
diff --git a/main/desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml b/main/desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml
index a464a5c37a..2e8c271c07 100644
--- a/main/desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml
+++ b/main/desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.wrongdownload1.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/wrong_url/notavailable/wrongdownload1.oxt" />
         <src xlink:href="http://extensions.openoffice.org/notavailable/" />
diff --git a/main/desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml b/main/desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml
index 435a7fb709..5893cf204b 100644
--- a/main/desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml
+++ b/main/desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.wrongdownload2.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/wrong_url/notavailable/wrongdownload2.oxt" />
         <src xlink:href="http://extensions.openoffice.org/notavailable/" />
diff --git a/main/desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml b/main/desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml
index 83e863d768..14326a057e 100644
--- a/main/desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml
+++ b/main/desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,21 +8,21 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/update/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="org.openoffice.legacy.wrongdownload3.oxt"/>
-    <version value="2.0" />    
+    <version value="2.0" />
     <update-download>
         <src xlink:href="http://extensions.openoffice.org/testarea/desktop/wrong_url/notavailable/wrongdownload3.oxt" />
         <src xlink:href="http://extensions.openoffice.org/notavailable/" />
diff --git a/main/dtrans/source/cnttype/mcnttype.xml b/main/dtrans/source/cnttype/mcnttype.xml
index 37f559021d..4b465477c8 100644
--- a/main/dtrans/source/cnttype/mcnttype.xml
+++ b/main/dtrans/source/cnttype/mcnttype.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/dtrans/source/generic/dtrans.xml b/main/dtrans/source/generic/dtrans.xml
index 9594321c57..99eb957fe8 100644
--- a/main/dtrans/source/generic/dtrans.xml
+++ b/main/dtrans/source/generic/dtrans.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/dtrans/source/os2/clipb/sysdtrans.xml b/main/dtrans/source/os2/clipb/sysdtrans.xml
index 143b33fd80..d36ecfecf6 100644
--- a/main/dtrans/source/os2/clipb/sysdtrans.xml
+++ b/main/dtrans/source/os2/clipb/sysdtrans.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/dtrans/source/win32/clipb/sysdtrans.xml b/main/dtrans/source/win32/clipb/sysdtrans.xml
index 143b33fd80..d36ecfecf6 100644
--- a/main/dtrans/source/win32/clipb/sysdtrans.xml
+++ b/main/dtrans/source/win32/clipb/sysdtrans.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/dtrans/source/win32/dnd/dnd.xml b/main/dtrans/source/win32/dnd/dnd.xml
index 65e684e67c..996715f9e6 100644
--- a/main/dtrans/source/win32/dnd/dnd.xml
+++ b/main/dtrans/source/win32/dnd/dnd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/dtrans/source/win32/ftransl/ftransl.xml b/main/dtrans/source/win32/ftransl/ftransl.xml
index 3002eff61d..198a7ff6c1 100644
--- a/main/dtrans/source/win32/ftransl/ftransl.xml
+++ b/main/dtrans/source/win32/ftransl/ftransl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/bibliography/uiconfig/sbibliography/menubar/menubar.xml b/main/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
index 6969722d24..bb99639c6c 100644
--- a/main/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
+++ b/main/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
 	<menu:menu menu:id=".uno:PickList">
diff --git a/main/extensions/source/macosx/spotlight/mdimporter/schema.xml b/main/extensions/source/macosx/spotlight/mdimporter/schema.xml
index 447591cac6..d0501a03b4 100644
--- a/main/extensions/source/macosx/spotlight/mdimporter/schema.xml
+++ b/main/extensions/source/macosx/spotlight/mdimporter/schema.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,24 +8,24 @@
  * 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.
- * 
+ *
  ***********************************************************-->
- 
+
 <schema version="1.0" xmlns="http://www.apple.com/metadata"
                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                       xsi:schemaLocation="http://www.apple.com/metadata file:///System/Library/Frameworks/CoreServices.framework/Frameworks/Metadata.framework/Resources/MetadataSchema.xsd">
     <note>
         OpenOffice.org allows the user to enter 4 pieces of custom information in the document's metadata.
-        These metadata fields are described here for Spotlight's use.		      
+        These metadata fields are described here for Spotlight's use.
     </note>
     <attributes>
         <attribute name="org_openoffice_opendocument_custominfo1" type="CFString"/>
diff --git a/main/extensions/source/propctrlr/pcr.xml b/main/extensions/source/propctrlr/pcr.xml
index 40ab4353c5..8674f8f8ba 100644
--- a/main/extensions/source/propctrlr/pcr.xml
+++ b/main/extensions/source/propctrlr/pcr.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description SYSTEM "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description>
   <module-name>pcr</module-name>
diff --git a/main/extensions/source/update/check/updchk.xml b/main/extensions/source/update/check/updchk.xml
index 6672e99125..35e3307d28 100644
--- a/main/extensions/source/update/check/updchk.xml
+++ b/main/extensions/source/update/check/updchk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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,8 +30,8 @@
         <description> The  </description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
-        <status value="beta"/>        
-        <supported-service>com.sun.star.setup.UpdateCheck</supported-service>		
+        <status value="beta"/>
+        <supported-service>com.sun.star.setup.UpdateCheck</supported-service>
         <service-dependency>...</service-dependency>
         <type>com.sun.star.beans.NamedValue</type>
         <type>com.sun.star.beans.PropertyValue</type>
diff --git a/main/extensions/source/update/feed/updatefeed.xml b/main/extensions/source/update/feed/updatefeed.xml
index 3375e4f611..1331f0ebf9 100644
--- a/main/extensions/source/update/feed/updatefeed.xml
+++ b/main/extensions/source/update/feed/updatefeed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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,13 +30,13 @@
         <description> The  </description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
-        <status value="beta"/>        
-        <supported-service>com.sun.star.deployment.UpdateInformationProvider</supported-service>		
+        <status value="beta"/>
+        <supported-service>com.sun.star.deployment.UpdateInformationProvider</supported-service>
         <service-dependency>...</service-dependency>
         <type>com.sun.star.beans.NamedValue</type>
         <type>com.sun.star.beans.PropertyValue</type>
         <type>com.sun.star.container.XNameReplace</type>
-        <type>com.sun.star.deployment.UpdateInformationProvider</type>		
+        <type>com.sun.star.deployment.UpdateInformationProvider</type>
         <type>com.sun.star.io.XInputStream</type>
         <type>com.sun.star.io.XOutputStream</type>
         <type>com.sun.star.lang.XComponent</type>
diff --git a/main/extensions/source/update/ui/updchkui.xml b/main/extensions/source/update/ui/updchkui.xml
index 943aa73ab9..4a79ef9332 100644
--- a/main/extensions/source/update/ui/updchkui.xml
+++ b/main/extensions/source/update/ui/updchkui.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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,8 +30,8 @@
         <description> The  </description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
-        <status value="beta"/>        
-        <supported-service>com.sun.star.setup.UpdateCheckUI</supported-service>		
+        <status value="beta"/>
+        <supported-service>com.sun.star.setup.UpdateCheckUI</supported-service>
         <service-dependency>...</service-dependency>
         <type>com.sun.star.document.XEventBroadcaster</type>
         <type>com.sun.star.document.XEventListener</type>
diff --git a/main/fileaccess/source/fileacc.xml b/main/fileaccess/source/fileacc.xml
index b6bd5976da..9e3bf38548 100644
--- a/main/fileaccess/source/fileacc.xml
+++ b/main/fileaccess/source/fileacc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/source/placeware/placeware.xml b/main/filter/source/placeware/placeware.xml
index df6baa70db..4445213900 100644
--- a/main/filter/source/placeware/placeware.xml
+++ b/main/filter/source/placeware/placeware.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/util/frm.xml b/main/forms/util/frm.xml
index b435015472..789f1c5a1a 100644
--- a/main/forms/util/frm.xml
+++ b/main/forms/util/frm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description SYSTEM "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <module-description>
 	<module-name>forms</module-name>
diff --git a/main/formula/prj/for.xml b/main/formula/prj/for.xml
index 6c5d77fe6a..f88bb47547 100644
--- a/main/formula/prj/for.xml
+++ b/main/formula/prj/for.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/aqua/fps_aqua.xml b/main/fpicker/source/aqua/fps_aqua.xml
index 70fbc8c6b6..a29559078a 100644
--- a/main/fpicker/source/aqua/fps_aqua.xml
+++ b/main/fpicker/source/aqua/fps_aqua.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/unx/gnome/fps_gnome.xml b/main/fpicker/source/unx/gnome/fps_gnome.xml
index 9a35521383..7792b206a5 100644
--- a/main/fpicker/source/unx/gnome/fps_gnome.xml
+++ b/main/fpicker/source/unx/gnome/fps_gnome.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>	c++	</language>
         <status value="beta"/>
-		<supported-service>	com.sun.star.ui.dialogs.FilePicker </supported-service>		
+		<supported-service>	com.sun.star.ui.dialogs.FilePicker </supported-service>
         <service-dependency>...</service-dependency>
 		<type>	com.sun.star.ui.dialogs.XExecutableDialog			</type>
         <type>	com.sun.star.ui.dialogs.XFilePicker					</type>
@@ -45,12 +45,12 @@
 		<type>	com.sun.star.ui.dialogs.XFilePickerControlAccess	</type>
 		<type>  com.sun.star.ui.dialogs.XFilePreview </type>
 		<type>  com.sun.star.ui.dialogs.ExtendedFilePickerElementIds </type>
-		<type>	com.sun.star.ui.dialogs.ExecutableDialogResults		</type>		
+		<type>	com.sun.star.ui.dialogs.ExecutableDialogResults		</type>
 		<type>	com.sun.star.ui.dialogs.FilePickerEvent				</type>
 		<type>  com.sun.star.ui.dialogs.CommonFilePickerElementIds </type>
 		<type>  com.sun.star.ui.dialogs.ListboxControlActions </type>
-		<type>  com.sun.star.ui.dialogs.TemplateDescription </type>		
-		<type>  com.sun.star.ui.dialogs.FilePreviewImageFormats </type>	
+		<type>  com.sun.star.ui.dialogs.TemplateDescription </type>
+		<type>  com.sun.star.ui.dialogs.FilePreviewImageFormats </type>
 		<type>	com.sun.star.util.XCancellable				</type>
 	    <type>	com.sun.star.lang.XComponent				</type>
         <type>	com.sun.star.lang.XMultiServiceFactory		</type>
@@ -73,12 +73,12 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>	c++	</language>
         <status value="beta"/>
-		<supported-service>	com.sun.star.ui.dialogs.FolderPicker </supported-service>		
+		<supported-service>	com.sun.star.ui.dialogs.FolderPicker </supported-service>
         <service-dependency>...</service-dependency>
 		<type>	com.sun.star.ui.dialogs.XExecutableDialog			</type>
         <type>	com.sun.star.ui.dialogs.XFolderPicker				</type>
 		<type>	com.sun.star.ui.dialogs.ExecutableDialogException	</type>
-		<type>	com.sun.star.ui.dialogs.ExecutableDialogResults		</type>		
+		<type>	com.sun.star.ui.dialogs.ExecutableDialogResults		</type>
 		<type>	com.sun.star.util.XCancellable				</type>
 	    <type>	com.sun.star.lang.XComponent				</type>
         <type>	com.sun.star.lang.XMultiServiceFactory		</type>
diff --git a/main/fpicker/source/unx/kde4/fps_kde4.xml b/main/fpicker/source/unx/kde4/fps_kde4.xml
index 901de736ec..c7d10cc392 100644
--- a/main/fpicker/source/unx/kde4/fps_kde4.xml
+++ b/main/fpicker/source/unx/kde4/fps_kde4.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>    c++    </language>
         <status value="beta"/>
-        <supported-service>    com.sun.star.ui.dialogs.FilePicker </supported-service>        
+        <supported-service>    com.sun.star.ui.dialogs.FilePicker </supported-service>
         <service-dependency>...</service-dependency>
         <type>    com.sun.star.ui.dialogs.XExecutableDialog            </type>
         <type>    com.sun.star.ui.dialogs.XFilePicker                  </type>
@@ -45,12 +45,12 @@
         <type>    com.sun.star.ui.dialogs.XFilePickerControlAccess     </type>
         <type>    com.sun.star.ui.dialogs.XFilePreview                 </type>
         <type>    com.sun.star.ui.dialogs.ExtendedFilePickerElementIds </type>
-        <type>    com.sun.star.ui.dialogs.ExecutableDialogResults      </type>        
+        <type>    com.sun.star.ui.dialogs.ExecutableDialogResults      </type>
         <type>    com.sun.star.ui.dialogs.FilePickerEvent              </type>
         <type>    com.sun.star.ui.dialogs.CommonFilePickerElementIds   </type>
         <type>    com.sun.star.ui.dialogs.ListboxControlActions        </type>
-        <type>    com.sun.star.ui.dialogs.TemplateDescription          </type>        
-        <type>    com.sun.star.ui.dialogs.FilePreviewImageFormats      </type>    
+        <type>    com.sun.star.ui.dialogs.TemplateDescription          </type>
+        <type>    com.sun.star.ui.dialogs.FilePreviewImageFormats      </type>
         <type>    com.sun.star.util.XCancellable                       </type>
         <type>    com.sun.star.lang.XComponent                         </type>
         <type>    com.sun.star.lang.XMultiServiceFactory               </type>
diff --git a/main/fpicker/source/win32/filepicker/fps.xml b/main/fpicker/source/win32/filepicker/fps.xml
index efa7bb054d..c27599a153 100644
--- a/main/fpicker/source/win32/filepicker/fps.xml
+++ b/main/fpicker/source/win32/filepicker/fps.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>	c++	</language>
         <status value="beta"/>
-		<supported-service>	com.sun.star.ui.dialogs.FilePicker </supported-service>		
+		<supported-service>	com.sun.star.ui.dialogs.FilePicker </supported-service>
         <service-dependency>...</service-dependency>
 		<type>	com.sun.star.ui.dialogs.XExecutableDialog			</type>
         <type>	com.sun.star.ui.dialogs.XFilePicker					</type>
@@ -45,12 +45,12 @@
 		<type>	com.sun.star.ui.dialogs.XFilePickerControlAccess	</type>
 		<type>  com.sun.star.ui.dialogs.XFilePreview </type>
 		<type>  com.sun.star.ui.dialogs.ExtendedFilePickerElementIds </type>
-		<type>	com.sun.star.ui.dialogs.ExecutableDialogResults		</type>		
+		<type>	com.sun.star.ui.dialogs.ExecutableDialogResults		</type>
 		<type>	com.sun.star.ui.dialogs.FilePickerEvent				</type>
 		<type>  com.sun.star.ui.dialogs.CommonFilePickerElementIds </type>
 		<type>  com.sun.star.ui.dialogs.ListboxControlActions </type>
-		<type>  com.sun.star.ui.dialogs.TemplateDescription </type>		
-		<type>  com.sun.star.ui.dialogs.FilePreviewImageFormats </type>	
+		<type>  com.sun.star.ui.dialogs.TemplateDescription </type>
+		<type>  com.sun.star.ui.dialogs.FilePreviewImageFormats </type>
 		<type>	com.sun.star.util.XCancellable				</type>
 	    <type>	com.sun.star.lang.XComponent				</type>
         <type>	com.sun.star.lang.XMultiServiceFactory		</type>
diff --git a/main/fpicker/source/win32/folderpicker/fop.xml b/main/fpicker/source/win32/folderpicker/fop.xml
index bfab3a5ead..4d2c763482 100644
--- a/main/fpicker/source/win32/folderpicker/fop.xml
+++ b/main/fpicker/source/win32/folderpicker/fop.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 
 
@@ -32,16 +32,16 @@
 </description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>	c++	</language>
-        <status value="beta"/>        
-		<supported-service>	com.sun.star.ui.dialogs.FolderPicker </supported-service>		
+        <status value="beta"/>
+		<supported-service>	com.sun.star.ui.dialogs.FolderPicker </supported-service>
         <service-dependency>...</service-dependency>
 		<type>	com.sun.star.ui.dialogs.XExecutableDialog			</type>
-        <type>	com.sun.star.ui.dialogs.XFolderPicker				</type>		        		
+        <type>	com.sun.star.ui.dialogs.XFolderPicker				</type>
 		<type>	com.sun.star.ui.dialogs.ExecutableDialogException	</type>
-		<type>	com.sun.star.ui.dialogs.ExecutableDialogResults			</type>   
+		<type>	com.sun.star.ui.dialogs.ExecutableDialogResults			</type>
 		<type>  com.sun.star.ui.dialogs.ExtendedFilePickerElementIds </type>
-		<type>  com.sun.star.ui.dialogs.CommonFilePickerElementIds </type>    
-		<type>	com.sun.star.util.XCancellable				</type> 
+		<type>  com.sun.star.ui.dialogs.CommonFilePickerElementIds </type>
+		<type>	com.sun.star.util.XCancellable				</type>
         <type>	com.sun.star.lang.XMultiServiceFactory		</type>
         <type>	com.sun.star.lang.XSingleServiceFactory		</type>
         <type>	com.sun.star.lang.XServiceInfo				</type>
diff --git a/main/framework/source/unotypes/fwk.xml b/main/framework/source/unotypes/fwk.xml
index 77c7600546..198f241754 100644
--- a/main/framework/source/unotypes/fwk.xml
+++ b/main/framework/source/unotypes/fwk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 
 
@@ -154,7 +154,7 @@
         <status value="final"/>
         <supported-service> com.sun.star.frame.ProtocolHandler </supported-service>
     </component-description>
-    
+
     <component-description>
         <author> Carsten Driesner </author>
         <name> com.sun.star.comp.framework.LayoutManager </name>
@@ -166,7 +166,7 @@
         <status value="final"/>
         <supported-service> com.sun.star.frame.LayoutManager </supported-service>
     </component-description>
-    
+
     <component-description>
         <author> Carsten Driesner </author>
         <name> com.sun.star.comp.framework.PopupMenuControllerFactory </name>
@@ -178,7 +178,7 @@
         <status value="final"/>
         <supported-service> com.sun.star.frame.PopupMenuControllerFactory </supported-service>
     </component-description>
-    
+
     <component-description>
         <author> Carsten Driesner </author>
         <name> com.sun.star.comp.framework.FontMenuController </name>
@@ -312,7 +312,7 @@
         <status value="final"/>
         <supported-service> com.sun.star.frame.ModuleManager </supported-service>
     </component-description>
-    
+
     <component-description>
         <author> Carsten Driesner </author>
         <name> com.sun.star.comp.framework.UIConfigurationManager </name>
@@ -325,7 +325,7 @@
         <status value="final"/>
         <supported-service> com.sun.star.ui.UIConfigurationManager </supported-service>
     </component-description>
-    
+
     <component-description>
         <author> Carsten Driesner </author>
         <name> com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier </name>
@@ -413,7 +413,7 @@
         <status value="final"/>
         <supported-service> com.sun.star.ui.ToolBarFactory </supported-service>
     </component-description>
-    
+
     <component-description>
         <author> Carsten Driesner </author>
         <name> com.sun.star.comp.framework.ToolBarControllerFactory </name>
@@ -425,7 +425,7 @@
         <status value="final"/>
         <supported-service> com.sun.star.frame.ToolbarControllerFactory </supported-service>
     </component-description>
-    
+
     <component-description>
         <author> Carsten Driesner </author>
         <name> com.sun.star.comp.framework.StatusbarFactory </name>
@@ -437,7 +437,7 @@
         <status value="final"/>
         <supported-service> com.sun.star.ui.StatusbarFactory </supported-service>
     </component-description>
-    
+
     <component-description>
         <author> Carsten Driesner </author>
         <name> com.sun.star.comp.framework.StatusbarControllerFactory </name>
diff --git a/main/framework/source/unotypes/fwl.xml b/main/framework/source/unotypes/fwl.xml
index 72d05f50ea..bf67d74074 100644
--- a/main/framework/source/unotypes/fwl.xml
+++ b/main/framework/source/unotypes/fwl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/source/unotypes/lgd.xml b/main/framework/source/unotypes/lgd.xml
index f9fd9eaaa6..fa15bb305a 100644
--- a/main/framework/source/unotypes/lgd.xml
+++ b/main/framework/source/unotypes/lgd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/uiconfig/startmodule/statusbar/statusbar.xml b/main/framework/uiconfig/startmodule/statusbar/statusbar.xml
index 6dae96150c..d077a21d7f 100644
--- a/main/framework/uiconfig/startmodule/statusbar/statusbar.xml
+++ b/main/framework/uiconfig/startmodule/statusbar/statusbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
 </statusbar:statusbar>
diff --git a/main/framework/uiconfig/startmodule/toolbar/standardbar.xml b/main/framework/uiconfig/startmodule/toolbar/standardbar.xml
index 45a333d014..98af943c74 100644
--- a/main/framework/uiconfig/startmodule/toolbar/standardbar.xml
+++ b/main/framework/uiconfig/startmodule/toolbar/standardbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/util/lgd.xml b/main/framework/util/lgd.xml
index f9fd9eaaa6..fa15bb305a 100644
--- a/main/framework/util/lgd.xml
+++ b/main/framework/util/lgd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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/helpauthoring/META-INF/manifest.xml b/main/helpauthoring/META-INF/manifest.xml
index c62064a550..2984704982 100644
--- a/main/helpauthoring/META-INF/manifest.xml
+++ b/main/helpauthoring/META-INF/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 <manifest:manifest>
         <manifest:file-entry manifest:full-path="HelpAuthoring/" manifest:media-type="application/vnd.sun.star.basic-library"/>
diff --git a/main/i18npool/source/localedata/data/af_NA.xml b/main/i18npool/source/localedata/data/af_NA.xml
index 3a8eb6fdf4..34fbfdee89 100644
--- a/main/i18npool/source/localedata/data/af_NA.xml
+++ b/main/i18npool/source/localedata/data/af_NA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.3">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/af_ZA.xml b/main/i18npool/source/localedata/data/af_ZA.xml
index 85f82841ba..e9f0e9e82b 100644
--- a/main/i18npool/source/localedata/data/af_ZA.xml
+++ b/main/i18npool/source/localedata/data/af_ZA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.3">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ak_GH.xml b/main/i18npool/source/localedata/data/ak_GH.xml
index 1ba25c1a4f..d8d2742c60 100644
--- a/main/i18npool/source/localedata/data/ak_GH.xml
+++ b/main/i18npool/source/localedata/data/ak_GH.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/am_ET.xml b/main/i18npool/source/localedata/data/am_ET.xml
index 107b79a595..a820e172a3 100644
--- a/main/i18npool/source/localedata/data/am_ET.xml
+++ b/main/i18npool/source/localedata/data/am_ET.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="0.1">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ar_DZ.xml b/main/i18npool/source/localedata/data/ar_DZ.xml
index a5a0246286..6cad82c449 100644
--- a/main/i18npool/source/localedata/data/ar_DZ.xml
+++ b/main/i18npool/source/localedata/data/ar_DZ.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ar_EG.xml b/main/i18npool/source/localedata/data/ar_EG.xml
index e08f364182..8ee2f83e92 100644
--- a/main/i18npool/source/localedata/data/ar_EG.xml
+++ b/main/i18npool/source/localedata/data/ar_EG.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ar_LB.xml b/main/i18npool/source/localedata/data/ar_LB.xml
index 52a91c805e..4e38fa4187 100644
--- a/main/i18npool/source/localedata/data/ar_LB.xml
+++ b/main/i18npool/source/localedata/data/ar_LB.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ar_OM.xml b/main/i18npool/source/localedata/data/ar_OM.xml
index 7c5f1eb856..e7966038b9 100644
--- a/main/i18npool/source/localedata/data/ar_OM.xml
+++ b/main/i18npool/source/localedata/data/ar_OM.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ar_SA.xml b/main/i18npool/source/localedata/data/ar_SA.xml
index 560416ec23..d225de1a16 100644
--- a/main/i18npool/source/localedata/data/ar_SA.xml
+++ b/main/i18npool/source/localedata/data/ar_SA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ar_TN.xml b/main/i18npool/source/localedata/data/ar_TN.xml
index 30b67cfeeb..64619c8c39 100644
--- a/main/i18npool/source/localedata/data/ar_TN.xml
+++ b/main/i18npool/source/localedata/data/ar_TN.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ast_ES.xml b/main/i18npool/source/localedata/data/ast_ES.xml
index 571e724aa9..32d289e315 100644
--- a/main/i18npool/source/localedata/data/ast_ES.xml
+++ b/main/i18npool/source/localedata/data/ast_ES.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM "locale.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/az_AZ.xml b/main/i18npool/source/localedata/data/az_AZ.xml
index 48be05b7cf..74a2ee0b89 100644
--- a/main/i18npool/source/localedata/data/az_AZ.xml
+++ b/main/i18npool/source/localedata/data/az_AZ.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/be_BY.xml b/main/i18npool/source/localedata/data/be_BY.xml
index bc7f6ab623..373349885a 100644
--- a/main/i18npool/source/localedata/data/be_BY.xml
+++ b/main/i18npool/source/localedata/data/be_BY.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/bg_BG.xml b/main/i18npool/source/localedata/data/bg_BG.xml
index cd0b5b1a0f..5580347246 100644
--- a/main/i18npool/source/localedata/data/bg_BG.xml
+++ b/main/i18npool/source/localedata/data/bg_BG.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/bn_BD.xml b/main/i18npool/source/localedata/data/bn_BD.xml
index 4e1e621455..d09875974e 100644
--- a/main/i18npool/source/localedata/data/bn_BD.xml
+++ b/main/i18npool/source/localedata/data/bn_BD.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/bn_IN.xml b/main/i18npool/source/localedata/data/bn_IN.xml
index bdea70ab49..ae7e96ce25 100644
--- a/main/i18npool/source/localedata/data/bn_IN.xml
+++ b/main/i18npool/source/localedata/data/bn_IN.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/br_FR.xml b/main/i18npool/source/localedata/data/br_FR.xml
index 2c98c07b12..93ae86d09f 100644
--- a/main/i18npool/source/localedata/data/br_FR.xml
+++ b/main/i18npool/source/localedata/data/br_FR.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/bs_BA.xml b/main/i18npool/source/localedata/data/bs_BA.xml
index 05eca40997..788ea0f533 100644
--- a/main/i18npool/source/localedata/data/bs_BA.xml
+++ b/main/i18npool/source/localedata/data/bs_BA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2" >
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ca_ES.xml b/main/i18npool/source/localedata/data/ca_ES.xml
index b56c8f0256..93c1c82ca7 100644
--- a/main/i18npool/source/localedata/data/ca_ES.xml
+++ b/main/i18npool/source/localedata/data/ca_ES.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/cs_CZ.xml b/main/i18npool/source/localedata/data/cs_CZ.xml
index 7035ccc67a..16b888055d 100644
--- a/main/i18npool/source/localedata/data/cs_CZ.xml
+++ b/main/i18npool/source/localedata/data/cs_CZ.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/cv_RU.xml b/main/i18npool/source/localedata/data/cv_RU.xml
index 14a237445f..d88f44290a 100644
--- a/main/i18npool/source/localedata/data/cv_RU.xml
+++ b/main/i18npool/source/localedata/data/cv_RU.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/cy_GB.xml b/main/i18npool/source/localedata/data/cy_GB.xml
index 9c35aec220..f880ed83b8 100644
--- a/main/i18npool/source/localedata/data/cy_GB.xml
+++ b/main/i18npool/source/localedata/data/cy_GB.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/da_DK.xml b/main/i18npool/source/localedata/data/da_DK.xml
index 6072af8c68..5f8ea99422 100644
--- a/main/i18npool/source/localedata/data/da_DK.xml
+++ b/main/i18npool/source/localedata/data/da_DK.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/de_AT.xml b/main/i18npool/source/localedata/data/de_AT.xml
index 3a3a4feb4a..16ba5b1501 100644
--- a/main/i18npool/source/localedata/data/de_AT.xml
+++ b/main/i18npool/source/localedata/data/de_AT.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/de_CH.xml b/main/i18npool/source/localedata/data/de_CH.xml
index ac3537fde9..1924ded2df 100644
--- a/main/i18npool/source/localedata/data/de_CH.xml
+++ b/main/i18npool/source/localedata/data/de_CH.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/de_DE.xml b/main/i18npool/source/localedata/data/de_DE.xml
index a0cfc29433..90c5d7cd30 100644
--- a/main/i18npool/source/localedata/data/de_DE.xml
+++ b/main/i18npool/source/localedata/data/de_DE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/de_LI.xml b/main/i18npool/source/localedata/data/de_LI.xml
index 7c1a586ad8..4c496864d8 100644
--- a/main/i18npool/source/localedata/data/de_LI.xml
+++ b/main/i18npool/source/localedata/data/de_LI.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/de_LU.xml b/main/i18npool/source/localedata/data/de_LU.xml
index b9acb35bcf..2175d76ddc 100644
--- a/main/i18npool/source/localedata/data/de_LU.xml
+++ b/main/i18npool/source/localedata/data/de_LU.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/dsb_DE.xml b/main/i18npool/source/localedata/data/dsb_DE.xml
index ffa8b5f039..2058d192e0 100644
--- a/main/i18npool/source/localedata/data/dsb_DE.xml
+++ b/main/i18npool/source/localedata/data/dsb_DE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/dz_BT.xml b/main/i18npool/source/localedata/data/dz_BT.xml
index 75a31f3c28..b1255f9a7a 100644
--- a/main/i18npool/source/localedata/data/dz_BT.xml
+++ b/main/i18npool/source/localedata/data/dz_BT.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0" >
   <LC_INFO>
@@ -138,7 +138,7 @@
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
       <DefaultName></DefaultName>
     </FormatElement>
-    <!-- Time format was originally "ཆུ་ཚོད་" HH "སྐར་མ་" MM "སྐར་ཆ་་" SS -->            
+    <!-- Time format was originally "ཆུ་ཚོད་" HH "སྐར་མ་" MM "སྐར་ཆ་་" SS -->
     <!-- Replaced with HH:MM:SS until more information is available -->
     <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME"  formatindex="39">
       <FormatCode>HH:MM</FormatCode>
@@ -269,7 +269,7 @@
       <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
-      <!-- Percentage formats other than % sign are not possible in 2.0  0 "བརྒྱ་ཆ་་" is replaced by % -->            
+      <!-- Percentage formats other than % sign are not possible in 2.0  0 "བརྒྱ་ཆ་་" is replaced by % -->
       <FormatCode>[NatNum1]0%</FormatCode>
       <DefaultName></DefaultName>
     </FormatElement>
diff --git a/main/i18npool/source/localedata/data/ee_GH.xml b/main/i18npool/source/localedata/data/ee_GH.xml
index 7f954aec6b..85ae34477f 100644
--- a/main/i18npool/source/localedata/data/ee_GH.xml
+++ b/main/i18npool/source/localedata/data/ee_GH.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.1">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/el_GR.xml b/main/i18npool/source/localedata/data/el_GR.xml
index 6ef3d73a1e..e9a8e39fb3 100644
--- a/main/i18npool/source/localedata/data/el_GR.xml
+++ b/main/i18npool/source/localedata/data/el_GR.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_AU.xml b/main/i18npool/source/localedata/data/en_AU.xml
index 6e51467226..fac9a25479 100644
--- a/main/i18npool/source/localedata/data/en_AU.xml
+++ b/main/i18npool/source/localedata/data/en_AU.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_BZ.xml b/main/i18npool/source/localedata/data/en_BZ.xml
index 8ed4bf6819..48605dd868 100644
--- a/main/i18npool/source/localedata/data/en_BZ.xml
+++ b/main/i18npool/source/localedata/data/en_BZ.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_CA.xml b/main/i18npool/source/localedata/data/en_CA.xml
index e208d59312..56deb7806a 100644
--- a/main/i18npool/source/localedata/data/en_CA.xml
+++ b/main/i18npool/source/localedata/data/en_CA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_GB.xml b/main/i18npool/source/localedata/data/en_GB.xml
index 1831f9f67f..c7fa38db13 100644
--- a/main/i18npool/source/localedata/data/en_GB.xml
+++ b/main/i18npool/source/localedata/data/en_GB.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_GH.xml b/main/i18npool/source/localedata/data/en_GH.xml
index e8c527da9e..c0b0abf39d 100644
--- a/main/i18npool/source/localedata/data/en_GH.xml
+++ b/main/i18npool/source/localedata/data/en_GH.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_IE.xml b/main/i18npool/source/localedata/data/en_IE.xml
index dcc6bb4942..d4200f7584 100644
--- a/main/i18npool/source/localedata/data/en_IE.xml
+++ b/main/i18npool/source/localedata/data/en_IE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_IN.xml b/main/i18npool/source/localedata/data/en_IN.xml
index 9111612a9a..4f679ddbd8 100644
--- a/main/i18npool/source/localedata/data/en_IN.xml
+++ b/main/i18npool/source/localedata/data/en_IN.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_JM.xml b/main/i18npool/source/localedata/data/en_JM.xml
index 5d5a817db8..1d528f298c 100644
--- a/main/i18npool/source/localedata/data/en_JM.xml
+++ b/main/i18npool/source/localedata/data/en_JM.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_NA.xml b/main/i18npool/source/localedata/data/en_NA.xml
index bafca1a6fa..26428c572c 100644
--- a/main/i18npool/source/localedata/data/en_NA.xml
+++ b/main/i18npool/source/localedata/data/en_NA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_NZ.xml b/main/i18npool/source/localedata/data/en_NZ.xml
index 393c177918..7cf854646a 100644
--- a/main/i18npool/source/localedata/data/en_NZ.xml
+++ b/main/i18npool/source/localedata/data/en_NZ.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_PH.xml b/main/i18npool/source/localedata/data/en_PH.xml
index a6d0caa1b6..2163814306 100644
--- a/main/i18npool/source/localedata/data/en_PH.xml
+++ b/main/i18npool/source/localedata/data/en_PH.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_TT.xml b/main/i18npool/source/localedata/data/en_TT.xml
index 8a9ae43182..ccf3a4a310 100644
--- a/main/i18npool/source/localedata/data/en_TT.xml
+++ b/main/i18npool/source/localedata/data/en_TT.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_US.xml b/main/i18npool/source/localedata/data/en_US.xml
index 48f8aa02ca..080cf968ca 100644
--- a/main/i18npool/source/localedata/data/en_US.xml
+++ b/main/i18npool/source/localedata/data/en_US.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_ZA.xml b/main/i18npool/source/localedata/data/en_ZA.xml
index 35716dbf12..d3e8d57f2b 100644
--- a/main/i18npool/source/localedata/data/en_ZA.xml
+++ b/main/i18npool/source/localedata/data/en_ZA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/en_ZW.xml b/main/i18npool/source/localedata/data/en_ZW.xml
index aa6c6dffdc..4e5cdf47f1 100644
--- a/main/i18npool/source/localedata/data/en_ZW.xml
+++ b/main/i18npool/source/localedata/data/en_ZW.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/eo.xml b/main/i18npool/source/localedata/data/eo.xml
index e74c5bc0d7..66afa04698 100644
--- a/main/i18npool/source/localedata/data/eo.xml
+++ b/main/i18npool/source/localedata/data/eo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_AR.xml b/main/i18npool/source/localedata/data/es_AR.xml
index a672737e09..0f7a50aff2 100644
--- a/main/i18npool/source/localedata/data/es_AR.xml
+++ b/main/i18npool/source/localedata/data/es_AR.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_BO.xml b/main/i18npool/source/localedata/data/es_BO.xml
index 0be255705d..a03e1df505 100644
--- a/main/i18npool/source/localedata/data/es_BO.xml
+++ b/main/i18npool/source/localedata/data/es_BO.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_CL.xml b/main/i18npool/source/localedata/data/es_CL.xml
index ca8f4ea97f..2f3bce7458 100644
--- a/main/i18npool/source/localedata/data/es_CL.xml
+++ b/main/i18npool/source/localedata/data/es_CL.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_CO.xml b/main/i18npool/source/localedata/data/es_CO.xml
index e811759074..5681dda3a9 100644
--- a/main/i18npool/source/localedata/data/es_CO.xml
+++ b/main/i18npool/source/localedata/data/es_CO.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_CR.xml b/main/i18npool/source/localedata/data/es_CR.xml
index 720e22e3c0..f8d182856f 100644
--- a/main/i18npool/source/localedata/data/es_CR.xml
+++ b/main/i18npool/source/localedata/data/es_CR.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2" >
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_DO.xml b/main/i18npool/source/localedata/data/es_DO.xml
index b82f693b48..a235792679 100644
--- a/main/i18npool/source/localedata/data/es_DO.xml
+++ b/main/i18npool/source/localedata/data/es_DO.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_EC.xml b/main/i18npool/source/localedata/data/es_EC.xml
index ddec4539e2..0ab09cb493 100644
--- a/main/i18npool/source/localedata/data/es_EC.xml
+++ b/main/i18npool/source/localedata/data/es_EC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_ES.xml b/main/i18npool/source/localedata/data/es_ES.xml
index 5850f8f6fc..0774ec2daf 100644
--- a/main/i18npool/source/localedata/data/es_ES.xml
+++ b/main/i18npool/source/localedata/data/es_ES.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_GT.xml b/main/i18npool/source/localedata/data/es_GT.xml
index a7c61f9e85..b8a8dbf8ef 100644
--- a/main/i18npool/source/localedata/data/es_GT.xml
+++ b/main/i18npool/source/localedata/data/es_GT.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_HN.xml b/main/i18npool/source/localedata/data/es_HN.xml
index 50d9e2cc95..afd678a81d 100644
--- a/main/i18npool/source/localedata/data/es_HN.xml
+++ b/main/i18npool/source/localedata/data/es_HN.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_MX.xml b/main/i18npool/source/localedata/data/es_MX.xml
index 8bfd024e19..89c2644d4b 100644
--- a/main/i18npool/source/localedata/data/es_MX.xml
+++ b/main/i18npool/source/localedata/data/es_MX.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_NI.xml b/main/i18npool/source/localedata/data/es_NI.xml
index b37b1a6bc2..94f2c546d4 100644
--- a/main/i18npool/source/localedata/data/es_NI.xml
+++ b/main/i18npool/source/localedata/data/es_NI.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_PA.xml b/main/i18npool/source/localedata/data/es_PA.xml
index 2d35d6bb6f..b52f3d1a75 100644
--- a/main/i18npool/source/localedata/data/es_PA.xml
+++ b/main/i18npool/source/localedata/data/es_PA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_PE.xml b/main/i18npool/source/localedata/data/es_PE.xml
index 7b522b44ef..5bbd198000 100644
--- a/main/i18npool/source/localedata/data/es_PE.xml
+++ b/main/i18npool/source/localedata/data/es_PE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_PR.xml b/main/i18npool/source/localedata/data/es_PR.xml
index 5350195bad..ec8e34447d 100644
--- a/main/i18npool/source/localedata/data/es_PR.xml
+++ b/main/i18npool/source/localedata/data/es_PR.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_PY.xml b/main/i18npool/source/localedata/data/es_PY.xml
index c9a9c27e4f..b4529e861a 100644
--- a/main/i18npool/source/localedata/data/es_PY.xml
+++ b/main/i18npool/source/localedata/data/es_PY.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_SV.xml b/main/i18npool/source/localedata/data/es_SV.xml
index 2ffc7c5558..19f238a142 100644
--- a/main/i18npool/source/localedata/data/es_SV.xml
+++ b/main/i18npool/source/localedata/data/es_SV.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_UY.xml b/main/i18npool/source/localedata/data/es_UY.xml
index d78dcfe4ff..ef56567158 100644
--- a/main/i18npool/source/localedata/data/es_UY.xml
+++ b/main/i18npool/source/localedata/data/es_UY.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/es_VE.xml b/main/i18npool/source/localedata/data/es_VE.xml
index edcdb77c67..6909b55dde 100644
--- a/main/i18npool/source/localedata/data/es_VE.xml
+++ b/main/i18npool/source/localedata/data/es_VE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/et_EE.xml b/main/i18npool/source/localedata/data/et_EE.xml
index 2c5b09348b..46662c6a2e 100644
--- a/main/i18npool/source/localedata/data/et_EE.xml
+++ b/main/i18npool/source/localedata/data/et_EE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/eu.xml b/main/i18npool/source/localedata/data/eu.xml
index 962e21f189..5026ac0dd0 100644
--- a/main/i18npool/source/localedata/data/eu.xml
+++ b/main/i18npool/source/localedata/data/eu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fa_IR.xml b/main/i18npool/source/localedata/data/fa_IR.xml
index b8749e2e54..89ae3c9399 100644
--- a/main/i18npool/source/localedata/data/fa_IR.xml
+++ b/main/i18npool/source/localedata/data/fa_IR.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
@@ -327,7 +327,7 @@
       </StartDayOfWeek>
       <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
     </Calendar>
-    
+
     <Calendar unoid="gregorian" default="false">
       <DaysOfWeek>
         <Day>
diff --git a/main/i18npool/source/localedata/data/fi_FI.xml b/main/i18npool/source/localedata/data/fi_FI.xml
index b6816172df..b1c22edde7 100644
--- a/main/i18npool/source/localedata/data/fi_FI.xml
+++ b/main/i18npool/source/localedata/data/fi_FI.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fo_FO.xml b/main/i18npool/source/localedata/data/fo_FO.xml
index 1ba4cd747f..b3ad6973b5 100644
--- a/main/i18npool/source/localedata/data/fo_FO.xml
+++ b/main/i18npool/source/localedata/data/fo_FO.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fr_BE.xml b/main/i18npool/source/localedata/data/fr_BE.xml
index 3f0bd72162..9813cacdeb 100644
--- a/main/i18npool/source/localedata/data/fr_BE.xml
+++ b/main/i18npool/source/localedata/data/fr_BE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fr_CA.xml b/main/i18npool/source/localedata/data/fr_CA.xml
index 6c202c9c65..9e12912d34 100644
--- a/main/i18npool/source/localedata/data/fr_CA.xml
+++ b/main/i18npool/source/localedata/data/fr_CA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fr_CH.xml b/main/i18npool/source/localedata/data/fr_CH.xml
index 89df10b8b8..99e911e530 100644
--- a/main/i18npool/source/localedata/data/fr_CH.xml
+++ b/main/i18npool/source/localedata/data/fr_CH.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fr_FR.xml b/main/i18npool/source/localedata/data/fr_FR.xml
index d0cb0eff38..cd549640d7 100644
--- a/main/i18npool/source/localedata/data/fr_FR.xml
+++ b/main/i18npool/source/localedata/data/fr_FR.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fr_LU.xml b/main/i18npool/source/localedata/data/fr_LU.xml
index b80e3b5ebd..31c60ba621 100644
--- a/main/i18npool/source/localedata/data/fr_LU.xml
+++ b/main/i18npool/source/localedata/data/fr_LU.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fr_MC.xml b/main/i18npool/source/localedata/data/fr_MC.xml
index c4b6afeff1..00cfcb6405 100644
--- a/main/i18npool/source/localedata/data/fr_MC.xml
+++ b/main/i18npool/source/localedata/data/fr_MC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fur_IT.xml b/main/i18npool/source/localedata/data/fur_IT.xml
index 690ddde81e..a79c635bd4 100644
--- a/main/i18npool/source/localedata/data/fur_IT.xml
+++ b/main/i18npool/source/localedata/data/fur_IT.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/fy_NL.xml b/main/i18npool/source/localedata/data/fy_NL.xml
index 8152bced4f..77541608e6 100644
--- a/main/i18npool/source/localedata/data/fy_NL.xml
+++ b/main/i18npool/source/localedata/data/fy_NL.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM "locale.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ga_IE.xml b/main/i18npool/source/localedata/data/ga_IE.xml
index dcd3d1363a..58db17e401 100644
--- a/main/i18npool/source/localedata/data/ga_IE.xml
+++ b/main/i18npool/source/localedata/data/ga_IE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2" >
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/gl_ES.xml b/main/i18npool/source/localedata/data/gl_ES.xml
index 2369915267..669e4eb51e 100644
--- a/main/i18npool/source/localedata/data/gl_ES.xml
+++ b/main/i18npool/source/localedata/data/gl_ES.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.3">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/gsc_FR.xml b/main/i18npool/source/localedata/data/gsc_FR.xml
index 625e7557fa..e35d95c3ca 100644
--- a/main/i18npool/source/localedata/data/gsc_FR.xml
+++ b/main/i18npool/source/localedata/data/gsc_FR.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM "locale.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/gu_IN.xml b/main/i18npool/source/localedata/data/gu_IN.xml
index f51862601a..b3fcf25336 100644
--- a/main/i18npool/source/localedata/data/gu_IN.xml
+++ b/main/i18npool/source/localedata/data/gu_IN.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/gug_PY.xml b/main/i18npool/source/localedata/data/gug_PY.xml
index bee0043d5e..9e51687c6f 100644
--- a/main/i18npool/source/localedata/data/gug_PY.xml
+++ b/main/i18npool/source/localedata/data/gug_PY.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ha_GH.xml b/main/i18npool/source/localedata/data/ha_GH.xml
index 68516074f2..5bd1090c4f 100644
--- a/main/i18npool/source/localedata/data/ha_GH.xml
+++ b/main/i18npool/source/localedata/data/ha_GH.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.1">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/haw_US.xml b/main/i18npool/source/localedata/data/haw_US.xml
index 39d76ee0c5..715e0a14a2 100644
--- a/main/i18npool/source/localedata/data/haw_US.xml
+++ b/main/i18npool/source/localedata/data/haw_US.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/he_IL.xml b/main/i18npool/source/localedata/data/he_IL.xml
index 48a79340c7..7aa8cf0098 100644
--- a/main/i18npool/source/localedata/data/he_IL.xml
+++ b/main/i18npool/source/localedata/data/he_IL.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2" >
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/hi_IN.xml b/main/i18npool/source/localedata/data/hi_IN.xml
index dc248db13f..98332f186a 100644
--- a/main/i18npool/source/localedata/data/hi_IN.xml
+++ b/main/i18npool/source/localedata/data/hi_IN.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/hil_PH.xml b/main/i18npool/source/localedata/data/hil_PH.xml
index 9902c6640c..9ed2e2c801 100644
--- a/main/i18npool/source/localedata/data/hil_PH.xml
+++ b/main/i18npool/source/localedata/data/hil_PH.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/hr_HR.xml b/main/i18npool/source/localedata/data/hr_HR.xml
index 69563ff1dc..791f536be7 100644
--- a/main/i18npool/source/localedata/data/hr_HR.xml
+++ b/main/i18npool/source/localedata/data/hr_HR.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
 <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/hsb_DE.xml b/main/i18npool/source/localedata/data/hsb_DE.xml
index a8c92e194c..b8fea84d85 100644
--- a/main/i18npool/source/localedata/data/hsb_DE.xml
+++ b/main/i18npool/source/localedata/data/hsb_DE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ht_HT.xml b/main/i18npool/source/localedata/data/ht_HT.xml
index b0d7a33682..92e0a3b2ba 100644
--- a/main/i18npool/source/localedata/data/ht_HT.xml
+++ b/main/i18npool/source/localedata/data/ht_HT.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/hu_HU.xml b/main/i18npool/source/localedata/data/hu_HU.xml
index 8adb8d8925..736bc1e0b8 100644
--- a/main/i18npool/source/localedata/data/hu_HU.xml
+++ b/main/i18npool/source/localedata/data/hu_HU.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/hy_AM.xml b/main/i18npool/source/localedata/data/hy_AM.xml
index 2077d15120..c93ed63465 100644
--- a/main/i18npool/source/localedata/data/hy_AM.xml
+++ b/main/i18npool/source/localedata/data/hy_AM.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM "locale.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/ia.xml b/main/i18npool/source/localedata/data/ia.xml
index 972f44c483..c8dabef16b 100644
--- a/main/i18npool/source/localedata/data/ia.xml
+++ b/main/i18npool/source/localedata/data/ia.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/id_ID.xml b/main/i18npool/source/localedata/data/id_ID.xml
index 13d0671c0a..676ba11bd4 100644
--- a/main/i18npool/source/localedata/data/id_ID.xml
+++ b/main/i18npool/source/localedata/data/id_ID.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
+ *
  ***********************************************************-->
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
diff --git a/main/i18npool/source/localedata/data/is_IS.xml b/main/i18npool/source/localedata/data/is_IS.xml
index 4ef92e7944..1a59fa17b8 100644
--- a/main/i18npool/source/localedata/data/is_IS.xml
+++ b/main/i18npool/source/localedata/data/is_IS.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,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.
- * 
... 54691 lines suppressed ...