[Libreoffice-commits] .: Branch 'gr2' - 38 commits - comphelper/qa comphelper/source cppcanvas/source i18npool/source l10ntools/inc l10ntools/scripts l10ntools/source sot/source svl/inc svl/qa svl/source svtools/inc svtools/source toolkit/source toolkit/workben tools/inc tools/source tools/workben ucbhelper/workben unotools/source vcl/aqua vcl/inc vcl/os2 vcl/source vcl/unx vcl/win

Thu Mar 10 00:06:00 PST 2011

comphelper/qa/weakbag/test_weakbag_noadditional.cxx        |    2 
 comphelper/source/property/propagg.cxx                     |    1 
 comphelper/source/property/propertycontainerhelper.cxx     |    3 
 cppcanvas/source/inc/implrenderer.hxx                      |    2 
 i18npool/source/localedata/data/en_AU.xml                  |    6 
 i18npool/source/localedata/data/en_CA.xml                  |    6 
 i18npool/source/localedata/data/en_GB.xml                  |    8 
 i18npool/source/localedata/data/en_GH.xml                  |    6 
 i18npool/source/localedata/data/en_JM.xml                  |    6 
 i18npool/source/localedata/data/en_NA.xml                  |    6 
 i18npool/source/localedata/data/en_US.xml                  |    6 
 i18npool/source/localedata/data/en_ZA.xml                  |    6 
 l10ntools/inc/cfgmerge.hxx                                 |    1 
 l10ntools/scripts/localize.pl                              |    8 
 l10ntools/source/cfgmerge.cxx                              |   13 
 l10ntools/source/export.cxx                                |   54 --
 l10ntools/source/export2.cxx                               |    1 
 l10ntools/source/help/HelpLinker.cxx                       |   11 
 l10ntools/source/helpex.cxx                                |    1 
 l10ntools/source/helpmerge.cxx                             |    9 
 l10ntools/source/lngex.cxx                                 |    9 
 l10ntools/source/localize.cxx                              |   76 ++
 l10ntools/source/merge.cxx                                 |   10 
 l10ntools/source/srciter.cxx                               |    8 
 l10ntools/source/treeconfig.cxx                            |   12 
 l10ntools/source/xmlparse.cxx                              |    6 
 l10ntools/source/xrmmerge.cxx                              |   18 
 sot/source/base/factory.cxx                                |    2 
 sot/source/base/object.cxx                                 |    2 
 sot/source/sdstor/stg.cxx                                  |    2 
 sot/source/sdstor/stgio.cxx                                |    2 
 sot/source/sdstor/storage.cxx                              |    8 
 sot/source/sdstor/ucbstorage.cxx                           |   26 
 svl/inc/svl/filerec.hxx                                    |    2 
 svl/inc/svl/svarray.hxx                                    |    2 
 svl/inc/svl/svdde.hxx                                      |    3 
 svl/inc/svl/svstdarr.hxx                                   |    7 
 svl/inc/svl/zformat.hxx                                    |    4 
 svl/qa/unit/svl.cxx                                        |    4 
 svl/source/config/asiancfg.cxx                             |    2 
 svl/source/config/ctloptions.cxx                           |    2 
 svl/source/filepicker/pickerhelper.cxx                     |    4 
 svl/source/items/cenumitm.cxx                              |    4 
 svl/source/items/cintitem.cxx                              |    8 
 svl/source/items/cntwall.cxx                               |    4 
 svl/source/items/ctypeitm.cxx                              |    2 
 svl/source/items/custritm.cxx                              |    4 
 svl/source/items/dateitem.cxx                              |    2 
 svl/source/items/globalnameitem.cxx                        |    2 
 svl/source/items/intitem.cxx                               |    2 
 svl/source/items/itempool.cxx                              |    6 
 svl/source/items/itemset.cxx                               |    6 
 svl/source/items/lckbitem.cxx                              |    2 
 svl/source/items/nranges.cxx                               |    2 
 svl/source/items/poolio.cxx                                |    2 
 svl/source/items/poolitem.cxx                              |    4 
 svl/source/items/ptitem.cxx                                |    4 
 svl/source/items/rectitem.cxx                              |    4 
 svl/source/items/slstitm.cxx                               |    2 
 svl/source/items/srchitem.cxx                              |    2 
 svl/source/items/style.cxx                                 |    6 
 svl/source/items/szitem.cxx                                |    2 
 svl/source/items/visitem.cxx                               |    2 
 svl/source/memtools/svarray.cxx                            |    2 
 svl/source/misc/inettype.cxx                               |    2 
 svl/source/notify/brdcst.cxx                               |    3 
 svl/source/numbers/numfmuno.cxx                            |   16 
 svl/source/numbers/numhead.cxx                             |    8 
 svl/source/numbers/supservs.cxx                            |    2 
 svl/source/numbers/zforfind.cxx                            |    2 
 svl/source/numbers/zforlist.cxx                            |   58 +-
 svl/source/numbers/zformat.cxx                             |   24 
 svl/source/svdde/ddeimp.hxx                                |    3 
 svl/source/svdde/ddesvr.cxx                                |   29 -
 svl/source/undo/undo.cxx                                   |    8 
 svtools/inc/svtools/brwbox.hxx                             |    1 
 svtools/inc/svtools/colorcfg.hxx                           |    1 
 svtools/inc/svtools/editbrowsebox.hxx                      |    1 
 svtools/source/brwbox/brwbox2.cxx                          |    6 
 svtools/source/brwbox/editbrowsebox.cxx                    |    2 
 svtools/source/config/accessibilityoptions.cxx             |    4 
 svtools/source/config/colorcfg.cxx                         |    2 
 svtools/source/contnr/fileview.cxx                         |    3 
 svtools/source/contnr/imivctl1.cxx                         |    4 
 svtools/source/contnr/svimpbox.cxx                         |    1 
 svtools/source/contnr/svimpicn.cxx                         |    2 
 svtools/source/contnr/svlbox.cxx                           |    2 
 svtools/source/contnr/treelist.cxx                         |    8 
 svtools/source/control/ctrlbox.cxx                         |   17 
 svtools/source/control/filectrl2.cxx                       |    2 
 svtools/source/control/fmtfield.cxx                        |    3 
 svtools/source/control/inettbc.cxx                         |    2 
 svtools/source/dialogs/addresstemplate.cxx                 |   12 
 svtools/source/dialogs/propctrl.cxx                        |    6 
 svtools/source/dialogs/so3res.src                          |   10 
 svtools/source/dialogs/wizardmachine.cxx                   |    6 
 svtools/source/dialogs/wizdlg.cxx                          |    4 
 svtools/source/edit/textdata.cxx                           |    2 
 svtools/source/edit/textdoc.cxx                            |    8 
 svtools/source/edit/texteng.cxx                            |    2 
 svtools/source/filter.vcl/filter/FilterConfigItem.cxx      |   16 
 svtools/source/filter.vcl/wmf/enhwmf.cxx                   |    2 
 svtools/source/filter.vcl/wmf/winmtf.cxx                   |    2 
 svtools/source/filter.vcl/wmf/winmtf.hxx                   |    2 
 svtools/source/filter.vcl/wmf/wmfwr.cxx                    |    6 
 svtools/source/graphic/grfcache.cxx                        |    2 
 svtools/source/graphic/grfmgr2.cxx                         |    6 
 svtools/source/misc/chartprettypainter.cxx                 |    2 
 svtools/source/misc/embedhlp.cxx                           |    2 
 svtools/source/misc/templatefoldercache.cxx                |    6 
 svtools/source/misc/transfer.cxx                           |    6 
 svtools/source/productregistration/productregistration.cxx |    1 
 svtools/source/productregistration/registrationdlg.cxx     |    2 
 svtools/source/table/tablecontrol_impl.cxx                 |    6 
 svtools/source/uno/unocontroltablemodel.cxx                |    6 
 svtools/source/uno/unoevent.cxx                            |    2 
 svtools/source/uno/unoiface.cxx                            |    6 
 svtools/source/uno/unoimap.cxx                             |    4 
 toolkit/source/awt/vclxmenu.cxx                            |    2 
 toolkit/source/awt/vclxprinter.cxx                         |    6 
 toolkit/source/awt/vclxwindow.cxx                          |    5 
 toolkit/source/awt/vclxwindows.cxx                         |   10 
 toolkit/source/controls/dialogcontrol.cxx                  |   14 
 toolkit/source/controls/geometrycontrolmodel.cxx           |    6 
 toolkit/source/controls/tkscrollbar.cxx                    |    2 
 toolkit/source/controls/tkspinbutton.cxx                   |    2 
 toolkit/source/controls/unocontrol.cxx                     |   12 
 toolkit/source/controls/unocontrolmodel.cxx                |   29 -
 toolkit/source/controls/unocontrols.cxx                    |    4 
 toolkit/source/helper/unowrapper.cxx                       |    2 
 toolkit/source/helper/vclunohelper.cxx                     |    8 
 toolkit/source/layout/core/box-base.cxx                    |    4 
 toolkit/source/layout/core/container.cxx                   |    2 
 toolkit/source/layout/core/dialogbuttonhbox.cxx            |    2 
 toolkit/source/layout/core/import.cxx                      |    2 
 toolkit/source/layout/core/proplist.cxx                    |    2 
 toolkit/workben/layout/zoom.cxx                            |    8 
 tools/inc/tools/inetmime.hxx                               |   31 -
 tools/source/debug/debug.cxx                               |    2 
 tools/source/fsys/dirent.cxx                               |    2 
 tools/source/fsys/urlobj.cxx                               |    4 
 tools/source/generic/b3dtrans.cxx                          |    6 
 tools/source/generic/bigint.cxx                            |    6 
 tools/source/generic/fract.cxx                             |    2 
 tools/source/generic/poly.cxx                              |    4 
 tools/source/inet/inetmime.cxx                             |   21 
 tools/source/ref/errinf.cxx                                |    4 
 tools/source/ref/pstm.cxx                                  |    8 
 tools/source/stream/stream.cxx                             |   14 
 tools/source/string/strascii.cxx                           |    4 
 tools/source/string/strimp.cxx                             |    6 
 tools/source/testtoolloader/testtoolloader.cxx             |    2 
 tools/workben/hashtbl.cxx                                  |    4 
 ucbhelper/workben/ucbexplorer/ucbexplorer.cxx              |    8 
 unotools/source/config/cmdoptions.cxx                      |    2 
 unotools/source/config/configmgr.cxx                       |   14 
 unotools/source/config/dynamicmenuoptions.cxx              |    2 
 unotools/source/config/extendedsecurityoptions.cxx         |    2 
 unotools/source/config/fltrcfg.cxx                         |    2 
 unotools/source/config/fontcfg.cxx                         |    2 
 unotools/source/config/pathoptions.cxx                     |    4 
 unotools/source/config/saveopt.cxx                         |    6 
 unotools/source/config/searchopt.cxx                       |    6 
 unotools/source/config/undoopt.cxx                         |    4 
 unotools/source/misc/sharedunocomponent.cxx                |    4 
 unotools/source/property/propertysethelper.cxx             |    6 
 unotools/source/property/propertysetinfo.cxx               |    4 
 unotools/source/ucbhelper/ucblockbytes.cxx                 |    6 
 vcl/aqua/source/app/saldata.cxx                            |    4 
 vcl/aqua/source/app/salinst.cxx                            |    4 
 vcl/aqua/source/gdi/salbmp.cxx                             |    4 
 vcl/aqua/source/gdi/salgdi.cxx                             |   10 
 vcl/aqua/source/gdi/salprn.cxx                             |    4 
 vcl/aqua/source/window/salframe.cxx                        |    2 
 vcl/aqua/source/window/salmenu.cxx                         |    6 
 vcl/inc/vcl/fontcapabilities.hxx                           |  346 ++++++-------
 vcl/inc/vcl/outdev.hxx                                     |    5 
 vcl/os2/source/app/salinst.cxx                             |    4 
 vcl/source/app/svapp.cxx                                   |    2 
 vcl/source/app/timer.cxx                                   |    2 
 vcl/source/control/button.cxx                              |    2 
 vcl/source/control/field.cxx                               |    6 
 vcl/source/control/field2.cxx                              |    8 
 vcl/source/fontsubset/fontsubset.cxx                       |    2 
 vcl/source/gdi/bitmap.cxx                                  |    2 
 vcl/source/gdi/bitmap3.cxx                                 |    4 
 vcl/source/gdi/bitmap4.cxx                                 |    2 
 vcl/source/gdi/bmpacc.cxx                                  |    2 
 vcl/source/gdi/cvtsvm.cxx                                  |    2 
 vcl/source/gdi/gdimtf.cxx                                  |    4 
 vcl/source/gdi/graphictools.cxx                            |   16 
 vcl/source/gdi/impvect.cxx                                 |    2 
 vcl/source/gdi/outdev3.cxx                                 |   70 ++
 vcl/source/gdi/outmap.cxx                                  |    2 
 vcl/source/gdi/pdfwriter_impl.cxx                          |   24 
 vcl/source/gdi/print2.cxx                                  |    6 
 vcl/source/gdi/region.cxx                                  |   18 
 vcl/source/gdi/salmisc.cxx                                 |    4 
 vcl/source/helper/canvasbitmap.cxx                         |    2 
 vcl/source/window/accel.cxx                                |    2 
 vcl/source/window/dialog.cxx                               |    4 
 vcl/source/window/printdlg.cxx                             |    4 
 vcl/source/window/taskpanelist.cxx                         |    2 
 vcl/source/window/toolbox.cxx                              |    2 
 vcl/source/window/window.cxx                               |    2 
 vcl/unx/gtk/app/gtkdata.cxx                                |    4 
 vcl/unx/gtk/window/gtkframe.cxx                            |    2 
 vcl/unx/headless/svpelement.cxx                            |    3 
 vcl/unx/headless/svppspgraphics.cxx                        |   14 
 vcl/unx/headless/svptext.cxx                               |    2 
 vcl/unx/inc/salframe.h                                     |    4 
 vcl/unx/source/app/saldisp.cxx                             |    4 
 vcl/unx/source/fontmanager/fontconfig.cxx                  |    8 
 vcl/unx/source/gdi/pspgraphics.cxx                         |   28 -
 vcl/unx/source/gdi/salgdi2.cxx                             |    2 
 vcl/unx/source/printergfx/common_gfx.cxx                   |   10 
 vcl/unx/source/printergfx/psputil.cxx                      |    2 
 vcl/unx/source/window/salframe.cxx                         |   38 +
 vcl/win/inc/salgdi.h                                       |    1 
 vcl/win/source/app/salinst.cxx                             |    4 
 vcl/win/source/gdi/salgdi3.cxx                             |   26 
 221 files changed, 984 insertions(+), 855 deletions(-)

New commits:
commit 1d85593e7aa332fb1cae82a4fbfabdb50113d473
Author: Martin Hosken <martin_hosken at sil.org>
Date:   Fri Feb 25 16:10:55 2011 +0700

    graphite2 consolidated patch

diff --git a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
index 1abcc82..7449e3f 100644
--- a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
+++ b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
@@ -28,6 +28,6 @@
 
 #include <cppunit/plugin/TestPlugIn.h>
 
-CPPUNIT_PLUGIN_IMPLEMENT();
+// CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6739666b7572217a294e394cc9a8675ba651c38f
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date:   Wed Mar 9 21:28:34 2011 +0000

    Remove SvLongs declaration and definition

diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index e4e7df4..ce57242 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -91,7 +91,7 @@
 *			ein Stack mit einem PtrArray als Grundlage.
 *
 * JP 09.10.96:  vordefinierte Arrays:
-*	VarArr:		SvULongs, SvUShorts, SvLongs
+*	VarArr:		SvULongs, SvUShorts
 *	PtrArr:		SvStrings, SvStringsDtor
 *	SortArr:	SvStringsSort, SvStringsSortDtor,
 *				SvStringsISort, SvStringsISortDtor
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index a5c300e..76797df 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -32,7 +32,7 @@
 *   (die defines setzen sich aus "_SVSTDARR_" und dem Namen des Array
 *    ohne "Sv" zusammen)
 *
-*	VarArr:		SvULongs, SvUShorts, SvLongs
+*	VarArr:		SvULongs, SvUShorts
 *	PtrArr:		SvStrings, SvStringsDtor
 *	SortArr:	SvStringsSort, SvStringsSortDtor,
 *				SvStringsISort, SvStringsISortDtor,
@@ -102,11 +102,6 @@ private:
 #define _SVSTDARR_USHORTSSORT_DECL
 #endif
 
-#ifndef _SVSTDARR_LONGS_DECL
-SV_DECL_VARARR_VISIBILITY( SvLongs, long, 1, 1, SVL_DLLPUBLIC )
-#define _SVSTDARR_LONGS_DECL
-#endif
-
 #ifndef _SVSTDARR_LONGSSORT_DECL
 SV_DECL_VARARR_SORT_VISIBILITY( SvLongsSort, long, 1, 1, SVL_DLLPUBLIC )
 #define _SVSTDARR_LONGSSORT_DECL
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index e774b99..7a379c3 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -34,7 +34,6 @@
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_ULONGSSORT
 #define _SVSTDARR_USHORTS
-#define _SVSTDARR_LONGS
 #define _SVSTDARR_LONGSSORT
 #define _SVSTDARR_STRINGS
 #define _SVSTDARR_STRINGSDTOR
@@ -76,7 +75,6 @@ USHORT SvPtrarrPlain::GetPos( const VoidPtr aElement ) const
 
 SV_IMPL_VARARR( SvULongs, ULONG )
 SV_IMPL_VARARR( SvUShorts, USHORT )
-SV_IMPL_VARARR( SvLongs, long)
 
 SV_IMPL_VARARR_SORT( SvULongsSort, ULONG )
 SV_IMPL_VARARR_SORT( SvLongsSort, long )
commit a9ab3feb6e62d334d2bdae94b0b171e16b598345
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 20:58:56 2011 +0000

    Add Cherokee preview

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index fc60a6a..afac084 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1113,6 +1113,14 @@ namespace
                 sSampleText = rtl::OUString(aEthi, SAL_N_ELEMENTS(aEthi));
                 break;
             }
+            case vcl::UnicodeCoverage::CHEROKEE:
+            {
+                const sal_Unicode aCher[] = {
+                    0x13D7, 0x13AA, 0x13EA, 0x13B6, 0x13D9, 0x13D7
+                };
+                sSampleText = rtl::OUString(aCher, SAL_N_ELEMENTS(aCher));
+                break;
+            }
             case vcl::UnicodeCoverage::KHMER:
             {
                 const sal_Unicode aKhmr[] = {
commit 52e212be7be0af2e176882321dba55ff07a397d6
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 20:52:07 2011 +0000

    mask out cjk punctuation

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 0eea55e..fc60a6a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1539,12 +1539,14 @@ namespace
         aGenericMask.set(vcl::UnicodeCoverage::SPECIALS, false);
         aGenericMask.set(vcl::UnicodeCoverage::NONPLANE_0, false);
         aGenericMask.set(vcl::UnicodeCoverage::PRIVATE_USE_PLANE_15, false);
+        aGenericMask.set(vcl::UnicodeCoverage::CJK_SYMBOLS_AND_PUNCTUATION, false);
 
         boost::dynamic_bitset<sal_uInt32> aMasked = rFontCapabilities.maUnicodeRange & aGenericMask;
 
         if (aMasked.count() == 1)
             return aMasked.find_first();
 
+
         if (aMasked[vcl::UnicodeCoverage::ARABIC])
         {
             aMasked.set(vcl::UnicodeCoverage::ARABIC_PRESENTATION_FORMS_A, false);
commit 2bb53ed283a7cd9777c98d6f1611232c6ae473aa
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 20:27:47 2011 +0000

    Cyrillic+Georgian is likely best previewed as Georgian

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 8e0ca85..0eea55e 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1570,6 +1570,13 @@ namespace
         if (aMasked.count() == 1)
             return aMasked.find_first();
 
+        if (aMasked[vcl::UnicodeCoverage::CYRILLIC])
+        {
+            //Probably strongly tuned for Georgian
+            if (aMasked.count() == 2 && aMasked[vcl::UnicodeCoverage::GEORGIAN])
+                return vcl::UnicodeCoverage::GEORGIAN;
+        }
+
         boost::dynamic_bitset<sal_uInt32> aCJKMask(vcl::UnicodeCoverage::MAX_UC_ENUM);
         aCJKMask.set();
         aCJKMask.set(vcl::UnicodeCoverage::CJK_SYMBOLS_AND_PUNCTUATION, false);
commit 43715d53dd0486de6c7be31f3c92e57cbdcb32b2
Author: Xavier ALT <dex at phoenix-ind.net>
Date:   Tue Mar 8 22:58:23 2011 +0100

    remove SVX_LIGHT macro

diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 13371a9..6c5f09f 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -272,7 +272,7 @@ void ImplDbgUnlock()
 
 // =======================================================================
 
-#if (defined WNT || defined OS2) && !defined SVX_LIGHT
+#if (defined WNT || defined OS2)
 //#define SV_MEMMGR //
 #endif
 #ifdef SV_MEMMGR
commit 95d42038d1d4475d63629d9d900fad3d83a1faa0
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 14:22:35 2011 +0000

    enable fontcapabilities under windows

diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h
index 2bef53b..78746fb 100644
--- a/vcl/win/inc/salgdi.h
+++ b/vcl/win/inc/salgdi.h
@@ -145,7 +145,6 @@ private:
 private:
     void                    ReadCmapTable( HDC ) const;
     void                    GetFontCapabilities( HDC hDC ) const;
-    void                    ReadOs2Table( HDC ) const;
 
 #ifdef GNG_VERT_HACK
     void                    ReadGsubTable( HDC ) const;
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index dfa82b3..c7337a8 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1281,7 +1281,7 @@ void ImplWinFontData::UpdateFromHDC( HDC hDC ) const
         return;
 
     ReadCmapTable( hDC );
-    ReadOs2Table( hDC );
+    GetFontCapabilities( hDC );
 #ifdef ENABLE_GRAPHITE
     static const char* pDisableGraphiteText = getenv( "SAL_DISABLE_GRAPHITE" );
     if( !pDisableGraphiteText || (pDisableGraphiteText[0] == '0') )
@@ -1364,6 +1364,11 @@ bool ImplWinFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabi
 
 // -----------------------------------------------------------------------
 
+static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
+static unsigned GetUShort( const unsigned char* p ){ return((p[0]<<8)+p[1]);}
+//static signed GetSShort( const unsigned char* p ){ return((short)((p[0]<<8)+p[1]));}
+static inline DWORD CalcTag( const char p[4]) { return (p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24)); }
+
 void ImplWinFontData::ReadOs2Table( HDC hDC ) const
 {
     const DWORD Os2Tag = CalcTag( "OS/2" );
@@ -1388,7 +1393,6 @@ void ImplWinFontData::ReadOs2Table( HDC hDC ) const
         mbHasArabicSupport = (ulUnicodeRange1 & 0x00002000);
    }
 }
-
 // -----------------------------------------------------------------------
 
 void ImplWinFontData::ReadGsubTable( HDC hDC ) const
@@ -1473,7 +1477,7 @@ void ImplWinFontData::GetFontCapabilities( HDC hDC ) const
     DWORD nLength;
     const DWORD GsubTag = CalcTag( "GSUB" );
     nLength = ::GetFontData( hDC, GsubTag, 0, NULL, 0 );
-    if( (nLength != GDI_ERROR) & nLength )
+    if( (nLength != GDI_ERROR) && nLength )
     {
         std::vector<unsigned char> aTable( nLength );
         unsigned char* pTable = &aTable[0];
@@ -1484,12 +1488,24 @@ void ImplWinFontData::GetFontCapabilities( HDC hDC ) const
     // OS/2 table
     const DWORD OS2Tag = CalcTag( "OS/2" );
     nLength = ::GetFontData( hDC, OS2Tag, 0, NULL, 0 );
-    if( (nLength != GDI_ERROR) & nLength )
+    if( (nLength != GDI_ERROR) && nLength )
     {
         std::vector<unsigned char> aTable( nLength );
         unsigned char* pTable = &aTable[0];
         ::GetFontData( hDC, OS2Tag, 0, pTable, nLength );
-        vcl::getTTCoverage(maFontCapabilities.maUnicodeRange, maFontCapabilities.maCodePageRange, pTable, nLength);
+        if (vcl::getTTCoverage(maFontCapabilities.maUnicodeRange, maFontCapabilities.maCodePageRange, pTable, nLength))
+        {
+            // Check for CJK capabilities of the current font
+            // TODO, we have this info already from getTT, decode bits to
+            // a readable dynamic_bitset
+            sal_uInt32 ulUnicodeRange1 = GetUInt( pTable + 42 );
+            sal_uInt32 ulUnicodeRange2 = GetUInt( pTable + 46 );
+
+            mbHasCJKSupport = (ulUnicodeRange2 & 0x2DF00000);
+            mbHasKoreanRange= (ulUnicodeRange1 & 0x10000000)
+                            | (ulUnicodeRange2 & 0x01100000);
+            mbHasArabicSupport = (ulUnicodeRange1 & 0x00002000);
+        }
     }
 }
 
commit da6dbb8f035c5a28a1c83927bbbc4694cb75cba3
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 14:22:04 2011 +0000

    Resolves: rhbz#682621 better resizing of overtall glyphsubs

diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 251b2e8..859020f 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -276,6 +276,8 @@ enum OutDevViewType { OUTDEV_VIEWTYPE_DONTKNOW, OUTDEV_VIEWTYPE_PRINTPREVIEW, OU
 
 class VirtualDevice;
 class Printer;
+class ImplFontSelectData;
+class ImplFontMetricData;
 
 const char* ImplDbgCheckOutputDevice( const void* pObj );
 
@@ -563,6 +565,9 @@ public:
     // Helper for line geometry paint with support for graphic expansion (pattern and fat_to_area)
     void impPaintLineGeometryWithEvtlExpand(const LineInfo& rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon);
 
+    SAL_DLLPRIVATE void forceFallbackFontToFit(SalLayout &rFallback, ImplFontEntry &rFallbackFont,
+        ImplFontSelectData &rFontSelData, int nFallbackLevel,
+        ImplLayoutArgs& rLayoutArgs, const ImplFontMetricData& rOrigMetric) const;
 protected:
                         OutputDevice();
 
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 84a7b5d..7a439f2 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6015,6 +6015,58 @@ SalLayout* OutputDevice::ImplLayout( const String& rOrigStr,
     return pSalLayout;
 }
 
+void OutputDevice::forceFallbackFontToFit(SalLayout &rFallback, ImplFontEntry &rFallbackFont,
+    ImplFontSelectData &rFontSelData, int nFallbackLevel,
+    ImplLayoutArgs& rLayoutArgs, const ImplFontMetricData& rOrigMetric) const
+{
+    Rectangle aBoundRect;
+    bool bHaveBounding = false;
+    Rectangle aRectangle;
+
+    rFallback.AdjustLayout( rLayoutArgs );
+
+    //All we care about here is getting the vertical bounds of this text and
+    //make sure it will fit inside the available space
+    Point aPos;
+    for( int nStart = 0;;)
+    {
+        sal_GlyphId nLGlyph;
+        if( !rFallback.GetNextGlyphs( 1, &nLGlyph, aPos, nStart ) )
+            break;
+
+        int nFontTag = nFallbackLevel << GF_FONTSHIFT;
+        nLGlyph |= nFontTag;
+
+        // get bounding rectangle of individual glyph
+        if( mpGraphics->GetGlyphBoundRect( nLGlyph, aRectangle ) )
+        {
+            // merge rectangle
+            aRectangle += aPos;
+            aBoundRect.Union( aRectangle );
+            bHaveBounding = true;
+        }
+    }
+
+    //Shrink it down if it won't fit
+    if (bHaveBounding)
+    {
+        long  nGlyphsAscent = -aBoundRect.Top();
+        float fScaleTop = nGlyphsAscent > rOrigMetric.mnAscent ?
+            rOrigMetric.mnAscent/(float)nGlyphsAscent : 1;
+        long  nGlyphsDescent = aBoundRect.Bottom();
+        float fScaleBottom = nGlyphsDescent > rOrigMetric.mnDescent ?
+            rOrigMetric.mnDescent/(float)nGlyphsDescent : 1;
+        float fScale = fScaleBottom < fScaleTop ? fScaleBottom : fScaleTop;
+        if (fScale < 1)
+        {
+            long nOrigHeight = rFontSelData.mnHeight;
+            rFontSelData.mnHeight *= fScale;
+            rFallbackFont.mnSetFontFlags = mpGraphics->SetFont( &rFontSelData, nFallbackLevel );
+            rFontSelData.mnHeight = nOrigHeight;
+        }
+    }
+}
+
 // -----------------------------------------------------------------------
 
 SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLayoutArgs& rLayoutArgs ) const
@@ -6072,22 +6124,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
             }
         }
 
-        ImplFontMetricData aSubstituteMetric(aFontSelData);
         pFallbackFont->mnSetFontFlags = mpGraphics->SetFont( &aFontSelData, nFallbackLevel );
-        mpGraphics->GetFontMetric(&aSubstituteMetric, nFallbackLevel);
-
-        long nOriginalHeight = aOrigMetric.mnAscent + aOrigMetric.mnDescent;
-        long nSubstituteHeight = aSubstituteMetric.mnAscent + aSubstituteMetric.mnDescent;
-        //Too tall, shrink it a bit. Need a better calculation to include extra
-        //factors and any extra wriggle room we might have available ?
-        if (nSubstituteHeight > nOriginalHeight)
-        {
-            float fScale = nOriginalHeight/(float)nSubstituteHeight;
-            long nOrigHeight = aFontSelData.mnHeight;
-            aFontSelData.mnHeight *= fScale;
-            pFallbackFont->mnSetFontFlags = mpGraphics->SetFont( &aFontSelData, nFallbackLevel );
-            aFontSelData.mnHeight = nOrigHeight;
-        }
 
         // create and add glyph fallback layout to multilayout
         rLayoutArgs.ResetPos();
@@ -6096,6 +6133,9 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
         {
             if( pFallback->LayoutText( rLayoutArgs ) )
             {
+                forceFallbackFontToFit(*pFallback, *pFallbackFont, aFontSelData,
+                    nFallbackLevel, rLayoutArgs, aOrigMetric);
+
                 if( !pMultiSalLayout )
                     pMultiSalLayout = new MultiSalLayout( *pSalLayout );
                 pMultiSalLayout->AddFallback( *pFallback,
commit 1c4425aad3633af836a5a03a5e709a9cf5373eef
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 09:07:21 2011 +0000

    cppcheck: this method can be const

diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 5cd2c4c..6feb32b 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -363,7 +363,7 @@ public:
     inline void		ImplAdd( BYTE nCode );
     void			ImplEndAdd( ULONG nTypeFlag );
 
-    const Polygon&	ImplGetPoly() { return maPoly; }
+    const Polygon&	ImplGetPoly() const { return maPoly; }
 };
 
 // -----------------------------------------------------------------------------
commit cda1328ffd67575417a0e80fa3da9da2431aa668
Author: Andras Timar <timar at fsf.hu>
Date:   Wed Mar 9 12:10:22 2011 +0100

    update help text of localize tool

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 433322d..a653193 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -841,7 +841,8 @@ void Help()
         "====================================\n" );
     fprintf( stdout,
         "As part of the L10N framework, localize extracts and merges translations\n"
-        "out of and into the whole source tree.\n\n"
+        "out of and into the toplevel modules defined in ModuleList array in\n"
+        "l10ntools/source/localize.cxx.\n\n"
         "Syntax: localize -e -l en-US -f FileName \n"
         "Parameter:\n"
         "\t-e: Extract mode\n"
@@ -855,7 +856,7 @@ void Help()
         "\nExample 1:\n" 
         "==========\n"
         "localize -e -l en-US -f MyFile\n\n"
-        "All strings will be extracted for language de and language en-US.\n"
+        "All strings will be extracted for language en-US.\n"
     );
 }
 
commit cf9e876590b157508fca9f675527cadc3bc9e9df
Author: Andras Timar <timar at fsf.hu>
Date:   Wed Mar 9 12:03:46 2011 +0100

    no need to blacklist dictionaries, because is is not whitelisted

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index c2bd422..433322d 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -75,10 +75,6 @@ const char *NegativeList[] = {
     "officecfg/data/org/openoffice/Office/SFX.xcd",
     "officecfg/data/org/openoffice/Office/Accelerators.xcu",
     "hidother.src",
-    "dictionaries/da_DK/help/da/help.tree",
-    "dictionaries/da_DK/help/da/org.openoffice.da.hunspell.dictionaries/page1.xph",
-    "dictionaries/hu_HU/help/hu/help.tree",
-    "dictionaries/hu_HU/help/hu/org.openoffice.hu.hunspell.dictionaries/page1.xph",
     "NULL"
 };
 
commit 35bc30580b2225afc6798c2c0811801c080c4220
Author: Andras Timar <timar at fsf.hu>
Date:   Tue Mar 8 22:48:09 2011 +0100

    adapt localize to LibreOffice directory structure

diff --git a/l10ntools/scripts/localize.pl b/l10ntools/scripts/localize.pl
index 46ff4c6..da28fae 100644
--- a/l10ntools/scripts/localize.pl
+++ b/l10ntools/scripts/localize.pl
@@ -170,11 +170,11 @@ sub splitfile{
     }
     close( MYFILE );
 
-    if( !defined $ENV{SOURCE_ROOT_DIR} ){
-        print "Error, no SOURCE_ROOT_DIR in env found.\n";
+    if( !defined $ENV{SRC_ROOT} ){
+        print "Error, no SRC_ROOT in env found.\n";
         exit( -1 );
     }
-    my $src_root = $ENV{SOURCE_ROOT_DIR};
+    my $src_root = $ENV{SRC_ROOT};
     my $ooo_src_root = $ENV{SRC_ROOT};
     my $so_l10n_path  = $src_root."/sun/l10n_so/source";
     my $ooo_l10n_path = $ooo_src_root."/l10n/source";
@@ -387,7 +387,7 @@ sub collectfiles{
     STDOUT->autoflush( 1 );
 
     my $working_path = getcwd();
-    chdir $ENV{SOURCE_ROOT_DIR}, if defined $ENV{SOURCE_ROOT_DIR};
+    chdir $ENV{SRC_ROOT}, if defined $ENV{SRC_ROOT};
     add_paths( $langhash_ref );
 
     my ( $LOCALIZEPARTICLE , $localizeSDF ) = File::Temp::tempfile();
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 40ec3a6..c2bd422 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -122,6 +122,56 @@ const char *PositiveList[] = {
     "NULL"
 };
 
+const char *ModuleList[] = {
+    "accessibility",
+    "avmedia",
+    "basctl",
+    "basic",
+    "chart2",
+    "connectivity",
+    "crashrep",
+    "cui",
+    "dbaccess",
+    "desktop",
+    "editeng",
+    "extensions",
+    "filter",
+    "forms",
+    "formula",
+    "fpicker",
+    "framework",
+    "helpcontent2",
+    "instsetoo_native",
+    "mysqlc",
+    "officecfg",
+    "padmin",
+    "readlicense_oo",
+    "reportbuilder",
+    "reportdesign",
+    "sc",
+    "scaddins",
+    "sccomp",
+    "scp2",
+    "sd",
+    "sdext",
+    "setup_native",
+    "sfx2",
+    "shell",
+    "starmath",
+    "svl",
+    "svtools",
+    "svx",
+    "sw",
+    "swext",
+    "sysui",
+    "ucbhelper",
+    "uui",
+    "vcl",
+    "wizards",
+    "xmlsecurity",
+    "NULL",
+};
+
 
 const char PRJ_DIR_NAME[] = "prj";
 const char DLIST_NAME[] = "d.lst";
@@ -263,8 +313,16 @@ const ByteString SourceTreeLocalizer::GetProjectRootRel()
 
 bool skipProject( ByteString sPrj )
 {
-    static const ByteString READLICENSE( "readlicense" );
-    return sPrj.EqualsIgnoreCaseAscii( READLICENSE );
+    int nIndex = 0;
+    bool bReturn = TRUE;
+    ByteString sModule( ModuleList[ nIndex ] );
+    while( !sModule.Equals( "NULL" ) && bReturn ) {
+        if( sPrj.Equals ( sModule ) )
+            bReturn = FALSE;
+        nIndex++;
+        sModule = ModuleList[ nIndex ];
+    }
+    return bReturn;
 }
 
 /*****************************************************************************/
@@ -937,9 +995,9 @@ int _cdecl main( int argc, char *argv[] )
     {
         string curRepository;
         if( has_minor_ext ) 
-            curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter + minor_ext;
+            curRepository = string( Export::GetEnv("SRC_ROOT") ) + "/" + *iter + minor_ext;
         else
-            curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter;
+            curRepository = string( Export::GetEnv("SRC_ROOT") ) + "/" + *iter;
         cout << "Localizing repository " << curRepository << "\n";
         SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bSkipLinks );
         aIter.SetLanguageRestriction( sLanguages );	 
diff --git a/l10ntools/source/srciter.cxx b/l10ntools/source/srciter.cxx
index d8487c5..8060def 100644
--- a/l10ntools/source/srciter.cxx
+++ b/l10ntools/source/srciter.cxx
@@ -70,7 +70,9 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
         static rtl::OUString WCARD4 ( RTL_CONSTASCII_USTRINGPARAM("common") );
         static rtl::OUString WCARD5 ( RTL_CONSTASCII_USTRINGPARAM("unxmac") );
         static rtl::OUString WCARD6 ( RTL_CONSTASCII_USTRINGPARAM("unxubt") );
-        static rtl::OUString WCARD7 ( RTL_CONSTASCII_USTRINGPARAM(".svn") );
+        static rtl::OUString WCARD7 ( RTL_CONSTASCII_USTRINGPARAM(".git") );
+        static rtl::OUString WCARD8 ( RTL_CONSTASCII_USTRINGPARAM("clone") );
+        static rtl::OUString WCARD9 ( RTL_CONSTASCII_USTRINGPARAM("install") );
 
         
         if( sDirName.indexOf( WCARD1 , 0 ) > -1 ||
@@ -79,7 +81,9 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
             sDirName.indexOf( WCARD4 , 0 ) > -1 ||
             sDirName.indexOf( WCARD5 , 0 ) > -1 ||
             sDirName.indexOf( WCARD6 , 0 ) > -1 ||
-            sDirName.indexOf( WCARD7 , 0 ) > -1 
+            sDirName.indexOf( WCARD7 , 0 ) > -1 ||
+            sDirName.indexOf( WCARD8 , 0 ) > -1 ||
+            sDirName.indexOf( WCARD9 , 0 ) > -1
            )	return;
         //printf("**** %s \n", OUStringToOString( sDirName , RTL_TEXTENCODING_UTF8 , sDirName.getLength() ).getStr() );
        
diff --git a/l10ntools/source/treeconfig.cxx b/l10ntools/source/treeconfig.cxx
index e8e6a4d..e6cdb49 100644
--- a/l10ntools/source/treeconfig.cxx
+++ b/l10ntools/source/treeconfig.cxx
@@ -22,7 +22,7 @@ namespace transex3
 
 bool Treeconfig::parseConfig(){
     
-    string source_config_file = string( static_cast<ByteString>( Export::GetEnv("SOURCE_ROOT_DIR") ).GetBuffer() );
+    string source_config_file = string( static_cast<ByteString>( Export::GetEnv("SRC_ROOT") ).GetBuffer() );
     if( source_config_file.empty() )
     {
         cerr << "Error: no suitable environment set?!?";
@@ -50,13 +50,13 @@ bool Treeconfig::getActiveRepositories( vector<string>& active_repos ){
     string pwd;
     string guessedRepo;
     Export::getCurrentDir( pwd );
-    string source_root = Export::GetEnv( "SOURCE_ROOT_DIR" );
+    string source_root = Export::GetEnv( "SRC_ROOT" );
     string solarsrc    = Export::GetEnv( "SOLARSRC" );
     string partial;
 
     // if we are inside of a repository root then active it otherwise let the app handle the return!
     string::size_type pos = pwd.find_first_of( source_root );
-    if( pos != string::npos && ( pos + source_root.length() +1 ) < pwd.length()){  // I am within SOURCE_ROOT_DIR
+    if( pos != string::npos && ( pos + source_root.length() +1 ) < pwd.length()){  // I am within SRC_ROOT
         partial = pwd.substr( pos + source_root.length() +1  , pwd.length());
         string::size_type nextPart = partial.find_first_of( "/" );
         if( nextPart != string::npos )
@@ -64,7 +64,7 @@ bool Treeconfig::getActiveRepositories( vector<string>& active_repos ){
         else
             guessedRepo = partial;
     }
-    else                              // I am NOT within SOURCE_ROOT_DIR
+    else                              // I am NOT within SRC_ROOT
         hasPath = true;
     
     if( isPresent )
@@ -94,7 +94,7 @@ bool Treeconfig::getActiveRepositories( vector<string>& active_repos ){
     if( !guessedRepo.empty() ){
         active_repos.push_back( guessedRepo );          // add myrepo
     }
-    return hasPath;                                     // are we deep inside of a source tree or outside of SOURCE_ROOT_DIR?
+    return hasPath;                                     // are we deep inside of a source tree or outside of SRC_ROOT?
 }
 
 void Treeconfig::getCurrentDir( string& dir )
@@ -109,7 +109,7 @@ void Treeconfig::getCurrentDir( string& dir )
 
 bool Treeconfig::isConfigFilePresent()
 {
-    string config_file = Export::GetEnv( "SOURCE_ROOT_DIR" );
+    string config_file = Export::GetEnv( "SRC_ROOT" );
     config_file += "/source_config";
     
     struct stat status;
commit d5f666486e4da61cb7f3ad9bf50794179ab97a44
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Mar 8 16:50:37 2011 +0100

    Un-breaking the unit test

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index bb8f666..aa1fdd0 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -135,8 +135,6 @@ void Test::testNumberFormat()
         "#,##0",
         "#,##0.00",
         "#,###.00",
-        "#,##0_);(#,##0)",
-        "#,##0.00_);(#,##0.00)",
         0
     };
 
@@ -170,6 +168,7 @@ void Test::testNumberFormat()
         "$#,##0;-$#,##0",
         0
     };
+#endif
 
     const char* pDate[] = {
         "MM/DD/YY",
@@ -212,7 +211,6 @@ void Test::testNumberFormat()
         "MM/DD/YY HH:MM AM/PM",
         0
     };
-#endif
 
     const char* pBoolean[] = {
         "BOOLEAN",
@@ -230,19 +228,16 @@ void Test::testNumberFormat()
         size_t nSize;
         const char** pCodes;
     } aTests[] = {
-        { NF_NUMBER_START, NF_NUMBER_END, 8, pNumber },
+        { NF_NUMBER_START, NF_NUMBER_END, 6, pNumber },
         { NF_SCIENTIFIC_START, NF_SCIENTIFIC_END, 2, pScientific },
         { NF_PERCENT_START, NF_PERCENT_END, 2, pPercent },
         { NF_FRACTION_START, NF_FRACTION_END, 4, pFraction },
 #if 0 // TODO: Find out why on some systems the last two currency format codes differ.
         { NF_CURRENCY_START, NF_CURRENCY_END, 6, pCurrency },
-      // After introducing new num. formats, indexes in standard format list
-      // get shifted and 3 items below cease to work
-      // need to investigate why (bubli)
+#endif
         { NF_DATE_START, NF_DATE_END, 21, pDate },
         { NF_TIME_START, NF_TIME_END, 7, pTime },
         { NF_DATETIME_START, NF_DATETIME_END, 2, pDateTime },
-#endif
         { NF_BOOLEAN, NF_BOOLEAN, 1, pBoolean },
         { NF_TEXT, NF_TEXT, 1, pText }
     };
commit b6c3727e56f47abf587db394efaabab4da551a99
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Mar 8 16:34:08 2011 +0100

    Adding '-N => (N)' format to en_* locale -- bnc659993
    
    LocaleNode.cxx says it's only legal for those based on en_US

diff --git a/i18npool/source/localedata/data/en_AU.xml b/i18npool/source/localedata/data/en_AU.xml
index 6206988..806915e 100644
--- a/i18npool/source/localedata/data/en_AU.xml
+++ b/i18npool/source/localedata/data/en_AU.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_CA.xml b/i18npool/source/localedata/data/en_CA.xml
index 121de11..c654cf7 100644
--- a/i18npool/source/localedata/data/en_CA.xml
+++ b/i18npool/source/localedata/data/en_CA.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml
index f920af8..326ac34 100644
--- a/i18npool/source/localedata/data/en_GB.xml
+++ b/i18npool/source/localedata/data/en_GB.xml
@@ -179,6 +179,14 @@
 <FormatCode>#,###.00</FormatCode>
 <DefaultName></DefaultName>
 </FormatElement>
+ <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+ <FormatCode>#,##0_);(#,##0)</FormatCode>
+ <DefaultName></DefaultName>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+ <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+ <DefaultName></DefaultName>
+ </FormatElement>
 <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
 <FormatCode>[CURRENCY]#,##0;-[CURRENCY]#,##0</FormatCode>
 <DefaultName></DefaultName>
diff --git a/i18npool/source/localedata/data/en_GH.xml b/i18npool/source/localedata/data/en_GH.xml
index 3743746..8f1f6ea 100644
--- a/i18npool/source/localedata/data/en_GH.xml
+++ b/i18npool/source/localedata/data/en_GH.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_JM.xml b/i18npool/source/localedata/data/en_JM.xml
index 186f8d4..780b20d 100644
--- a/i18npool/source/localedata/data/en_JM.xml
+++ b/i18npool/source/localedata/data/en_JM.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_NA.xml b/i18npool/source/localedata/data/en_NA.xml
index bec7059..255dcbf 100644
--- a/i18npool/source/localedata/data/en_NA.xml
+++ b/i18npool/source/localedata/data/en_NA.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml
index 7029b7c..f6b771b 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_ZA.xml b/i18npool/source/localedata/data/en_ZA.xml
index 4b3be48..c44810b 100644
--- a/i18npool/source/localedata/data/en_ZA.xml
+++ b/i18npool/source/localedata/data/en_ZA.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
commit e0980a917e76927443c6f223d88b96f7058ebd9f
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Mar 8 16:06:52 2011 +0100

    Handle tinkering with '-N => (N)' number format -- bnc#659993

diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index dd91ceb..779fcfe 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -334,6 +334,10 @@ public:
     // Whether the negative format is without a sign or not
     BOOL IsNegativeWithoutSign() const;
 
+    BOOL IsNegativeInBracket() const;
+
+    BOOL HasPositiveBracketPlaceholder() const;
+
     // Whether a new SYMBOLTYPE_CURRENCY is contained in the format
     BOOL HasNewCurrency() const;
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 5e2031d..3125dc5 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2744,6 +2744,10 @@ void SvNumberFormatter::GenerateFormat(String& sString,
     utl::DigitGroupingIterator aGrouping( xLocaleData->getDigitGrouping());
     const xub_StrLen nDigitsInFirstGroup = static_cast<xub_StrLen>(aGrouping.get());
     const String& rThSep = GetNumThousandSep();
+
+    SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nIndex);
+    BOOL insertBrackets = pFormat->IsNegativeInBracket();
+
     if (nAnzLeading == 0)
     {
         if (!bThousand)
@@ -2836,15 +2840,35 @@ void SvNumberFormatter::GenerateFormat(String& sString,
             sString += ';';
         sString += sNegStr;
     }
-    if (IsRed && eType != NUMBERFORMAT_CURRENCY)
+    if ( (IsRed || insertBrackets ) && eType != NUMBERFORMAT_CURRENCY)
     {
         String sTmpStr = sString;
+
+        if ( pFormat->HasPositiveBracketPlaceholder() )
+        {
+             sTmpStr += '_';
+             sTmpStr += ')';
+        }
         sTmpStr += ';';
-        sTmpStr += '[';
-        sTmpStr += pFormatScanner->GetRedString();
-        sTmpStr += ']';
-        sTmpStr += '-';
-        sTmpStr +=sString;
+
+        if (IsRed)
+        {
+            sTmpStr += '[';
+            sTmpStr += pFormatScanner->GetRedString();
+            sTmpStr += ']';
+        }
+
+        if (insertBrackets)
+        {
+            sTmpStr += '(';
+            sTmpStr += sString;
+            sTmpStr += ')';
+        }
+        else
+        {
+            sTmpStr += '-';
+            sTmpStr +=sString;
+        }
         sString = sTmpStr;
     }
 }
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 48a6dcf..39c5a0e 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4114,6 +4114,23 @@ BOOL SvNumberformat::IsNegativeWithoutSign() const
     return FALSE;
 }
 
+BOOL SvNumberformat::IsNegativeInBracket() const
+{
+    USHORT nAnz = NumFor[1].GetCount();
+    if (!nAnz)
+         return FALSE;
+
+    String *tmpStr = NumFor[1].Info().sStrArray;
+    return (tmpStr[0] == '(' && tmpStr[nAnz-1] == ')' );
+}
+
+BOOL SvNumberformat::HasPositiveBracketPlaceholder() const
+{
+    USHORT nAnz = NumFor[0].GetCount();
+    String *tmpStr = NumFor[0].Info().sStrArray;
+    return (tmpStr[nAnz-1].EqualsAscii( "_)" ));
+}
+ 
 DateFormat SvNumberformat::GetDateOrder() const
 {
     if ( (eType & NUMBERFORMAT_DATE) == NUMBERFORMAT_DATE )
commit 984809f9186beaf41873ec45718cd1f7e43f0593
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Mar 8 15:56:53 2011 +0100

    Revert "Introducing new number format ( -N => (N) ) -- bnc#659993"
    
    This reverts commit 97ce42ad29560d39560b7f7c23785142803ae52f.
    
    Adding the format to every lang. breaks the std. format indexing
    (thus, unit test too)
    Moreover, it is not "legal" for non-English locale (or so
    LocaleNode.cxx says)

diff --git a/i18npool/source/localedata/data/ak_GH.xml b/i18npool/source/localedata/data/ak_GH.xml
index 041cff9..afdbf1c 100644
--- a/i18npool/source/localedata/data/ak_GH.xml
+++ b/i18npool/source/localedata/data/ak_GH.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#,##0_);(#,##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/ar_DZ.xml b/i18npool/source/localedata/data/ar_DZ.xml
index 7eb37de..68cf3ed 100644
--- a/i18npool/source/localedata/data/ar_DZ.xml
+++ b/i18npool/source/localedata/data/ar_DZ.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#Â ###Ù«00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0Ù«00_);(# ##0Ù«00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0Ù«00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0Ù«00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0Ù«00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/ar_EG.xml b/i18npool/source/localedata/data/ar_EG.xml
index 5bb94f4..bc3341d 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#Ù¬###Ù«00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#Ù¬##0_);(#Ù¬##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#Ù¬##0Ù«00_);(#Ù¬##0Ù«00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0Ù«00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0Ù«00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0Ù«00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/ar_OM.xml b/i18npool/source/localedata/data/ar_OM.xml
index 6aaf4a7..935e736 100644
--- a/i18npool/source/localedata/data/ar_OM.xml
+++ b/i18npool/source/localedata/data/ar_OM.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#,##0_);(#,##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/ast_ES.xml b/i18npool/source/localedata/data/ast_ES.xml
index f8384fa..05c6360 100644
--- a/i18npool/source/localedata/data/ast_ES.xml
+++ b/i18npool/source/localedata/data/ast_ES.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/az_AZ.xml b/i18npool/source/localedata/data/az_AZ.xml
index 4c60a6c..268aca4 100644
--- a/i18npool/source/localedata/data/az_AZ.xml
+++ b/i18npool/source/localedata/data/az_AZ.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#Â ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/be_BY.xml b/i18npool/source/localedata/data/be_BY.xml
index 243f800..70a2ed1 100644
--- a/i18npool/source/localedata/data/be_BY.xml
+++ b/i18npool/source/localedata/data/be_BY.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
       <FormatCode>#Â ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
diff --git a/i18npool/source/localedata/data/bg_BG.xml b/i18npool/source/localedata/data/bg_BG.xml
index a202d62..2abd5cc 100644
--- a/i18npool/source/localedata/data/bg_BG.xml
+++ b/i18npool/source/localedata/data/bg_BG.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>Â ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode> ##0_);( ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode> ##0.00_);( ##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/bn_IN.xml b/i18npool/source/localedata/data/bn_IN.xml
index 592e547..1dc7992 100644
--- a/i18npool/source/localedata/data/bn_IN.xml
+++ b/i18npool/source/localedata/data/bn_IN.xml
@@ -54,22 +54,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0.00_);(#.##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/br_FR.xml b/i18npool/source/localedata/data/br_FR.xml
index b6e55d5..85a9eb1 100644
--- a/i18npool/source/localedata/data/br_FR.xml
+++ b/i18npool/source/localedata/data/br_FR.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#Â ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/bs_BA.xml b/i18npool/source/localedata/data/bs_BA.xml
index 85ff62d..0dea5e4 100644
--- a/i18npool/source/localedata/data/bs_BA.xml
+++ b/i18npool/source/localedata/data/bs_BA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Locale SYSTEM "locale.dtd">
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2" >
 <LC_INFO>
 <Language>
@@ -37,75 +37,75 @@
 <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$KM-141A]">
 <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey2" default="true" type="long" usage="DATE" formatindex="19">
 <FormatCode>NNNN DD. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey3" default="true" type="medium" usage="DATE" formatindex="20">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="21">
 <FormatCode>DD.MM.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="22">
 <FormatCode>D. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey6" default="false" type="long" usage="DATE" formatindex="23">
 <FormatCode>D. MMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey7" default="false" type="long" usage="DATE" formatindex="25">
 <FormatCode>D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="27">
 <FormatCode>NN, D. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey9" default="false" type="long" usage="DATE" formatindex="28">
 <FormatCode>NN, DD. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="29">
 <FormatCode>NN, D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="30">
 <FormatCode>NNNND. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="34">
 <FormatCode>MM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey13" default="false" type="short" usage="DATE" formatindex="35">
 <FormatCode>MMM DD</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey14" default="false" type="short" usage="DATE" formatindex="36">
 <FormatCode>MMMM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="37">
 <FormatCode>QQ YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="24">
 <FormatCode>D. MMM. YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="26">
 <FormatCode>D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey19" default="false" type="short" usage="DATE" formatindex="31">
 <FormatCode>MM-DD</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="32">
 <FormatCode>YY-MM-DD</FormatCode>
@@ -117,115 +117,107 @@
 </FormatElement>
 <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="38">
 <FormatCode>WW</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME"  formatindex="39">
 <FormatCode>HH:MM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME"  formatindex="40">
 <FormatCode>HH:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME"  formatindex="41">
 <FormatCode>HH:MM AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME"  formatindex="42">
 <FormatCode>HH:MM:SS AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
 <FormatCode>[HH]:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
 <FormatCode>MM:SS,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
 <FormatCode>[HH]:MM:SS,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
 <FormatCode>DD.MM.YY HH:MM AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
 <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
 <FormatCode>General</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
 <FormatCode>0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
 <FormatCode>0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
 <FormatCode>#.##0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
 <FormatCode>#.##0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
 <FormatCode>#.###,00</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
 <FormatCode>[CURRENCY]#.##0;-[CURRENCY]#.##0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
 <FormatCode>[CURRENCY]#.##0,00;-[CURRENCY]#.##0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
 <FormatCode>[CURRENCY]#.##0;[RED]-[CURRENCY]#.##0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
 <FormatCode>[CURRENCY]#.##0,00;[RED]-[CURRENCY]#.##0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
 <FormatCode>#.##0,00 CCC</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
 <FormatCode>[CURRENCY]#.##0,--;[RED]-[CURRENCY]#.##0,--</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
 <FormatCode>0%</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
 <FormatCode>0,00%</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
 <FormatCode>0,00E+000</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
 <FormatCode>0,00E+00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 </LC_FORMAT>
 <LC_COLLATION>
@@ -360,9 +352,7 @@
 <DefaultFullName>AD</DefaultFullName>
 </Era>
 </Eras>
-      <StartDayOfWeek>
-        <DayID>mon</DayID>
-      </StartDayOfWeek>
+<StartDayOfWeek><DayID>mon</DayID></StartDayOfWeek>
 <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
 </Calendar>
 </LC_CALENDAR>
diff --git a/i18npool/source/localedata/data/ca_ES.xml b/i18npool/source/localedata/data/ca_ES.xml
index dc4e8e9..b73579a 100644
--- a/i18npool/source/localedata/data/ca_ES.xml
+++ b/i18npool/source/localedata/data/ca_ES.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/cs_CZ.xml b/i18npool/source/localedata/data/cs_CZ.xml
index 99e54c2..977b68f 100644
--- a/i18npool/source/localedata/data/cs_CZ.xml
+++ b/i18npool/source/localedata/data/cs_CZ.xml
@@ -37,59 +37,59 @@
 <LC_FORMAT>
 <FormatElement msgid="DateFormatskey0" default="true" type="short" usage="DATE" formatindex="18">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey1" default="true" type="long" usage="DATE" formatindex="19">
 <FormatCode>NNNNDD. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey2" default="true" type="medium" usage="DATE" formatindex="20">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="21">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey4" default="false" type="long" usage="DATE" formatindex="22">
 <FormatCode>D. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey5" default="false" type="long" usage="DATE" formatindex="23">
 <FormatCode>D. MMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey6" default="false" type="long" usage="DATE" formatindex="24">
 <FormatCode>D. MMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey7" default="false" type="long" usage="DATE" formatindex="25">
 <FormatCode>D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey8" default="false" type="long" usage="DATE" formatindex="26">
 <FormatCode>D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey9" default="false" type="long" usage="DATE" formatindex="27">
 <FormatCode>NN, D. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="28">
 <FormatCode>NN, DD. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="29">
 <FormatCode>NN, D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="30">
 <FormatCode>NNNND. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey13" default="false" type="short" usage="DATE" formatindex="31">
 <FormatCode>DD-MM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey14" default="false" type="medium" usage="DATE" formatindex="32">
 <FormatCode>YY-MM-DD</FormatCode>
@@ -101,131 +101,123 @@
 </FormatElement>
 <FormatElement msgid="DateFormatskey16" default="false" type="medium" usage="DATE" formatindex="34">
 <FormatCode>MM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey17" default="false" type="medium" usage="DATE" formatindex="35">
 <FormatCode>MMM DD</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey18" default="false" type="medium" usage="DATE" formatindex="36">
 <FormatCode>MMMM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="37">
 <FormatCode>QQ YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="38">
 <FormatCode>WW</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME"  formatindex="39">
 <FormatCode>HH:MM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME"  formatindex="40">
 <FormatCode>HH:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME"  formatindex="41">
 <FormatCode>HH:MM AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME"  formatindex="42">
 <FormatCode>HH:MM:SS AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
 <FormatCode>[HH]:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
 <FormatCode>MM:SS,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
 <FormatCode>[HH]:MM:SS,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
 <FormatCode>DD.MM.YY HH:MM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
 <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
 <FormatCode>Standard</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
 <FormatCode>0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
 <FormatCode>0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
 <FormatCode>#Â ##0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
 <FormatCode>#Â ##0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
 <FormatCode>#Â ###,00</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
 <FormatCode>#Â ##0 [$KÄ-405];-#Â ##0 [$KÄ-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
 <FormatCode>#Â ##0,00 [$KÄ-405];-#Â ##0,00 [$KÄ-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
 <FormatCode>#Â ##0 [$KÄ-405];[RED]-#Â ##0 [$KÄ-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
 <FormatCode>#Â ##0,00 [$KÄ-405];[RED]-#Â ##0,00 [$KÄ-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
 <FormatCode>#Â ##0,00 CCC</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
 <FormatCode>#Â ##0,-- [$KÄ-405];[RED]-#Â ##0,-- [$KÄ-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
 <FormatCode>0%</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
 <FormatCode>0,00%</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
 <FormatCode>0,00E+000</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
 <FormatCode>0,00E+00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 </LC_FORMAT>
 <LC_COLLATION ref="en_US"/>
diff --git a/i18npool/source/localedata/data/cv_RU.xml b/i18npool/source/localedata/data/cv_RU.xml
index 4e2003a..b5fd2b5 100644
--- a/i18npool/source/localedata/data/cv_RU.xml
+++ b/i18npool/source/localedata/data/cv_RU.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#Â ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/da_DK.xml b/i18npool/source/localedata/data/da_DK.xml
index b2150a9..37e1fb9 100644
--- a/i18npool/source/localedata/data/da_DK.xml
+++ b/i18npool/source/localedata/data/da_DK.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_AT.xml b/i18npool/source/localedata/data/de_AT.xml
index ce8f438..a23e3bd 100644
--- a/i18npool/source/localedata/data/de_AT.xml
+++ b/i18npool/source/localedata/data/de_AT.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_CH.xml b/i18npool/source/localedata/data/de_CH.xml
index 86620ab..6e423a7 100644
--- a/i18npool/source/localedata/data/de_CH.xml
+++ b/i18npool/source/localedata/data/de_CH.xml
@@ -56,22 +56,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#'###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#'##0_);(#'##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#'##0.00_);(#'##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_DE.xml b/i18npool/source/localedata/data/de_DE.xml
index 93850d4..a83b3db 100644
--- a/i18npool/source/localedata/data/de_DE.xml
+++ b/i18npool/source/localedata/data/de_DE.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_LI.xml b/i18npool/source/localedata/data/de_LI.xml
index ff00cf5..9908831 100644
--- a/i18npool/source/localedata/data/de_LI.xml
+++ b/i18npool/source/localedata/data/de_LI.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#'###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#'##0_);(#'##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#'##0.00_);(#'##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_LU.xml b/i18npool/source/localedata/data/de_LU.xml
index 802ee8d..5cd6db4 100644
--- a/i18npool/source/localedata/data/de_LU.xml
+++ b/i18npool/source/localedata/data/de_LU.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/dz_BT.xml b/i18npool/source/localedata/data/dz_BT.xml
index 64e9dab..7b21b63 100644
--- a/i18npool/source/localedata/data/dz_BT.xml
+++ b/i18npool/source/localedata/data/dz_BT.xml
@@ -37,75 +37,74 @@
   <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Nu-851]">
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
       <FormatCode>[NatNum1]YY-MM-DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
       <FormatCode>[NatNum1]NN YY-MMM DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">

... etc. - the rest is truncated
