diff options
324 files changed, 3747 insertions, 5113 deletions
diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 416fa8c63b14..000000000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -*.doc binary -*.sdw binary diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx index b479384bb806..e5615325cf0d 100644 --- a/basegfx/inc/basegfx/raster/bpixelraster.hxx +++ b/basegfx/inc/basegfx/raster/bpixelraster.hxx @@ -92,7 +92,7 @@ namespace basegfx #ifdef DBG_UTIL if(nIndex >= mnCount) { - OSL_ENSURE(false, "getBPixel: Access out of range (!)"); + OSL_FAIL("getBPixel: Access out of range (!)"); return BPixel::getEmptyBPixel(); } #endif @@ -105,7 +105,7 @@ namespace basegfx #ifdef DBG_UTIL if(nIndex >= mnCount) { - OSL_ENSURE(false, "getBPixel: Access out of range (!)"); + OSL_FAIL("getBPixel: Access out of range (!)"); return mpContent[0L]; } #endif diff --git a/basegfx/inc/basegfx/raster/bzpixelraster.hxx b/basegfx/inc/basegfx/raster/bzpixelraster.hxx index 9e3cd6db36f1..b849f2491289 100644 --- a/basegfx/inc/basegfx/raster/bzpixelraster.hxx +++ b/basegfx/inc/basegfx/raster/bzpixelraster.hxx @@ -72,7 +72,7 @@ namespace basegfx #ifdef DBG_UTIL if(nIndex >= mnCount) { - OSL_ENSURE(false, "getZ: Access out of range (!)"); + OSL_FAIL("getZ: Access out of range (!)"); return mpZBuffer[0L]; } #endif @@ -85,7 +85,7 @@ namespace basegfx #ifdef DBG_UTIL if(nIndex >= mnCount) { - OSL_ENSURE(false, "getZ: Access out of range (!)"); + OSL_FAIL("getZ: Access out of range (!)"); return mpZBuffer[0L]; } #endif diff --git a/basegfx/source/color/makefile.mk b/basegfx/source/color/makefile.mk index eec507899c4c..3627f8244d10 100644 --- a/basegfx/source/color/makefile.mk +++ b/basegfx/source/color/makefile.mk @@ -29,6 +29,8 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=color +ENABLE_EXCEPTIONS=TRUE + # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx index 8c4b2d68a79b..5c24aaec973d 100644 --- a/basegfx/source/matrix/b2dhommatrixtools.cxx +++ b/basegfx/source/matrix/b2dhommatrixtools.cxx @@ -95,7 +95,7 @@ namespace basegfx break; default: - OSL_ENSURE( false, "createSinCos: Impossible case reached" ); + OSL_FAIL( "createSinCos: Impossible case reached" ); } } else diff --git a/basegfx/source/pixel/makefile.mk b/basegfx/source/pixel/makefile.mk index ab3c9a590ace..2766b7c06c8b 100644 --- a/basegfx/source/pixel/makefile.mk +++ b/basegfx/source/pixel/makefile.mk @@ -29,6 +29,8 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=pixel +ENABLE_EXCEPTIONS=TRUE + # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 5f053b4b22e2..eb96cec171e9 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -32,6 +32,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <osl/diagnose.h> #include <rtl/math.hxx> +#include <rtl/instance.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> @@ -1836,22 +1837,31 @@ namespace basegfx return aRetval; } - B2DPolygon createUnitPolygon() + namespace { - static B2DPolygon aRetval; - - if(!aRetval.count()) + struct theUnitPolygon : + public rtl::StaticWithInit<B2DPolygon, theUnitPolygon> { - aRetval.append( B2DPoint( 0.0, 0.0 ) ); - aRetval.append( B2DPoint( 1.0, 0.0 ) ); - aRetval.append( B2DPoint( 1.0, 1.0 ) ); - aRetval.append( B2DPoint( 0.0, 1.0 ) ); + B2DPolygon operator () () + { + B2DPolygon aRetval; - // close - aRetval.setClosed( true ); - } + aRetval.append( B2DPoint( 0.0, 0.0 ) ); + aRetval.append( B2DPoint( 1.0, 0.0 ) ); + aRetval.append( B2DPoint( 1.0, 1.0 ) ); + aRetval.append( B2DPoint( 0.0, 1.0 ) ); - return aRetval; + // close + aRetval.setClosed( true ); + + return aRetval; + } + }; + } + + B2DPolygon createUnitPolygon() + { + return theUnitPolygon::get(); } B2DPolygon createPolygonFromCircle( const B2DPoint& rCenter, double fRadius ) diff --git a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx index d6e1dee3fe6c..95c310b7dcc9 100644 --- a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx +++ b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx @@ -591,8 +591,7 @@ namespace basegfx switch( eFillRule ) { default: - OSL_ENSURE(false, - "B2DPolyPolygonRasterConverter::rasterConvert(): Unexpected fill rule"); + OSL_FAIL("B2DPolyPolygonRasterConverter::rasterConvert(): Unexpected fill rule"); return; case FillRule_EVEN_ODD: diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index c42ea4d8b65b..50a04dbaa075 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -826,7 +826,7 @@ namespace basegfx default: { - OSL_ENSURE(false, "importFromSvgD(): skipping tags in svg:d element (unknown)!"); + OSL_FAIL("importFromSvgD(): skipping tags in svg:d element (unknown)!"); OSL_TRACE("importFromSvgD(): skipping tags in svg:d element (unknown: \"%c\")!", aCurrChar); ++nPos; break; diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx index 60f45f98d020..ad9c2dbecce4 100644 --- a/basegfx/source/polygon/b2dtrapezoid.cxx +++ b/basegfx/source/polygon/b2dtrapezoid.cxx @@ -622,7 +622,7 @@ namespace basegfx // to not have an endless loop and start next. During development // i constantly had breakpoints here, so i am sure enough to add an // assertion here - OSL_ENSURE(false, "Trapeziod decomposer in illegal state (!)"); + OSL_FAIL("Trapeziod decomposer in illegal state (!)"); maTrDeEdgeEntries.pop_front(); continue; } @@ -636,7 +636,7 @@ namespace basegfx // line; consume the single edge to not have an endless loop and start // next. During development i constantly had breakpoints here, so i am // sure enough to add an assertion here - OSL_ENSURE(false, "Trapeziod decomposer in illegal state (!)"); + OSL_FAIL("Trapeziod decomposer in illegal state (!)"); maTrDeEdgeEntries.pop_front(); continue; } diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx index 8dc22c4e79e9..ef2ae11b4b0a 100644 --- a/basegfx/source/tools/keystoplerp.cxx +++ b/basegfx/source/tools/keystoplerp.cxx @@ -45,8 +45,7 @@ static void validateInput(const std::vector<double>& rKeyStops) for( ::std::size_t i=1, len=rKeyStops.size(); i<len; ++i ) { if( rKeyStops[i-1] > rKeyStops[i] ) - OSL_ENSURE( false, - "KeyStopLerp::KeyStopLerp(): time vector is not sorted in ascending order!" ); + OSL_FAIL( "KeyStopLerp::KeyStopLerp(): time vector is not sorted in ascending order!" ); } #endif } diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 9a6c2dac4a38..6cccd67a9c21 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -709,6 +709,43 @@ public: CPPUNIT_ASSERT_MESSAGE("scale", maScale == mat); } + void rotate() + { + B2DHomMatrix mat; + mat.rotate(90*F_PI180); + CPPUNIT_ASSERT_MESSAGE("rotate pi/2 yields exact matrix", + mat.get(0,0) == 0.0 && + mat.get(0,1) == -1.0 && + mat.get(0,2) == 0.0 && + mat.get(1,0) == 1.0 && + mat.get(1,1) == 0.0 && + mat.get(1,2) == 0.0); + mat.rotate(90*F_PI180); + CPPUNIT_ASSERT_MESSAGE("rotate pi yields exact matrix", + mat.get(0,0) == -1.0 && + mat.get(0,1) == 0.0 && + mat.get(0,2) == 0.0 && + mat.get(1,0) == 0.0 && + mat.get(1,1) == -1.0 && + mat.get(1,2) == 0.0); + mat.rotate(90*F_PI180); + CPPUNIT_ASSERT_MESSAGE("rotate 3/2 pi yields exact matrix", + mat.get(0,0) == 0.0 && + mat.get(0,1) == 1.0 && + mat.get(0,2) == 0.0 && + mat.get(1,0) == -1.0 && + mat.get(1,1) == 0.0 && + mat.get(1,2) == 0.0); + mat.rotate(90*F_PI180); + CPPUNIT_ASSERT_MESSAGE("rotate 2 pi yields exact matrix", + mat.get(0,0) == 1.0 && + mat.get(0,1) == 0.0 && + mat.get(0,2) == 0.0 && + mat.get(1,0) == 0.0 && + mat.get(1,1) == 1.0 && + mat.get(1,2) == 0.0); + } + void translate() { B2DHomMatrix mat; @@ -895,6 +932,7 @@ public: CPPUNIT_TEST(identity); CPPUNIT_TEST(scale); CPPUNIT_TEST(translate); + CPPUNIT_TEST(rotate); CPPUNIT_TEST(shear); CPPUNIT_TEST(multiply); CPPUNIT_TEST(decompose); diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index 215209f4b0da..30cb614e1a62 100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.hxx @@ -565,7 +565,7 @@ namespace canvas { OSL_TRACE("ValueMap::ValueMap(): Key %s is not lowercase", pMap->maKey); - OSL_ENSURE( false, "ValueMap::ValueMap(): Key is not lowercase" ); + OSL_FAIL( "ValueMap::ValueMap(): Key is not lowercase" ); } if( mnEntries > 1 ) @@ -578,8 +578,7 @@ namespace canvas OSL_TRACE("ValueMap::ValueMap(): Map is not sorted, keys %s and %s are wrong", pMap[0].maKey, pMap[1].maKey); - OSL_ENSURE( false, - "ValueMap::ValueMap(): Map is not sorted" ); + OSL_FAIL( "ValueMap::ValueMap(): Map is not sorted" ); } const ::rtl::OString aStr2( pMap[1].maKey ); @@ -588,7 +587,7 @@ namespace canvas { OSL_TRACE("ValueMap::ValueMap(): Key %s is not lowercase", pMap[1].maKey); - OSL_ENSURE( false, "ValueMap::ValueMap(): Key is not lowercase" ); + OSL_FAIL( "ValueMap::ValueMap(): Key is not lowercase" ); } } } diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx index ea71db57a3d2..e24ba9c3ab80 100644 --- a/canvas/source/cairo/cairo_quartz_cairo.cxx +++ b/canvas/source/cairo/cairo_quartz_cairo.cxx @@ -188,7 +188,7 @@ namespace cairo **/ void QuartzSurface::Resize( int width, int height ) { - OSL_ENSURE(false,"not supposed to be called!"); + OSL_FAIL("not supposed to be called!"); } diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index 8167775977c2..91cceeeea4d3 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx @@ -99,13 +99,13 @@ namespace cairocanvas ::sal_Bool SpriteDeviceHelper::showBuffer( bool, ::sal_Bool ) { - OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas"); + OSL_FAIL("Not supposed to be called, handled by SpriteCanvas"); return sal_False; } ::sal_Bool SpriteDeviceHelper::switchBuffer( bool, ::sal_Bool ) { - OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas"); + OSL_FAIL("Not supposed to be called, handled by SpriteCanvas"); return sal_False; } diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx index 47959c47afeb..752e7c74a3f8 100644 --- a/canvas/source/cairo/cairo_win32_cairo.cxx +++ b/canvas/source/cairo/cairo_win32_cairo.cxx @@ -172,7 +172,7 @@ namespace cairo **/ void Win32Surface::Resize( int /*width*/, int /*height*/ ) { - OSL_ENSURE(false,"not supposed to be called!"); + OSL_FAIL("not supposed to be called!"); } void Win32Surface::flush() const diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx index 82853d59c3e2..25ac0bd828b9 100644 --- a/canvas/source/directx/dx_5rm.cxx +++ b/canvas/source/directx/dx_5rm.cxx @@ -2176,8 +2176,7 @@ namespace dxcanvas } default: - OSL_ENSURE( false, - "DXRenderModule::pushVertex(): unexpected primitive types" ); + OSL_FAIL( "DXRenderModule::pushVertex(): unexpected primitive types" ); break; } } diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index a111a5f72a36..4464d1fb7781 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -1183,8 +1183,7 @@ namespace dxcanvas } default: - OSL_ENSURE(false, - "DXRenderModule::pushVertex(): unexpected primitive type"); + OSL_FAIL("DXRenderModule::pushVertex(): unexpected primitive type"); break; } } diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx index a762053c33e1..5cb18200991d 100644 --- a/canvas/source/directx/dx_canvashelper.cxx +++ b/canvas/source/directx/dx_canvashelper.cxx @@ -91,8 +91,7 @@ namespace dxcanvas switch( nJoinType ) { case rendering::PathJoinType::NONE: - OSL_ENSURE( false, - "gdiJoinFromJoin(): Join NONE not possible, mapping to MITER" ); + OSL_FAIL( "gdiJoinFromJoin(): Join NONE not possible, mapping to MITER" ); // FALLTHROUGH intended case rendering::PathJoinType::MITER: return Gdiplus::LineJoinMiter; diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index 313cd2b186df..13cda074ec1a 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -93,8 +93,7 @@ namespace dxcanvas } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -135,8 +134,7 @@ namespace dxcanvas } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx index 4791c32377b6..4680cd3428df 100644 --- a/canvas/source/directx/dx_spritedevicehelper.cxx +++ b/canvas/source/directx/dx_spritedevicehelper.cxx @@ -205,13 +205,13 @@ namespace dxcanvas ::sal_Bool SpriteDeviceHelper::showBuffer( bool, ::sal_Bool ) { - OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas"); + OSL_FAIL("Not supposed to be called, handled by SpriteCanvas"); return sal_False; } ::sal_Bool SpriteDeviceHelper::switchBuffer( bool, ::sal_Bool ) { - OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas"); + OSL_FAIL("Not supposed to be called, handled by SpriteCanvas"); return sal_False; } diff --git a/canvas/source/tools/prioritybooster.cxx b/canvas/source/tools/prioritybooster.cxx index e5291359d099..d9a7e5593e95 100644 --- a/canvas/source/tools/prioritybooster.cxx +++ b/canvas/source/tools/prioritybooster.cxx @@ -64,8 +64,7 @@ namespace canvas if ( 0 == SetThreadPriority( aCurrThread, mpImpl->mnOldPriority + nDelta ) ) { - OSL_ENSURE( false, - "PriorityBooster::PriorityBooster(): Was not able to modify thread priority" ); + OSL_FAIL( "PriorityBooster::PriorityBooster(): Was not able to modify thread priority" ); } #else (void)nDelta; diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx index 88f473e3158f..20129ea3fe16 100644 --- a/canvas/source/vcl/spritedevicehelper.cxx +++ b/canvas/source/vcl/spritedevicehelper.cxx @@ -89,13 +89,13 @@ namespace vclcanvas ::sal_Bool SpriteDeviceHelper::showBuffer( bool, ::sal_Bool ) { - OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas"); + OSL_FAIL("Not supposed to be called, handled by SpriteCanvas"); return sal_False; } ::sal_Bool SpriteDeviceHelper::switchBuffer( bool, ::sal_Bool ) { - OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas"); + OSL_FAIL("Not supposed to be called, handled by SpriteCanvas"); return sal_False; } diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 21e59a566488..e4226fac1f16 100755 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -167,8 +167,7 @@ namespace vclcanvas #ifndef QUARTZ if( aMask.GetBitCount() != 1 ) { - OSL_ENSURE(false, - "CanvasCustomSprite::redraw(): Mask bitmap is not " + OSL_FAIL("CanvasCustomSprite::redraw(): Mask bitmap is not " "monochrome (performance!)"); aMask.MakeMono(255); } diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 58fa60a151e7..c448ebb9fb45 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -88,10 +88,11 @@ void TestString::test() CPPUNIT_ASSERT(n3 == -1); } -void TestString::testDecimalStringToNumber() { +void TestString::testDecimalStringToNumber() +{ rtl::OUString s1(RTL_CONSTASCII_USTRINGPARAM("1234")); CPPUNIT_ASSERT_EQUAL((sal_uInt32)1234, comphelper::string::decimalStringToNumber(s1)); - s1 += rtl::OUString(L'\u07C6'); + s1 += rtl::OUString(static_cast<sal_Unicode>(0x07C6)); CPPUNIT_ASSERT_EQUAL((sal_uInt32)12346, comphelper::string::decimalStringToNumber(s1)); // Codepoints on 2 16bits words sal_uInt32 utf16String[] = { 0x1D7FE /* 8 */, 0x1D7F7 /* 1 */}; diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx index 80940a9bd048..fa68a34c2940 100644 --- a/comphelper/source/container/containermultiplexer.cxx +++ b/comphelper/source/container/containermultiplexer.cxx @@ -118,7 +118,7 @@ namespace comphelper } catch(const Exception&) { - OSL_ENSURE(0,"Exceptiopn catched!"); + OSL_FAIL("Exceptiopn catched!"); } ::comphelper::decrement(m_refCount); } @@ -153,7 +153,7 @@ namespace comphelper } catch(const Exception&) { - OSL_ENSURE(0,"Exception catched!"); + OSL_FAIL("Exception catched!"); } m_xContainer = NULL; m_pListener = NULL; diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 171c5af5b05c..b9d8702ccee1 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -318,7 +318,7 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU aIt++; } - OSL_ENSURE( 0, "Unknown object!" ); + OSL_FAIL( "Unknown object!" ); return ::rtl::OUString(); } @@ -1009,13 +1009,13 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const ::rtl::OUString& rNa } catch ( uno::Exception& ) { - OSL_ENSURE(0,"Could not move object!"); + OSL_FAIL("Could not move object!"); return sal_False; } } else - OSL_ENSURE(0,"Unknown object!"); + OSL_FAIL("Unknown object!"); return sal_False; } diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 32273d944e48..10727897b5a3 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -175,7 +175,7 @@ namespace comphelper return; } } - OSL_ENSURE( false, "lcl_revokeMapModificationListener: the listener is not registered!" ); + OSL_FAIL( "lcl_revokeMapModificationListener: the listener is not registered!" ); } //-------------------------------------------------------------------- diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 2220e15563b9..693d2bbe3218 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -161,8 +161,7 @@ namespace comphelper if (!m_aChildrenMap.insert( AccessibleMap::value_type( _rxKey, xValue ) ).second) { - OSL_ENSURE( - false, + OSL_FAIL( "OWrappedAccessibleChildrenManager::" "getAccessibleWrapperFor: element was already" " inserted!" ); diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx index c1884ba513c2..a9b9a85f7f69 100644 --- a/comphelper/source/misc/documentinfo.cxx +++ b/comphelper/source/misc/documentinfo.cxx @@ -187,7 +187,7 @@ namespace comphelper { sMessage += "\nin function:\n"; sMessage += BOOST_CURRENT_FUNCTION; sMessage += "\n"; - OSL_ENSURE( false, sMessage ); + OSL_FAIL( sMessage ); } return sTitle; diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index 48b99a6ff94d..6d87b0fb528a 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -104,7 +104,7 @@ namespace comphelper catch( const Exception& e ) { (void)e; - OSL_ENSURE( false, "EventLogger_Impl::impl_createLogger_nothrow: caught an exception!" ); + OSL_FAIL( "EventLogger_Impl::impl_createLogger_nothrow: caught an exception!" ); } } @@ -145,7 +145,7 @@ namespace comphelper catch( const Exception& e ) { (void)e; - OSL_ENSURE( false, "EventLogger::getLogLevel: caught an exception!" ); + OSL_FAIL( "EventLogger::getLogLevel: caught an exception!" ); } return LogLevel::OFF; @@ -162,7 +162,7 @@ namespace comphelper catch( const Exception& e ) { (void)e; - OSL_ENSURE( false, "EventLogger::setLogLevel: caught an exception!" ); + OSL_FAIL( "EventLogger::setLogLevel: caught an exception!" ); } } @@ -179,7 +179,7 @@ namespace comphelper catch( const Exception& e ) { (void)e; - OSL_ENSURE( false, "EventLogger::isLoggable: caught an exception!" ); + OSL_FAIL( "EventLogger::isLoggable: caught an exception!" ); } return false; @@ -199,7 +199,7 @@ namespace comphelper catch( const Exception& e ) { (void)e; - OSL_ENSURE( false, "EventLogger::addLogHandler: caught an exception!" ); + OSL_FAIL( "EventLogger::addLogHandler: caught an exception!" ); } return false; } @@ -218,7 +218,7 @@ namespace comphelper catch( const Exception& e ) { (void)e; - OSL_ENSURE( false, "EventLogger::removeLogHandler: caught an exception!" ); + OSL_FAIL( "EventLogger::removeLogHandler: caught an exception!" ); } return false; } @@ -292,7 +292,7 @@ namespace comphelper catch( const Exception& e ) { (void)e; - OSL_ENSURE( false, "EventLogger::impl_log: caught an exception!" ); + OSL_FAIL( "EventLogger::impl_log: caught an exception!" ); } return false; @@ -335,7 +335,7 @@ namespace comphelper catch( const Exception& e ) { (void)e; - OSL_ENSURE( false, "lcl_loadBundle_nothrow: caught an exception!" ); + OSL_FAIL( "lcl_loadBundle_nothrow: caught an exception!" ); } return _rLoggerData.xBundle.is(); @@ -356,7 +356,7 @@ namespace comphelper catch( const Exception& e ) { (void)e; - OSL_ENSURE( false, "lcl_loadString_nothrow: caught an exception!" ); + OSL_FAIL( "lcl_loadString_nothrow: caught an exception!" ); } return sMessage; } diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 6a67e1ba43da..7bf1eaea266d 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -670,7 +670,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference // success? if ( !xResultStream.is() ) { - OSL_ENSURE( false, "no valid reply to the HTTP-Post" ); + OSL_FAIL( "no valid reply to the HTTP-Post" ); return sal_False; } diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 8e4cac00f932..be789592bbf1 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -212,7 +212,7 @@ namespace comphelper ::rtl::OStringBuffer message; message.append( "NamedValueCollection::impl_assign: encountered a value type which I cannot handle:\n" ); message.append( ::rtl::OUStringToOString( pArgument->getValueTypeName(), RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( false, message.makeStringAndClear() ); + OSL_FAIL( message.makeStringAndClear() ); } #endif } diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx index 942a8e618261..2e2119cb2ee3 100644 --- a/comphelper/source/misc/officeresourcebundle.cxx +++ b/comphelper/source/misc/officeresourcebundle.cxx @@ -137,7 +137,7 @@ namespace comphelper } catch( const Exception& ) { - OSL_ENSURE( false, "ResourceBundle_Impl::loadString: caught an exception!" ); + OSL_FAIL( "ResourceBundle_Impl::loadString: caught an exception!" ); } } return sString; @@ -158,7 +158,7 @@ namespace comphelper } catch( const Exception& ) { - OSL_ENSURE( false, "ResourceBundle_Impl::hasString: caught an exception!" ); + OSL_FAIL( "ResourceBundle_Impl::hasString: caught an exception!" ); } } return has; @@ -182,7 +182,7 @@ namespace comphelper } catch( const Exception& ) { - OSL_ENSURE( false, "ResourceBundle_Impl::impl_loadBundle_nopthrow: could not create the resource loader!" ); + OSL_FAIL( "ResourceBundle_Impl::impl_loadBundle_nopthrow: could not create the resource loader!" ); } if ( !xLoader.is() ) @@ -194,7 +194,7 @@ namespace comphelper } catch( const MissingResourceException& ) { - OSL_ENSURE( false, "ResourceBundle_Impl::impl_loadBundle_nopthrow: missing the given resource bundle!" ); + OSL_FAIL( "ResourceBundle_Impl::impl_loadBundle_nopthrow: missing the given resource bundle!" ); } return m_xBundle.is(); diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx index db2a6d872359..c37484be5b07 100644 --- a/comphelper/source/misc/scopeguard.cxx +++ b/comphelper/source/misc/scopeguard.cxx @@ -46,14 +46,14 @@ ScopeGuard::~ScopeGuard() } catch (com::sun::star::uno::Exception & exc) { (void) exc; // avoid warning about unused variable - OSL_ENSURE( - false, rtl::OUStringToOString( + OSL_FAIL( + rtl::OUStringToOString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UNO exception occurred: ") ) + exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (...) { - OSL_ENSURE( false, "unknown exception occurred!" ); + OSL_FAIL( "unknown exception occurred!" ); } } else diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 9a9a9b8901c5..18ad6ad4fe9f 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -101,7 +101,7 @@ sal_uInt32 decimalStringToNumber( for( sal_Int32 i = 0 ; i < str.getLength() ; ) { sal_uInt32 c = str.iterateCodePoints(&i); - sal_uInt8 value = 0; + sal_uInt32 value = 0; if( c <= 0x0039) // ASCII decimal digits, most common value = c - 0x0030; else if( c >= 0x1D7F6 ) // mathematical monospace digits diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 4adc7bc4e46b..c67605977ddf 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -43,6 +43,7 @@ #include <algorithm> #include <functional> +#include <iterator> //-------------------------------------------------------------------------- diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 05352e3876cf..15c509378fb6 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -747,7 +747,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( aMessage.append( "\n(implementation " ); aMessage.append( typeid( *this ).name() ); aMessage.append( ")" ); - OSL_ENSURE( false, aMessage.getStr() ); + OSL_FAIL( aMessage.getStr() ); #endif } } diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index b11dea0f1c9b..6233efbc011f 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -256,7 +256,7 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( PropertiesIterator aPos = searchHandle(_nHandle); if (aPos == m_aProperties.end()) { - OSL_ENSURE( false, "OPropertyContainerHelper::convertFastPropertyValue: unknown handle!" ); + OSL_FAIL( "OPropertyContainerHelper::convertFastPropertyValue: unknown handle!" ); // should not happen if the derived class has built a correct property set info helper to be used by // our base class OPropertySetHelper return bModified; @@ -399,7 +399,7 @@ void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An PropertiesIterator aPos = searchHandle(_nHandle); if (aPos == m_aProperties.end()) { - OSL_ENSURE( false, "OPropertyContainerHelper::setFastPropertyValue: unknown handle!" ); + OSL_FAIL( "OPropertyContainerHelper::setFastPropertyValue: unknown handle!" ); // should not happen if the derived class has built a correct property set info helper to be used by // our base class OPropertySetHelper return; @@ -441,7 +441,7 @@ void OPropertyContainerHelper::getFastPropertyValue(Any& _rValue, sal_Int32 _nHa PropertiesIterator aPos = const_cast<OPropertyContainerHelper*>(this)->searchHandle(_nHandle); if (aPos == m_aProperties.end()) { - OSL_ENSURE( false, "OPropertyContainerHelper::getFastPropertyValue: unknown handle!" ); + OSL_FAIL( "OPropertyContainerHelper::getFastPropertyValue: unknown handle!" ); // should not happen if the derived class has built a correct property set info helper to be used by // our base class OPropertySetHelper return; @@ -501,7 +501,7 @@ void OPropertyContainerHelper::modifyAttributes(sal_Int32 _nHandle, sal_Int32 _n PropertiesIterator aPos = searchHandle(_nHandle); if (aPos == m_aProperties.end()) { - OSL_ENSURE( false, "OPropertyContainerHelper::modifyAttributes: unknown handle!" ); + OSL_FAIL( "OPropertyContainerHelper::modifyAttributes: unknown handle!" ); // should not happen if the derived class has built a correct property set info helper to be used by // our base class OPropertySetHelper return; diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 3627a9820db7..c71c09863234 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2684,8 +2684,7 @@ namespace cppcanvas break; default: - OSL_ENSURE( false, - "Unknown meta action type encountered" ); + OSL_FAIL( "Unknown meta action type encountered" ); break; } @@ -3136,8 +3135,7 @@ namespace cppcanvas } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -3198,8 +3196,7 @@ namespace cppcanvas } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 7356c01d7d75..a80306df3e05 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -728,8 +728,7 @@ namespace cppcanvas bool TextAction::render( const ::basegfx::B2DHomMatrix& rTransformation, const Subset& /*rSubset*/ ) const { - OSL_ENSURE( false, - "TextAction::render(): Subset not supported by this object" ); + OSL_FAIL( "TextAction::render(): Subset not supported by this object" ); // TODO(P1): Retrieve necessary font metric info for // TextAction from XCanvas. Currently, the @@ -760,8 +759,7 @@ namespace cppcanvas ::basegfx::B2DRange TextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation, const Subset& /*rSubset*/ ) const { - OSL_ENSURE( false, - "TextAction::getBounds(): Subset not supported by this object" ); + OSL_FAIL( "TextAction::getBounds(): Subset not supported by this object" ); // TODO(P1): Retrieve necessary font metric info for // TextAction from XCanvas. Currently, the @@ -966,8 +964,7 @@ namespace cppcanvas bool EffectTextAction::render( const ::basegfx::B2DHomMatrix& rTransformation, const Subset& /*rSubset*/ ) const { - OSL_ENSURE( false, - "EffectTextAction::render(): Subset not supported by this object" ); + OSL_FAIL( "EffectTextAction::render(): Subset not supported by this object" ); // TODO(P1): Retrieve necessary font metric info for // TextAction from XCanvas. Currently, the @@ -1003,8 +1000,7 @@ namespace cppcanvas ::basegfx::B2DRange EffectTextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation, const Subset& /*rSubset*/ ) const { - OSL_ENSURE( false, - "EffectTextAction::getBounds(): Subset not supported by this object" ); + OSL_FAIL( "EffectTextAction::getBounds(): Subset not supported by this object" ); // TODO(P1): Retrieve necessary font metric info for // TextAction from XCanvas. Currently, the @@ -1923,8 +1919,7 @@ namespace cppcanvas ::basegfx::B2DRange OutlineAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation, const Subset& /*rSubset*/ ) const { - OSL_ENSURE( false, - "OutlineAction::getBounds(): Subset not yet supported by this object" ); + OSL_FAIL( "OutlineAction::getBounds(): Subset not yet supported by this object" ); return getBounds( rTransformation ); } diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 6b5899f96017..8c671889280d 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -299,8 +299,7 @@ namespace cppcanvas nRotate, nShearX ) ) { - OSL_ENSURE( false, - "TransparencyGroupAction::render(): non-decomposable transformation" ); + OSL_FAIL( "TransparencyGroupAction::render(): non-decomposable transformation" ); return false; } @@ -403,8 +402,7 @@ namespace cppcanvas break; default: - OSL_ENSURE( false, - "Unknown meta action type encountered" ); + OSL_FAIL( "Unknown meta action type encountered" ); break; } } diff --git a/dtrans/source/os2/clipb/Os2Clipboard.cxx b/dtrans/source/os2/clipb/Os2Clipboard.cxx index 260c58f0d46f..76df3e4945c4 100644 --- a/dtrans/source/os2/clipb/Os2Clipboard.cxx +++ b/dtrans/source/os2/clipb/Os2Clipboard.cxx @@ -390,14 +390,14 @@ void SAL_CALL Os2Clipboard::notifyAllClipboardListener( ) } catch(RuntimeException&) { - OSL_ENSURE( false, "RuntimeException caught" ); + OSL_FAIL( "RuntimeException caught" ); debug_printf( "RuntimeException caught" ); } } } catch(const ::com::sun::star::lang::DisposedException&) { - OSL_ENSURE(false, "Service Manager disposed"); + OSL_FAIL("Service Manager disposed"); debug_printf( "Service Manager disposed"); // no further clipboard changed notifications diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx index 76cf9bc2711b..5afd70cd44a9 100644 --- a/dtrans/source/win32/clipb/WinClipboard.cxx +++ b/dtrans/source/win32/clipb/WinClipboard.cxx @@ -256,13 +256,13 @@ void SAL_CALL CWinClipboard::notifyAllClipboardListener( ) } catch(RuntimeException&) { - OSL_ENSURE( false, "RuntimeException caught" ); + OSL_FAIL( "RuntimeException caught" ); } } } catch(const ::com::sun::star::lang::DisposedException&) { - OSL_ENSURE(false, "Service Manager disposed"); + OSL_FAIL("Service Manager disposed"); // no further clipboard changed notifications m_pImpl->unregisterClipboardViewer(); diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index 6e1f9f5b1bb5..f81b37601635 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -214,8 +214,6 @@ void SAL_CALL DragSource::startDrag( } else { - //OSL_ENSURE(false, "Overlapping Drag&Drop operation rejected!"); - cnt = InterlockedDecrement(&m_RunningDndOperationCount); DragSourceDropEvent dsde; @@ -229,7 +227,7 @@ void SAL_CALL DragSource::startDrag( } catch(RuntimeException&) { - OSL_ENSURE(false, "Runtime exception during event dispatching"); + OSL_FAIL("Runtime exception during event dispatching"); } } } diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index 5c7cc51485cb..677d382df729 100755 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -470,7 +470,7 @@ std::wstring getShellLinkTarget(const std::wstring& aLnkFile) } catch(sal::systools::ComError& ex) { - OSL_ENSURE(false, ex.what()); + OSL_FAIL(ex.what()); ex = ex; } return target; diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 3f52cdbdad4f..0f42fe7b2164 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -37,6 +37,9 @@ #include <cppuhelper/basemutex.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> +#include <com/sun/star/i18n/ScriptType.hdl> + +#include <rtl/strbuf.hxx> #include <string.h> @@ -53,10 +56,12 @@ public: void testLineBreaking(); void testGraphemeIteration(); + void testWeak(); CPPUNIT_TEST_SUITE(TestBreakIterator); CPPUNIT_TEST(testLineBreaking); CPPUNIT_TEST(testGraphemeIteration); + CPPUNIT_TEST(testWeak); CPPUNIT_TEST_SUITE_END(); private: @@ -141,6 +146,44 @@ void TestBreakIterator::testGraphemeIteration() } } +//A test to ensure that certain ranges and codepoints that are categorized as +//weak remain as weak, so that existing docs that depend on this don't silently +//change font for those weak chars +void TestBreakIterator::testWeak() +{ + lang::Locale aLocale; + aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); + aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + + { + sal_Unicode WEAKS[] = + { + 0x0001, 0x0002, + 0x0020, 0x00A0, + 0x2200, 0x22FF, //Mathematical Operators + 0x27C0, 0x27EF, //Miscellaneous Mathematical Symbols-A + 0x2980, 0x29FF, //Miscellaneous Mathematical Symbols-B + 0x2A00, 0x2AFF, //Supplemental Mathematical Operators + 0x2100, 0x214F, //Letterlike Symbols + 0x2308, 0x230B, //Miscellaneous technical + 0x25A0, 0x25FF, //Geometric Shapes + 0x2B30, 0x2B4C //Miscellaneous Symbols and Arrows + }; + ::rtl::OUString aWeaks(WEAKS, SAL_N_ELEMENTS(WEAKS)); + + for (sal_Int32 i = 0; i < aWeaks.getLength(); ++i) + { + sal_Int16 nScript = m_xBreak->getScriptType(aWeaks, i); + rtl::OStringBuffer aMsg; + aMsg.append(RTL_CONSTASCII_STRINGPARAM("Char 0x")); + aMsg.append(static_cast<sal_Int32>(aWeaks.getStr()[i]), 16); + aMsg.append(RTL_CONSTASCII_STRINGPARAM(" should have been weak")); + CPPUNIT_ASSERT_MESSAGE(aMsg.getStr(), + nScript == i18n::ScriptType::WEAK); + } + } +} + TestBreakIterator::TestBreakIterator() { m_xContext = cppu::defaultBootstrap_InitialComponentContext(); diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 89659cddc8e0..8e7c02f9c34c 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -475,7 +475,7 @@ static UBlock2Script scriptList[] = { {UBLOCK_LATIN_EXTENDED_C, UBLOCK_LATIN_EXTENDED_D, ScriptType::LATIN} }; -#define scriptListCount sizeof (scriptList) / sizeof (UBlock2Script) +#define scriptListCount SAL_N_ELEMENTS(scriptList) sal_Int16 BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar) { @@ -485,11 +485,8 @@ sal_Int16 BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar) if (currentChar != lastChar) { lastChar = currentChar; - //JP 21.9.2001: handle specific characters - always as weak - // definition of 1 - this breaks a word - // 2 - this can be inside a word - // 0x20 & 0xA0 - Bug 102975, declare western space and non-break space as WEAK char. - if( 1 == currentChar || 2 == currentChar || 0x20 == currentChar || 0xA0 == currentChar) + int32_t script = u_getIntPropertyValue(currentChar, UCHAR_SCRIPT); + if (script < 0) nRet = ScriptType::WEAK; // workaround for Coptic else if ( 0x2C80 <= currentChar && 0x2CE3 >= currentChar) diff --git a/i18npool/source/breakiterator/data/char.txt b/i18npool/source/breakiterator/data/char.txt new file mode 100644 index 000000000000..8e49a565ed8c --- /dev/null +++ b/i18npool/source/breakiterator/data/char.txt @@ -0,0 +1,118 @@ +# +# Copyright (C) 2002-2009, International Business Machines Corporation and others. +# All Rights Reserved. +# +# file: char.txt +# +# ICU Character Break Rules, also known as Grapheme Cluster Boundaries +# See Unicode Standard Annex #29. +# These rules are based on TR29 Revision 13, for Unicode Version 5.1 +# Modifications to SpacingMark and Prepend by M. Hosken. +# + +# +# Character Class Definitions. +# +$CR = [\p{Grapheme_Cluster_Break = CR}]; +$LF = [\p{Grapheme_Cluster_Break = LF}]; +$Control = [\p{Grapheme_Cluster_Break = Control}]; +$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; +$Extend = [\p{Grapheme_Cluster_Break = Extend}]; +$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; +# True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data +# In effect it is [\p{Grapheme_Cluster_Break = SpacingMark} - \u0E30 \u0E32 \u0E45 \u0EB0 \u0EB2 \u102B \u102C \u1038 +# \u1062-\u1064 \u1067-\u106D \u1083 \u1087-\u108C \u108F \u109A-\u109C \u19B0-\u19B4 \u19B8-\u19C0 \u19C8 \u19C9 +# \u1A61 \u1A63 \u1A64 \u1BE7 \u1BEA-\u1BEC \u1BEE \u1BF2 \u1BF3 \uAA7B +$IndicSpacing = [\u0903 \u093B \u093E-\u0940 \u0949-\u094C \u094E \u094F \u0982 \u0983 \u09BF \u09C0 \u09C7 \u09C8 \u09CB \u09CC \u0A03 \u0A3E-\u0A40 \u0A83 \u0ABE-\u0AC0 \u0AC9 \u0ACB \u0ACC \u0B02 \u0B03 \u0B40 \u0B47 \u0B48 \u0B4B-\u0B4C \u0BBF \u0BC1 \u0BC2 \u0BC6-\u0BC8 \u0BCA-\u0BCC \u0C01-\u0C03 \u0C41-\u0C44 \u0C82 \u0C83 \u0CBE \u0CC0 \u0CC1 \u0CC3 \u0CC4 \u0CC7 \u0CC8 \u0CCA \u0CCB \u0D02 \u0D03 \u0D3F \u0D40 \u0D46-\u0D48 \u0D4A-\u0D4C \u0D82 \u0D83 \u0DD0 \u0DD1 \u0DD8-\u0DDE \u0F3E \u0F3F \u0F7F \u1923-\u1926 \u1929-\u192B \u1930 \u1931 \u1933-\u1938 \u1A19-\u1A1B \u1B04 \u1B35 \u1B3B \u1B3D-\u1B41 \u1B43 \u1B44 \u1B82 \u1BA1 \u1BA6 \u1BA7 \u1BAA \u1C24-\u1C2B \u1C34 \u1C35 \u1CE1 \u1CF2 \uA880 \uA881 \uA8B4-\uA8C3 \uA952 \uA953 \uA983 \uA9B4 \uA9B5 \uA9BA \uA9BB \uA9BD-\uA9C0 \uAA2F \uAA30 \uAA33 \uAA34 \uABE3 \uABE4 \uABE6 \uABE7 \uABE9 \uABEA \uABEC \U00011000 \U00011002 \U00011082 \U000110B0-\U000110B2 \U000110B7 \U000100B8 \U0001D166 \U0001D16D]; +# SEAsian (Thai, Lao, Burmese, Tai Lue, Tai Tham, Batak) are cluster based not syllable based +$SEASpacing = [\u0E33 \u0EB3 \u1031 \u103B \u103C \u1056 \u1057 \u1084 \u17B6 \u17BE-\u17C5 \u17C7 \u17C8 \u19B5-\u19B7 \u19BA \u1A55 \u1A57 \u1A6D-\u1A72 \uA823 \uA824 \uA827 \uAA4D]; +$BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; +$BengaliSignVirama = \u09CD; +$GujaratiLetter = [\u0A85-\u0A8C \u0A8F-\u0A90 \u0A93-\u0AB9 \u0AE0-\u0AE1]; +$GujaratiSignVirama = \u0ACD; +$DevanagariLetter = [\u0904-\u0939 \u0958-\u0961 \u0972-\u097F]; +$DevanagariSignVirama = \u094D; +$KannadaLetter = [\u0C85-\u0CB9 \u0CDE-\u0CE1]; +$KannadaSignVirama = \u0CCD; +$MalayalamLetter = [\u0D05-\u0D39 \u0D60-\u0D61 \u0D7A-\u0D7F]; +$MalayalamSignVirama = \u0D4D; +$OriyaLetter = [\u0B05-\u0B39 \u0B5C-\u0B61 \u0B71]; +$OriyaSignVirama = \u0B4D; +$GurmukhiLetter = [\u0A05-\u0A39 \u0A59-\u0A5E]; +$GurmukhiSignVirama = \u0A4D; +$TamilLetter = [\u0B85-\u0BB9]; +$TamilSignVirama = \u0BCD; +$TeluguLetter = [\u0C05-\u0C39 \u0C58-\u0C61]; +$TeluguSignVirama = \u0C4D; + +# +# Korean Syllable Definitions +# +$L = [\p{Grapheme_Cluster_Break = L}]; +$V = [\p{Grapheme_Cluster_Break = V}]; +$T = [\p{Grapheme_Cluster_Break = T}]; + +$LV = [\p{Grapheme_Cluster_Break = LV}]; +$LVT = [\p{Grapheme_Cluster_Break = LVT}]; + + +## ------------------------------------------------- +!!chain; + +!!forward; + +$CR $LF; + +$BengaliLetter ($BengaliSignVirama $BengaliLetter?)+; +$GujaratiLetter ($GujaratiSignVirama $GujaratiLetter?)+; +$DevanagariLetter ($DevanagariSignVirama $DevanagariLetter?)+; +$KannadaLetter ($KannadaSignVirama $KannadaLetter?)+; +$MalayalamLetter ($MalayalamSignVirama $MalayalamLetter?)+; +$OriyaLetter ($OriyaSignVirama $OriyaLetter?)+; +$GurmukhiLetter ($GurmukhiSignVirama $GurmukhiLetter?)+; +$TamilLetter ($TamilSignVirama $TamilLetter?)+; +$TeluguLetter ($TeluguSignVirama $TeluguLetter?)+; + +$L ($L | $V | $LV | $LVT); +($LV | $V) ($V | $T); +($LVT | $T) $T; + +[^$Control $CR $LF] $Extend; + +[^$Control $CR $LF] ($IndicSpacing | $SEASpacing); +#[^$Control $CR $LF] $SpacingMark; +# $Prepend [^$Control $CR $LF]; + + +## ------------------------------------------------- + +!!reverse; +$LF $CR; +($BengaliLetter? $BengaliSignVirama)+ $BengaliLetter; +($GujaratiLetter? $GujaratiSignVirama)+ $GujaratiLetter; +($DevanagariLetter? $DevanagariSignVirama)+ $DevanagariLetter; +($KannadaLetter? $KannadaSignVirama)+ $KannadaLetter; +($MalayalamLetter? $MalayalamSignVirama)+ $MalayalamLetter; +($OriyaLetter? $OriyaSignVirama)+ $OriyaLetter; +($GurmukhiLetter? $GurmukhiSignVirama)+ $GurmukhiLetter; +($TamilLetter? $TamilSignVirama)+ $TamilLetter; +($TeluguLetter? $TeluguSignVirama)+ $TeluguLetter; +($L | $V | $LV | $LVT) $L; +($V | $T) ($LV | $V); +$T ($LVT | $T); + +$Extend [^$Control $CR $LF]; +($IndicSpacing | $SEASpacing) [^$Control $CR $LF]; +#$SpacingMark [^$Control $CR $LF]; +# [^$Control $CR $LF] $Prepend; + + +## ------------------------------------------------- + +!!safe_reverse; + + +## ------------------------------------------------- + +!!safe_forward; + diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index d316740a0490..c152ea8547c8 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -44,6 +44,13 @@ #define S_CYR_A "\xD0\xB0" #define S_CYR_B "\xD0\xB1" +//Greek upper case +#define C_GR_A "\xCE\x91" +#define C_GR_B "\xCE\x92" +//Greek lower case +#define S_GR_A "\xCE\xB1" +#define S_GR_B "\xCE\xB2" + #include <math.h> #include <sal/macros.h> #include <rtl/ustring.hxx> @@ -170,6 +177,18 @@ static sal_Unicode table_CyrillicLowerLetter_sr[] = { 0x0444, 0x0445, 0x0446, 0x0447, 0x045F, 0x0448 }; +static sal_Unicode table_GreekUpperLetter[] = { + 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x03DB, 0x0396, 0x0397, 0x0398, + 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0, 0x03DF, + 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03E0 +}; + +static sal_Unicode table_GreekLowerLetter[] = { + 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03DB, 0x03B6, 0x03B7, 0x03B8, + 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03DF, + 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03E1 +}; + static sal_Unicode table_Alphabet_fa[] = { 0x0622, 0x0628, 0x067E, 0x062A, 0x062B, 0x062C, 0x0686, 0x062D, 0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0698, 0x0633, 0x0634, @@ -314,6 +333,82 @@ void lcl_formatChars3( sal_Unicode table_capital[], sal_Unicode table_small[], i s += OUString::valueOf( table_small[ n%tableSize ] ); } +// Greek Letter Numbering + +// KERAIA separates numerals from other text +#define STIGMA (sal_Unicode) 0x03DB +#define LEFT_KERAIA (sal_Unicode) 0x0375 +#define MYRIAD_SYM (sal_Unicode) 0x039C +#define DOT_SYM (sal_Unicode) 0x002E +#define SIGMA_OFFSET 19 +#define TAU_OFFSET 20 +#define MYRIAD 10000 + +/* +* Return the 1-999999 number's representation in the Greek numbering system. +* Adding a "left keraia" to represent numbers in the range 10000 ... 999999 is +* not orthodox, so it's better to use the myriad notation and call this method +* only for numbers up to 9999. +*/ +static +OUStringBuffer gr_smallNum(sal_Unicode table[], int n) +{ + if (n > 9999) + throw IllegalArgumentException(); + + int i = 0; + OUStringBuffer sb; + for (int v = n; v > 0; v /= 10, i++) { + int digit = v % 10; + if (digit == 0) + continue; + + sal_Unicode sign = table[(digit - 1) + 9 * (i % 3)]; + if (sign == STIGMA) { + sb.insert(0, table[TAU_OFFSET]); + sb.insert(0, table[SIGMA_OFFSET]); + } else { + sb.insert(0, sign); + } + + if (i > 2) + sb.insert(0, LEFT_KERAIA); + } + + return sb; +} + +static +void lcl_formatCharsGR( sal_Unicode table[], int n, OUString& s ) +{ + OUStringBuffer sb; + int myriadPower = 2; + + for (int divisor = MYRIAD * MYRIAD; divisor > 1; divisor /= MYRIAD, myriadPower--) { + if (n > divisor - 1) { + /* + * Follow the Diophantus representation of: + * A myriad sign, M(10000) as many times as the power + * followed by the multiplier for the myriad + * followed by a dot + * followed by the rest + * This is enough for 32-bit integers + */ + for (int i = 0; i < myriadPower; i++) + sb.append(MYRIAD_SYM); + + sb.append(gr_smallNum(table, n/divisor)); + n %= divisor; + + if (n > 0) + sb.append(DOT_SYM); + } + } + sb.append(gr_smallNum(table,n)); + + s += sb.makeStringAndClear(); +} + static int should_ignore( OUString s ) { @@ -622,6 +717,15 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal SAL_N_ELEMENTS(table_CyrillicLowerLetter_sr), number-1, result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ... break; + + case CHARS_GREEK_LOWER_LETTER: + lcl_formatCharsGR( table_GreekLowerLetter, number, result); + break; + + case CHARS_GREEK_UPPER_LETTER: + lcl_formatCharsGR( table_GreekUpperLetter, number, result); + break; + case CHARS_PERSIAN: lcl_formatChars(table_Alphabet_fa, sizeof(table_Alphabet_fa) / sizeof(sal_Unicode), number - 1, result); break; @@ -710,6 +814,8 @@ static const Supported_NumberingType aSupportedTypes[] = {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (sr)", LANG_ALL}, {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL}, {style::NumberingType::CHARS_PERSIAN, NULL, LANG_CTL}, + {style::NumberingType::CHARS_GREEK_LOWER_LETTER, C_GR_A ", " C_GR_B ", ... (gr)", LANG_ALL}, + {style::NumberingType::CHARS_GREEK_UPPER_LETTER, S_GR_A ", " S_GR_B ", ... (gr)", LANG_ALL}, }; static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType); diff --git a/i18npool/source/localedata/data/ak_GH.xml b/i18npool/source/localedata/data/ak_GH.xml index 041cff9b4602..afdbf1c2b227 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 7eb37de2f286..68cf3ed441e8 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 5bb94f45741b..bc3341d12969 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 6aaf4a70c3d8..935e736f7c29 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 f8384fad7b46..05c63601828a 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 4c60a6c22381..268aca4cd927 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 243f8002d53e..70a2ed1ace50 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 a202d6228e0a..2abd5cc9b317 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 592e547c65a3..1dc7992f9ffd 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 b6e55d5edff7..85a9eb1227e5 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 85ff62d08520..0dea5e435ec5 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 dc4e8e950332..b73579ab35cf 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 99e54c28aa27..977b68fdaa67 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 4e2003abdda4..b5fd2b552c2b 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 b2150a9f2fb5..37e1fb9ee355 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 ce8f438ee35e..a23e3bdcb04d 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 86620ab7ddf1..6e423a70eee7 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 93850d428422..a83b3dbb791d 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 ff00cf5dbfc5..9908831b2965 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 802ee8ddd228..5cd6db440e65 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 072ec6f8659f..6bb1d8951064 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"> <FormatCode>[NatNum1]YY-MM</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>[NatNum1]MMM-DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>[NatNum1]QQ YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>[NatNum1]YYYY-MM-DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>[NatNum1]YY-MM-DD</FormatCode> - <DefaultName/> - </FormatElement> - <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> + <DefaultName></DefaultName> + </FormatElement><FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,175 +116,168 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <!-- Time format was originally "ཆུ་ཚོད་" HH "སྐར་མ་" MM "སྐར་ཆ་་" SS --> <!-- Replaced with HH:MM:SS until more information is available --> <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39"> <FormatCode>HH:MM</FormatCode> - <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>[NatNum1]HH:MM AM/PM</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42"> <FormatCode>[NatNum1]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>[NatNum1]HH: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>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>[NatNum1]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>[NatNum1]0</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2"> <FormatCode>[NatNum1]0.00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3"> <FormatCode>[NatNum1]#,##0</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4"> <FormatCode>[NatNum1]#,##0.00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> <FormatCode>[NatNum1]#,###.00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="59"> <FormatCode>0</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="60"> <FormatCode>0.00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey9" default="false" type="short" usage="FIXED_NUMBER" formatindex="61"> <FormatCode>#,##0</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey10" default="false" type="medium" usage="FIXED_NUMBER" formatindex="62"> <FormatCode>#,##0.00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER" formatindex="63"> <FormatCode>#,###.00</FormatCode> - <DefaultName/> - </FormatElement> - <FormatElement msgid="FixedFormatskey12" default="false" type="short" usage="FIXED_NUMBER" formatindex="64"> - <FormatCode>#,##0_);(#,##0)</FormatCode> - <DefaultName/> - </FormatElement> - <FormatElement msgid="FixedFormatskey13" default="false" type="medium" usage="FIXED_NUMBER" formatindex="65"> - <FormatCode>#,##0.00_);(#,##0.00)</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> <FormatCode>[NatNum1][CURRENCY]#,##0;[NatNum1]-[CURRENCY]#,##0</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>[NatNum1][CURRENCY]#,##0.00;[NatNum1]-[CURRENCY]#,##0.00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>[NatNum1][CURRENCY]#,##0;[NatNum1][RED]-[CURRENCY]#,##0</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>[NatNum1][CURRENCY]#,##0.00;[NatNum1][RED]-[CURRENCY]#,##0.00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16"> <FormatCode>[NatNum1]#,##0.00 CCC</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17"> <FormatCode>[NatNum1][CURRENCY]#,##0.--;[NatNum1][RED]-[CURRENCY]#,##0.--</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey7" default="false" type="short" usage="CURRENCY" formatindex="50"> <FormatCode>[CURRENCY]#,##0;-[CURRENCY]#,##0</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium" usage="CURRENCY" formatindex="51"> <FormatCode>[CURRENCY]#,##0.00;-[CURRENCY]#,##0.00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey9" default="false" type="medium" usage="CURRENCY" formatindex="52"> <FormatCode>[CURRENCY]#,##0;[RED]-[CURRENCY]#,##0</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey10" default="false" type="medium" usage="CURRENCY" formatindex="53"> <FormatCode>[CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey11" default="false" type="medium" usage="CURRENCY" formatindex="54"> <FormatCode>#,##0.00 CCC</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey12" default="false" type="medium" usage="CURRENCY" formatindex="55"> <FormatCode>[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8"> <!-- Percentage formats other than % sign are not possible in 2.0 0 "བརྒྱ་ཆ་་" is replaced by % --> <FormatCode>[NatNum1]0%</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9"> <FormatCode>[NatNum1]0.00%</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="56"> <FormatCode>0%</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="57"> <FormatCode>0.00%</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <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="7"> <FormatCode>0.00E+00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="58"> <FormatCode>[NatNum1]0.00E+00</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> + </LC_FORMAT> <LC_COLLATION> <Collator unoid="charset" default="true"/> diff --git a/i18npool/source/localedata/data/ee_GH.xml b/i18npool/source/localedata/data/ee_GH.xml index 5a95aa568899..2d4807774a8b 100644 --- a/i18npool/source/localedata/data/ee_GH.xml +++ b/i18npool/source/localedata/data/ee_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/el_GR.xml b/i18npool/source/localedata/data/el_GR.xml index dcc699db503b..e7985e250fb2 100644 --- a/i18npool/source/localedata/data/el_GR.xml +++ b/i18npool/source/localedata/data/el_GR.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/en_AU.xml b/i18npool/source/localedata/data/en_AU.xml index bb9c91264f81..806915e07336 100644 --- a/i18npool/source/localedata/data/en_AU.xml +++ b/i18npool/source/localedata/data/en_AU.xml @@ -53,22 +53,22 @@ <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"> + <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="7"> + <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="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/en_CA.xml b/i18npool/source/localedata/data/en_CA.xml index e2655fdfd652..c654cf789c58 100644 --- a/i18npool/source/localedata/data/en_CA.xml +++ b/i18npool/source/localedata/data/en_CA.xml @@ -53,22 +53,22 @@ <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"> + <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="7"> + <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="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/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml index 063eed50fbe6..326ac348cbc5 100644 --- a/i18npool/source/localedata/data/en_GB.xml +++ b/i18npool/source/localedata/data/en_GB.xml @@ -37,75 +37,75 @@ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$£-809]"> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>DD/MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD/MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>DD MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D MMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,115 +117,115 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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>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/> -</FormatElement> +<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></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 ref="en_US"/> diff --git a/i18npool/source/localedata/data/en_GH.xml b/i18npool/source/localedata/data/en_GH.xml index e60954e6357c..8f1f6eab1643 100644 --- a/i18npool/source/localedata/data/en_GH.xml +++ b/i18npool/source/localedata/data/en_GH.xml @@ -53,22 +53,22 @@ <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"> + <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="7"> + <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="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/en_JM.xml b/i18npool/source/localedata/data/en_JM.xml index bf7052dc9c0f..780b20ddf26f 100644 --- a/i18npool/source/localedata/data/en_JM.xml +++ b/i18npool/source/localedata/data/en_JM.xml @@ -53,22 +53,22 @@ <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"> + <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="7"> + <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="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/en_NA.xml b/i18npool/source/localedata/data/en_NA.xml index d3b4298caa4c..255dcbf5e79d 100644 --- a/i18npool/source/localedata/data/en_NA.xml +++ b/i18npool/source/localedata/data/en_NA.xml @@ -53,22 +53,22 @@ <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"> + <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="7"> + <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="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/en_US.xml b/i18npool/source/localedata/data/en_US.xml index e0403ffd104a..f6b771b5f736 100644 --- a/i18npool/source/localedata/data/en_US.xml +++ b/i18npool/source/localedata/data/en_US.xml @@ -53,22 +53,22 @@ <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"> + <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="7"> + <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="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/en_ZA.xml b/i18npool/source/localedata/data/en_ZA.xml index a8589f86f140..c44810bf3eee 100644 --- a/i18npool/source/localedata/data/en_ZA.xml +++ b/i18npool/source/localedata/data/en_ZA.xml @@ -53,22 +53,22 @@ <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"> + <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="7"> + <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="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/eo.xml b/i18npool/source/localedata/data/eo.xml index eaf49cdd90c5..33a42a8fd675 100644 --- a/i18npool/source/localedata/data/eo.xml +++ b/i18npool/source/localedata/data/eo.xml @@ -145,12 +145,6 @@ <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="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> <FormatCode># #0 [CURRENCY];-# #0 [CURRENCY]</FormatCode> </FormatElement> @@ -169,16 +163,16 @@ <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17"> <FormatCode># #0,-- [CURRENCY];[RED]-# #0,-- [CURRENCY]</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="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> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/es_AR.xml b/i18npool/source/localedata/data/es_AR.xml index caee9250afa0..32af2a68b631 100644 --- a/i18npool/source/localedata/data/es_AR.xml +++ b/i18npool/source/localedata/data/es_AR.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/es_BO.xml b/i18npool/source/localedata/data/es_BO.xml index a5d0d9a715f1..de7a17f5d725 100644 --- a/i18npool/source/localedata/data/es_BO.xml +++ b/i18npool/source/localedata/data/es_BO.xml @@ -53,25 +53,19 @@ <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4"> <FormatCode>#.##0,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="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> <FormatCode>#.###,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/es_CL.xml b/i18npool/source/localedata/data/es_CL.xml index 56f3989b5f06..4c1e11a13546 100644 --- a/i18npool/source/localedata/data/es_CL.xml +++ b/i18npool/source/localedata/data/es_CL.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/es_CO.xml b/i18npool/source/localedata/data/es_CO.xml index 6c19c7fcbf32..7057ad91e4d3 100644 --- a/i18npool/source/localedata/data/es_CO.xml +++ b/i18npool/source/localedata/data/es_CO.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/es_CR.xml b/i18npool/source/localedata/data/es_CR.xml index 6efa1defec44..859510538700 100644 --- a/i18npool/source/localedata/data/es_CR.xml +++ b/i18npool/source/localedata/data/es_CR.xml @@ -15,43 +15,43 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D "de" MMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D.MMM.AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D.MMMM AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM AA</FormatCode> @@ -59,15 +59,15 @@ </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-JJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>AA-MM-DD</FormatCode> @@ -79,59 +79,59 @@ </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD/MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey21" 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>D/MM/AAAA HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</FormatCode> @@ -139,71 +139,63 @@ </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>[$¢-140A] #.##0;-[$¢-140A] #.##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>[$¢-140A] #.##0,00;-[$¢-140A] #.##0,00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>[$¢-140A] #.##0;[RED]-[$¢-140A] #.##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>[$¢-140A] #.##0,00;[RED]-[$¢-140A] #.##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>[$¢-140A] #.##0,--;[RED]-[$¢-140A] #.##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 ref="en_US"/> diff --git a/i18npool/source/localedata/data/es_DO.xml b/i18npool/source/localedata/data/es_DO.xml index c3262ff396b8..0341e4a77541 100644 --- a/i18npool/source/localedata/data/es_DO.xml +++ b/i18npool/source/localedata/data/es_DO.xml @@ -40,75 +40,75 @@ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$RD$-1C0A] "> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD/MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D "de" MMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>AA-MM-DD</FormatCode> @@ -120,115 +120,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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/AA HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</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 ref="en_US"/> diff --git a/i18npool/source/localedata/data/es_EC.xml b/i18npool/source/localedata/data/es_EC.xml index 636d399ab998..b80d437c5ba3 100644 --- a/i18npool/source/localedata/data/es_EC.xml +++ b/i18npool/source/localedata/data/es_EC.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/es_ES.xml b/i18npool/source/localedata/data/es_ES.xml index db9e29254f63..7299ad544088 100644 --- a/i18npool/source/localedata/data/es_ES.xml +++ b/i18npool/source/localedata/data/es_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/es_GT.xml b/i18npool/source/localedata/data/es_GT.xml index b7288496e015..770efc007ccd 100644 --- a/i18npool/source/localedata/data/es_GT.xml +++ b/i18npool/source/localedata/data/es_GT.xml @@ -40,75 +40,75 @@ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Q-100A]"> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD/MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D "de" MMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>AA-MM-DD</FormatCode> @@ -120,115 +120,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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/AA HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</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 ref="en_US"/> diff --git a/i18npool/source/localedata/data/es_PE.xml b/i18npool/source/localedata/data/es_PE.xml index 6aa671c94541..2b3bad66a915 100644 --- a/i18npool/source/localedata/data/es_PE.xml +++ b/i18npool/source/localedata/data/es_PE.xml @@ -40,75 +40,75 @@ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$S/-280A]"> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD/MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D "de" MMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>AA-MM-DD</FormatCode> @@ -120,115 +120,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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/AA HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</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 ref="en_US"/> diff --git a/i18npool/source/localedata/data/et_EE.xml b/i18npool/source/localedata/data/et_EE.xml index ed21cc689ec4..6b215affbfb6 100644 --- a/i18npool/source/localedata/data/et_EE.xml +++ b/i18npool/source/localedata/data/et_EE.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/eu.xml b/i18npool/source/localedata/data/eu.xml index 536f94c1fdfc..64184d0125f0 100644 --- a/i18npool/source/localedata/data/eu.xml +++ b/i18npool/source/localedata/data/eu.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/fa_IR.xml b/i18npool/source/localedata/data/fa_IR.xml index c51e4e546c94..95a64f392c4d 100644 --- a/i18npool/source/localedata/data/fa_IR.xml +++ b/i18npool/source/localedata/data/fa_IR.xml @@ -53,22 +53,16 @@ <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> <FormatCode>[NatNum1]#٬###٫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>[NatNum1]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>[NatNum1]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>[NatNum1]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>[NatNum1]0٫00%</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> diff --git a/i18npool/source/localedata/data/fi_FI.xml b/i18npool/source/localedata/data/fi_FI.xml index e22697fcee78..1f7747d8b97a 100644 --- a/i18npool/source/localedata/data/fi_FI.xml +++ b/i18npool/source/localedata/data/fi_FI.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/fo_FO.xml b/i18npool/source/localedata/data/fo_FO.xml index 241f31c6b8ad..8f60a6bc8405 100644 --- a/i18npool/source/localedata/data/fo_FO.xml +++ b/i18npool/source/localedata/data/fo_FO.xml @@ -37,75 +37,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>DD-MM-YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD-MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM-YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD-MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD-MM-YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD-MM-YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D. MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D. MMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D. MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,115 +117,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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>[$kr-438] #.##0;[$kr-438] -#.##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>[$kr-438] #.##0,00;[$kr-438] -#.##0,00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>[$kr-438] #.##0;[RED][$kr-438] -#.##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>[$kr-438] #.##0,00;[RED][$kr-438] -#.##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>[$kr-438] #.##0,--;[RED][$kr-438] -#.##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 ref="en_US"/> diff --git a/i18npool/source/localedata/data/fr_BE.xml b/i18npool/source/localedata/data/fr_BE.xml index efe0e25d1211..717e17dbf1e0 100644 --- a/i18npool/source/localedata/data/fr_BE.xml +++ b/i18npool/source/localedata/data/fr_BE.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/fr_CA.xml b/i18npool/source/localedata/data/fr_CA.xml index 8aad2170ea17..c5976c73e741 100644 --- a/i18npool/source/localedata/data/fr_CA.xml +++ b/i18npool/source/localedata/data/fr_CA.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/fr_CH.xml b/i18npool/source/localedata/data/fr_CH.xml index ea17fa9918e2..3ed64867eb2b 100644 --- a/i18npool/source/localedata/data/fr_CH.xml +++ b/i18npool/source/localedata/data/fr_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/fr_FR.xml b/i18npool/source/localedata/data/fr_FR.xml index 16ce94ae1ac2..50683f62219b 100644 --- a/i18npool/source/localedata/data/fr_FR.xml +++ b/i18npool/source/localedata/data/fr_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/fr_LU.xml b/i18npool/source/localedata/data/fr_LU.xml index 151acfbac814..41778d23d9c1 100644 --- a/i18npool/source/localedata/data/fr_LU.xml +++ b/i18npool/source/localedata/data/fr_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/fur_IT.xml b/i18npool/source/localedata/data/fur_IT.xml index bfd36326beb9..5aee7cbfdf15 100644 --- a/i18npool/source/localedata/data/fur_IT.xml +++ b/i18npool/source/localedata/data/fur_IT.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/fy_NL.xml b/i18npool/source/localedata/data/fy_NL.xml index bee6c6e66b42..a4a7cc48f2da 100644 --- a/i18npool/source/localedata/data/fy_NL.xml +++ b/i18npool/source/localedata/data/fy_NL.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/gl_ES.xml b/i18npool/source/localedata/data/gl_ES.xml index 11b33d20e1f2..26d21e913da7 100644 --- a/i18npool/source/localedata/data/gl_ES.xml +++ b/i18npool/source/localedata/data/gl_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/gsc_FR.xml b/i18npool/source/localedata/data/gsc_FR.xml index af4e3cdcfc69..01242e586e7a 100644 --- a/i18npool/source/localedata/data/gsc_FR.xml +++ b/i18npool/source/localedata/data/gsc_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+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/gug_PY.xml b/i18npool/source/localedata/data/gug_PY.xml index e257424d7bd3..60230ae64dac 100644 --- a/i18npool/source/localedata/data/gug_PY.xml +++ b/i18npool/source/localedata/data/gug_PY.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/ha_GH.xml b/i18npool/source/localedata/data/ha_GH.xml index 82a6dc5f1880..6d56b80cc580 100644 --- a/i18npool/source/localedata/data/ha_GH.xml +++ b/i18npool/source/localedata/data/ha_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/he_IL.xml b/i18npool/source/localedata/data/he_IL.xml index 89f7afb53e40..eed93a517a42 100644 --- a/i18npool/source/localedata/data/he_IL.xml +++ b/i18npool/source/localedata/data/he_IL.xml @@ -37,75 +37,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D/M/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>[NatNum2][~jewish]MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNNDD MMMM, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D MMM, YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D MMM, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>[NatNum2][~jewish]MMMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN, D MMM, YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>[NatNum2][~jewish]NN DD MMMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND MMMM, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>[NatNum2][~jewish]DD MMMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>DD-MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,127 +117,119 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>WW</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="50"> <FormatCode>[NatNum2][~jewish]YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="51"> <FormatCode>[NatNum2][~jewish]NNN DD MMMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="52"> <FormatCode>[NatNum2][~jewish]"יום "NN"׳ "DD MMMM YY</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>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>[$₪-40D] #,##0;[$₪-40D] -#,##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>[$₪-40D] #,##0.00;[$₪-40D] -#,##0.00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>[$₪-40D] #,##0;[RED][$₪-40D] -#,##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>[$₪-40D] #,##0.00;[RED][$₪-40D] -#,##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>[$₪-40D] #,##0.--;[RED][$₪-40D] -#,##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 ref="en_US"/> diff --git a/i18npool/source/localedata/data/hi_IN.xml b/i18npool/source/localedata/data/hi_IN.xml index 0deea466557f..cfca665ad46c 100644 --- a/i18npool/source/localedata/data/hi_IN.xml +++ b/i18npool/source/localedata/data/hi_IN.xml @@ -37,75 +37,75 @@ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$रु.-439]"> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D-M-YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD-MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM-YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>MMM DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="true" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD-MM-YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD-MM-YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="19"> <FormatCode>NNNNDD MMMM GGGE</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>MMM D, YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>MMM, D YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>MMMM D, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN, MMM D, YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN, MMMM D, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="true" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNNMMMM D, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,115 +117,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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>MM-DD-YY HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM-DD-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>[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+00</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/hil_PH.xml b/i18npool/source/localedata/data/hil_PH.xml index 1a454a743e7d..1bd10219d366 100644 --- a/i18npool/source/localedata/data/hil_PH.xml +++ b/i18npool/source/localedata/data/hil_PH.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/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml index fb4299be6d7f..484efdcb9ba0 100644 --- a/i18npool/source/localedata/data/hr_HR.xml +++ b/i18npool/source/localedata/data/hr_HR.xml @@ -118,22 +118,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="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39"> diff --git a/i18npool/source/localedata/data/hsb_DE.xml b/i18npool/source/localedata/data/hsb_DE.xml index 8d3dc5f1291d..1e4c70a26fd3 100644 --- a/i18npool/source/localedata/data/hsb_DE.xml +++ b/i18npool/source/localedata/data/hsb_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/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml index 886ed6b14156..2f52515cd305 100644 --- a/i18npool/source/localedata/data/hu_HU.xml +++ b/i18npool/source/localedata/data/hu_HU.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/hy_AM.xml b/i18npool/source/localedata/data/hy_AM.xml index 76346d855eb0..47c2e35d6e7b 100644 --- a/i18npool/source/localedata/data/hy_AM.xml +++ b/i18npool/source/localedata/data/hy_AM.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"> @@ -312,9 +306,7 @@ <DefaultFullName>մեր թվարկություն</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/ia.xml b/i18npool/source/localedata/data/ia.xml index d3e140c5b8d7..a749b5b271d6 100644 --- a/i18npool/source/localedata/data/ia.xml +++ b/i18npool/source/localedata/data/ia.xml @@ -37,75 +37,75 @@ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-612]"> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>DD/MM/YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD/MMM</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNN D MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D MMM YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D MMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN "le" D "de" MMM YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN "le" D "de" MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNN "le" D "de" MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,115 +117,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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 [CURRENCY];-#.##0 [CURRENCY]</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>#.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>#.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>#.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]</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,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]</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"/> @@ -350,9 +342,7 @@ <DefaultFullName>post Christo</DefaultFullName> </Era> </Eras> - <StartDayOfWeek> - <DayID>mon</DayID> - </StartDayOfWeek> + <StartDayOfWeek> <DayID>mon</DayID></StartDayOfWeek> <MinimalDaysInFirstWeek>4</MinimalDaysInFirstWeek> </Calendar> </LC_CALENDAR> diff --git a/i18npool/source/localedata/data/id_ID.xml b/i18npool/source/localedata/data/id_ID.xml index ecd0bef8114b..d7ca469136ec 100644 --- a/i18npool/source/localedata/data/id_ID.xml +++ b/i18npool/source/localedata/data/id_ID.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/is_IS.xml b/i18npool/source/localedata/data/is_IS.xml index 5eae45c7f614..3b16c6e4bca5 100644 --- a/i18npool/source/localedata/data/is_IS.xml +++ b/i18npool/source/localedata/data/is_IS.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/it_CH.xml b/i18npool/source/localedata/data/it_CH.xml index e6c04d398a0d..47b80d313210 100644 --- a/i18npool/source/localedata/data/it_CH.xml +++ b/i18npool/source/localedata/data/it_CH.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/it_IT.xml b/i18npool/source/localedata/data/it_IT.xml index 2cb5caf26deb..1f5c7d6fd89d 100644 --- a/i18npool/source/localedata/data/it_IT.xml +++ b/i18npool/source/localedata/data/it_IT.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/ja_JP.xml b/i18npool/source/localedata/data/ja_JP.xml index b59249a55098..d09dd5302749 100644 --- a/i18npool/source/localedata/data/ja_JP.xml +++ b/i18npool/source/localedata/data/ja_JP.xml @@ -53,22 +53,16 @@ <FormatElement msgid="FixedFormatskey6" default="false" type="short" 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="long" usage="SCIENTIFIC_NUMBER" formatindex="8"> + <FormatElement msgid="ScientificFormatskey1" default="true" type="long" usage="SCIENTIFIC_NUMBER" formatindex="6"> <FormatCode>0.00E+000</FormatCode> </FormatElement> - <FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9"> + <FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7"> <FormatCode>0.00E+00</FormatCode> </FormatElement> - <FormatElement msgid="PercentFormatskey1" default="true" type="medium" usage="PERCENT_NUMBER" formatindex="10"> + <FormatElement msgid="PercentFormatskey1" default="true" type="medium" 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="false" type="medium" usage="CURRENCY" formatindex="12"> diff --git a/i18npool/source/localedata/data/ka_GE.xml b/i18npool/source/localedata/data/ka_GE.xml index 23224b26d2c8..ada35b465543 100644 --- a/i18npool/source/localedata/data/ka_GE.xml +++ b/i18npool/source/localedata/data/ka_GE.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"> @@ -312,9 +306,7 @@ <DefaultFullName> ჩვენი წელთაღრიცხვით</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/kab_DZ.xml b/i18npool/source/localedata/data/kab_DZ.xml index fce2348fc049..41e3ab270518 100644 --- a/i18npool/source/localedata/data/kab_DZ.xml +++ b/i18npool/source/localedata/data/kab_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+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/kk_KZ.xml b/i18npool/source/localedata/data/kk_KZ.xml index 8c51f4f070d4..a9147655cdec 100644 --- a/i18npool/source/localedata/data/kk_KZ.xml +++ b/i18npool/source/localedata/data/kk_KZ.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/kl_GL.xml b/i18npool/source/localedata/data/kl_GL.xml index d305c2747993..b7b4e90cbdb7 100644 --- a/i18npool/source/localedata/data/kl_GL.xml +++ b/i18npool/source/localedata/data/kl_GL.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/km_KH.xml b/i18npool/source/localedata/data/km_KH.xml index afa4ebb27cad..bddd0e91791e 100644 --- a/i18npool/source/localedata/data/km_KH.xml +++ b/i18npool/source/localedata/data/km_KH.xml @@ -53,25 +53,19 @@ <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="FixedFormatskey9" default="false" type="short" usage="FIXED_NUMBER" formatindex="52"> + <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="52"> <FormatCode>[NatNum1]0</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey10" default="false" type="medium" usage="FIXED_NUMBER" formatindex="53"> + <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="53"> <FormatCode>[NatNum1]0,00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER" formatindex="54"> + <FormatElement msgid="FixedFormatskey9" default="false" type="medium" usage="FIXED_NUMBER" formatindex="54"> <FormatCode>[NatNum1]#.###,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="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="58"> @@ -80,10 +74,10 @@ <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="59"> <FormatCode>[NatNum1]0,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/ku_TR.xml b/i18npool/source/localedata/data/ku_TR.xml index 243c3c56164c..0413353b8486 100644 --- a/i18npool/source/localedata/data/ku_TR.xml +++ b/i18npool/source/localedata/data/ku_TR.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/ky_KG.xml b/i18npool/source/localedata/data/ky_KG.xml index bb657e127885..2d31be4239ee 100644 --- a/i18npool/source/localedata/data/ky_KG.xml +++ b/i18npool/source/localedata/data/ky_KG.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/la_VA.xml b/i18npool/source/localedata/data/la_VA.xml index c53a0a95d6b7..693ced48bf39 100644 --- a/i18npool/source/localedata/data/la_VA.xml +++ b/i18npool/source/localedata/data/la_VA.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/lb_LU.xml b/i18npool/source/localedata/data/lb_LU.xml index b5f2b44d113e..5c3c4e00519e 100644 --- a/i18npool/source/localedata/data/lb_LU.xml +++ b/i18npool/source/localedata/data/lb_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/lg_UG.xml b/i18npool/source/localedata/data/lg_UG.xml index bb45794ff832..5fc78c71cec2 100644 --- a/i18npool/source/localedata/data/lg_UG.xml +++ b/i18npool/source/localedata/data/lg_UG.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/ln_CD.xml b/i18npool/source/localedata/data/ln_CD.xml index b3944764935f..daf7376c9df5 100644 --- a/i18npool/source/localedata/data/ln_CD.xml +++ b/i18npool/source/localedata/data/ln_CD.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/lo_LA.xml b/i18npool/source/localedata/data/lo_LA.xml index ea32697ce96f..7e06f3a5881c 100644 --- a/i18npool/source/localedata/data/lo_LA.xml +++ b/i18npool/source/localedata/data/lo_LA.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+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/lt_LT.xml b/i18npool/source/localedata/data/lt_LT.xml index 0cd24043d825..cd4cb0aca929 100644 --- a/i18npool/source/localedata/data/lt_LT.xml +++ b/i18npool/source/localedata/data/lt_LT.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/ltg_LV.xml b/i18npool/source/localedata/data/ltg_LV.xml index 628a8f63f0d0..7d4445d26426 100644 --- a/i18npool/source/localedata/data/ltg_LV.xml +++ b/i18npool/source/localedata/data/ltg_LV.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/lv_LV.xml b/i18npool/source/localedata/data/lv_LV.xml index 6aa467af6ba8..0144bb4787cc 100644 --- a/i18npool/source/localedata/data/lv_LV.xml +++ b/i18npool/source/localedata/data/lv_LV.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/mai_IN.xml b/i18npool/source/localedata/data/mai_IN.xml index cbb90ca92252..07c3d39c6a9d 100644 --- a/i18npool/source/localedata/data/mai_IN.xml +++ b/i18npool/source/localedata/data/mai_IN.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/mk_MK.xml b/i18npool/source/localedata/data/mk_MK.xml index 9a1e51aba0d3..10e488e3cac1 100644 --- a/i18npool/source/localedata/data/mk_MK.xml +++ b/i18npool/source/localedata/data/mk_MK.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/ml_IN.xml b/i18npool/source/localedata/data/ml_IN.xml index 97d71d932186..813e523aa9aa 100644 --- a/i18npool/source/localedata/data/ml_IN.xml +++ b/i18npool/source/localedata/data/ml_IN.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+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/mn_MN.xml b/i18npool/source/localedata/data/mn_MN.xml index e5d44399c9ae..3246e77c5920 100644 --- a/i18npool/source/localedata/data/mn_MN.xml +++ b/i18npool/source/localedata/data/mn_MN.xml @@ -37,75 +37,75 @@ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₮-450]"> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>YY.M.D</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>YY MMM.DD NN</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>YY.MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>MMM.DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>YYYY.MM.DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>YY.MM.DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNNDD MMMM, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D MMM, YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D MMM, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D MMMM, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN, D MMM, YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN, D MMMM, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND MMMM, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,115 +117,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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>YY.MM.DD HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY.MM.DD 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[CURRENCY];-# ##0[CURRENCY]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode># ##0,00[CURRENCY];-# ##0,00[CURRENCY]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode># ##0[CURRENCY];[RED]-# ##0[CURRENCY]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode># ##0,00[CURRENCY];[RED]-# ##0,00[CURRENCY]</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,--[CURRENCY];[RED]-# ##0,--[CURRENCY]</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/mt_MT.xml b/i18npool/source/localedata/data/mt_MT.xml index e7df8a5d0bb0..bcc5869932b4 100644 --- a/i18npool/source/localedata/data/mt_MT.xml +++ b/i18npool/source/localedata/data/mt_MT.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/my_MM.xml b/i18npool/source/localedata/data/my_MM.xml index 6e655ae36947..6c12c8986c8f 100644 --- a/i18npool/source/localedata/data/my_MM.xml +++ b/i18npool/source/localedata/data/my_MM.xml @@ -71,11 +71,6 @@ <FormatElement msgid="FixedFormatskey12" default="false" type="medium" usage="FIXED_NUMBER" formatindex="55"> <FormatCode>#,###.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey13" default="false" type="short" usage="FIXED_NUMBER" formatindex="56"><FormatCode>#,##0_);(#,##0)</FormatCode>/ - </FormatElement> - <FormatElement msgid="FixedFormatskey14" default="false" type="medium" usage="FIXED_NUMBER" formatindex="57"> - <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/ne_NP.xml b/i18npool/source/localedata/data/ne_NP.xml index b444d6248481..558027ac0e1c 100644 --- a/i18npool/source/localedata/data/ne_NP.xml +++ b/i18npool/source/localedata/data/ne_NP.xml @@ -53,22 +53,16 @@ <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> <FormatCode>[NatNum1]#,###.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6"> - <FormatCode>[NatNum1]#,##0_);(#,##0)</FormatCode> - </FormatElement> - <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7"> - <FormatCode>[NatNum1]#,##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>[NatNum1]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>[NatNum1]0.00%</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> diff --git a/i18npool/source/localedata/data/nl_BE.xml b/i18npool/source/localedata/data/nl_BE.xml index 399ccad66196..41dc07da1078 100644 --- a/i18npool/source/localedata/data/nl_BE.xml +++ b/i18npool/source/localedata/data/nl_BE.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/nl_NL.xml b/i18npool/source/localedata/data/nl_NL.xml index b0ea3b7b5e5f..5a91c9c3e42e 100644 --- a/i18npool/source/localedata/data/nl_NL.xml +++ b/i18npool/source/localedata/data/nl_NL.xml @@ -37,75 +37,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D-MM-JJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD-MMM JJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM-JJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD-MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ JJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD-MM-JJJJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD-MM-JJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNND MMMM JJJJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D MMM JJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D MMM JJJJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D MMMM JJJJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D MMM JJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D MMMM JJJJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND MMMM JJJJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. JJJJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM JJJJ</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>JJ-MM-DD</FormatCode> @@ -117,115 +117,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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>UU:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40"> <FormatCode>UU:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41"> <FormatCode>UU:MM AM/PM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME" formatindex="42"> <FormatCode>UU:MM:SS AM/PM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43"> <FormatCode>[UU]: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>[UU]:MM:SS,00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>DD-MM-JJ UU:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-JJJJ UU:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standaard</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>[$fl-413] #.##0;[$fl-413] #.##0-</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>[$fl-413] #.##0,00;[$fl-413] #.##0,00-</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>[$fl-413] #.##0;[RED][$fl-413] #.##0-</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>[$fl-413] #.##0,00;[RED][$fl-413] #.##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>[$fl-413] #.##0,--;[RED][$fl-413] #.##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 ref="en_US"/> diff --git a/i18npool/source/localedata/data/no_NO.xml b/i18npool/source/localedata/data/no_NO.xml index b92ad53fb33a..6df7b5e2d018 100644 --- a/i18npool/source/localedata/data/no_NO.xml +++ b/i18npool/source/localedata/data/no_NO.xml @@ -37,75 +37,75 @@ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$kr-14]"> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>DD.MM.YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD. MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM.YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD. MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="true" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD.MM.YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD.MM.YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNN DD. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D. MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D. MMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D. MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNN D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,115 +117,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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>TT:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40"> <FormatCode>TT:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41"> <FormatCode>TT:MM AM/PM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME" formatindex="42"> <FormatCode>TT:MM:SS AM/PM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43"> <FormatCode>[TT]: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>[TT]:MM:SS,00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>DD.MM.YY TT:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY TT: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>[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> diff --git a/i18npool/source/localedata/data/oc_FR.xml b/i18npool/source/localedata/data/oc_FR.xml index 91f932ec94ce..c64fe872c6e8 100644 --- a/i18npool/source/localedata/data/oc_FR.xml +++ b/i18npool/source/localedata/data/oc_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+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/om_ET.xml b/i18npool/source/localedata/data/om_ET.xml index f12f910a38c1..88418fbb7ebb 100644 --- a/i18npool/source/localedata/data/om_ET.xml +++ b/i18npool/source/localedata/data/om_ET.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/or_IN.xml b/i18npool/source/localedata/data/or_IN.xml index 7c8df6fbf1c5..22333451f6ea 100644 --- a/i18npool/source/localedata/data/or_IN.xml +++ b/i18npool/source/localedata/data/or_IN.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/pl_PL.xml b/i18npool/source/localedata/data/pl_PL.xml index cb4da30b680a..195689666247 100644 --- a/i18npool/source/localedata/data/pl_PL.xml +++ b/i18npool/source/localedata/data/pl_PL.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/plt_MG.xml b/i18npool/source/localedata/data/plt_MG.xml index 9f6d36c58d98..63906044f6e3 100644 --- a/i18npool/source/localedata/data/plt_MG.xml +++ b/i18npool/source/localedata/data/plt_MG.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/pt_BR.xml b/i18npool/source/localedata/data/pt_BR.xml index c92670aa05d2..1aa4024de4b6 100644 --- a/i18npool/source/localedata/data/pt_BR.xml +++ b/i18npool/source/localedata/data/pt_BR.xml @@ -37,75 +37,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>DD/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD/MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D "de" MMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN, D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN, D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>AA-MM-DD</FormatCode> @@ -117,115 +117,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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/AA HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Geral</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>[$R$-416] #.##0;-[$R$-416] #.##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>[$R$-416] #.##0,00;-[$R$-416] #.##0,00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>[$R$-416] #.##0;[RED]-[$R$-416] #.##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>[$R$-416] #.##0,00;[RED]-[$R$-416] #.##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>[$R$-416] #.##0,--;[RED]-[$R$-416] #.##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 ref="en_US"/> diff --git a/i18npool/source/localedata/data/pt_PT.xml b/i18npool/source/localedata/data/pt_PT.xml index 8b089516827c..88e8ed66f658 100644 --- a/i18npool/source/localedata/data/pt_PT.xml +++ b/i18npool/source/localedata/data/pt_PT.xml @@ -37,75 +37,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>DD-MM-AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD-MMM AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM-AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD-MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD-MM-AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD-MM-AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D "de" MMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN, D "de" MMM "de" AA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN, D "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM AAAA</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>AA-MM-DD</FormatCode> @@ -117,115 +117,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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-AA HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-AAAA HH:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</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 [$Esc.-816];-#.##0 [$Esc.-816]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>#.##0,00 [$Esc.-816];-#.##0,00 [$Esc.-816]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>#.##0 [$Esc.-816];[RED]-#.##0 [$Esc.-816]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>#.##0,00 [$Esc.-816];[RED]-#.##0,00 [$Esc.-816]</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,-- [$Esc.-816];[RED]-#.##0,-- [$Esc.-816]</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/ro_RO.xml b/i18npool/source/localedata/data/ro_RO.xml index 35ab7bb35f43..c03ebd990f88 100644 --- a/i18npool/source/localedata/data/ro_RO.xml +++ b/i18npool/source/localedata/data/ro_RO.xml @@ -37,75 +37,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>DD.MM.YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD.MMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM.YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD MMM</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ/YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD.MM.YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD.MM.YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNND MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D MMM YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D MMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D MMM YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,115 +117,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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 [$lei-418];-#.##0 [$lei-418]</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>#.##0,00 [$lei-418];-#.##0,00 [$lei-418]</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>#.##0 [$lei-418];[RED]-#.##0 [$lei-418]</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>#.##0,00 [$lei-418];[RED]-#.##0,00 [$lei-418]</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,-- [$lei-418];[RED]-#.##0,-- [$lei-418]</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/ru_RU.xml b/i18npool/source/localedata/data/ru_RU.xml index 65ab281bfc9d..17405f6c6efc 100644 --- a/i18npool/source/localedata/data/ru_RU.xml +++ b/i18npool/source/localedata/data/ru_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/rue_SK.xml b/i18npool/source/localedata/data/rue_SK.xml index 02b1e02d39a3..86b22d5c5a2e 100644 --- a/i18npool/source/localedata/data/rue_SK.xml +++ b/i18npool/source/localedata/data/rue_SK.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/rw_RW.xml b/i18npool/source/localedata/data/rw_RW.xml index 19d5f5de87b9..65ffd1258b3f 100644 --- a/i18npool/source/localedata/data/rw_RW.xml +++ b/i18npool/source/localedata/data/rw_RW.xml @@ -40,75 +40,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D/MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD/MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNND MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>D MMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN D MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNND MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -120,115 +120,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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 [$F-487];-#.##0 [$F-487]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>#.##0,00 [$F-487];-#.##0,00 [$F-487]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>#.##0 [$F-487];[RED]-#.##0 [$F-487]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>#.##0,00 [$F-487];[RED]-#.##0,00 [$F-487]</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,-- [$F-487];[RED]-#.##0,-- [$F-487]</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> @@ -357,9 +349,7 @@ <DefaultFullName>Anno Domini</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/sc_IT.xml b/i18npool/source/localedata/data/sc_IT.xml index ccfd1f157cfa..81b446995891 100644 --- a/i18npool/source/localedata/data/sc_IT.xml +++ b/i18npool/source/localedata/data/sc_IT.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/sg_CF.xml b/i18npool/source/localedata/data/sg_CF.xml index f92c4fc4ccc4..61ee40b8081e 100644 --- a/i18npool/source/localedata/data/sg_CF.xml +++ b/i18npool/source/localedata/data/sg_CF.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/shs_CA.xml b/i18npool/source/localedata/data/shs_CA.xml index b96d4c6d434c..cfd01f31ac0d 100644 --- a/i18npool/source/localedata/data/shs_CA.xml +++ b/i18npool/source/localedata/data/shs_CA.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/sk_SK.xml b/i18npool/source/localedata/data/sk_SK.xml index a9dfa91f81c5..b233f3981284 100644 --- a/i18npool/source/localedata/data/sk_SK.xml +++ b/i18npool/source/localedata/data/sk_SK.xml @@ -40,75 +40,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D.M.YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN, DD. MMM YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>MMM DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD.MM.YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD.MM.YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNNMMMM DD. YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>MMM D. YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>MMM D. YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>MMMM D. YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN, MMM D. YY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN, MMMM D. YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNNMMMM D. YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -120,115 +120,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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 [$Sk-41B];-# ##0 [$Sk-41B]</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode># ##0,00 [$Sk-41B];-# ##0,00 [$Sk-41B]</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode># ##0 [$Sk-41B];[RED]-# ##0 [$Sk-41B]</FormatCode> - <DefaultName/> + <DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode># ##0,00 [$Sk-41B];[RED]-# ##0,00 [$Sk-41B]</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,-- [$Sk-41B];[RED]-# ##0,-- [$Sk-41B]</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/sl_SI.xml b/i18npool/source/localedata/data/sl_SI.xml index 817c1c8ba86a..19139d5e0cc0 100644 --- a/i18npool/source/localedata/data/sl_SI.xml +++ b/i18npool/source/localedata/data/sl_SI.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/so_SO.xml b/i18npool/source/localedata/data/so_SO.xml index cd9d920831e7..e332e2b07d52 100644 --- a/i18npool/source/localedata/data/so_SO.xml +++ b/i18npool/source/localedata/data/so_SO.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/sr_RS.xml b/i18npool/source/localedata/data/sr_RS.xml index fb29efd1896e..13133333f37e 100644 --- a/i18npool/source/localedata/data/sr_RS.xml +++ b/i18npool/source/localedata/data/sr_RS.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/sv_FI.xml b/i18npool/source/localedata/data/sv_FI.xml index 9644e3a4e183..5c399089790a 100644 --- a/i18npool/source/localedata/data/sv_FI.xml +++ b/i18npool/source/localedata/data/sv_FI.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/sv_SE.xml b/i18npool/source/localedata/data/sv_SE.xml index 7107784359a0..4afefebfa661 100644 --- a/i18npool/source/localedata/data/sv_SE.xml +++ b/i18npool/source/localedata/data/sv_SE.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/sw_TZ.xml b/i18npool/source/localedata/data/sw_TZ.xml index 8940372b4908..3a92d8eb3593 100644 --- a/i18npool/source/localedata/data/sw_TZ.xml +++ b/i18npool/source/localedata/data/sw_TZ.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/tg_TJ.xml b/i18npool/source/localedata/data/tg_TJ.xml index 0ec34e47b282..b005814f5ddd 100644 --- a/i18npool/source/localedata/data/tg_TJ.xml +++ b/i18npool/source/localedata/data/tg_TJ.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/th_TH.xml b/i18npool/source/localedata/data/th_TH.xml index ecc92997144d..3e4b48ae8662 100644 --- a/i18npool/source/localedata/data/th_TH.xml +++ b/i18npool/source/localedata/data/th_TH.xml @@ -37,75 +37,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>[~buddhist]D/M/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>[~buddhist]NN DD MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>[~buddhist]MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>DD MMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>[~buddhist]QQ/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>[~buddhist]วันNNNNที่ D MMMM GG YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>[~buddhist]D MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>[~buddhist]D MMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>[~buddhist]D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>[~buddhist]NN D MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>[~buddhist]NN D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>[~buddhist]วันNNNNที่ D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D MMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -117,252 +117,254 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> <FormatCode>[$฿-41E]#,##0;-[$฿-41E]#,##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode>[$฿-41E]#,##0.00;-[$฿-41E]#,##0.00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode>[$฿-41E]#,##0;[RED]-[$฿-41E]#,##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode>[$฿-41E]#,##0.00;[RED]-[$฿-41E]#,##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>[$฿-41E]#,##0.--;[RED]-[$฿-41E]#,##0.--</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <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="9"> <FormatCode>0.00%</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <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="7"> <FormatCode>0.00E+00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="51"> <FormatCode>[~buddhist]DD/MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="52"> <FormatCode>[~buddhist]DD/MM/YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="53"> <FormatCode>[~buddhist]DD/MM/YY HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="54"> <FormatCode>[~buddhist]DD/MM/YYYY HH:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey24" default="false" type="short" usage="DATE" formatindex="55"> <FormatCode>D/M/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey25" default="false" type="long" usage="DATE" formatindex="56"> <FormatCode>D MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey26" default="false" type="short" usage="DATE" formatindex="57"> <FormatCode>[NatNum1][~buddhist]D/M/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey27" default="false" type="medium" usage="DATE" formatindex="58"> <FormatCode>[NatNum1][~buddhist]DD/MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="59"> <FormatCode>[NatNum1][~buddhist]DD/MM/YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey29" default="false" type="long" usage="DATE" formatindex="60"> <FormatCode>[NatNum1][~buddhist]D MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey30" default="false" type="long" usage="DATE" formatindex="61"> <FormatCode>[NatNum1][~buddhist]NN D MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey31" default="false" type="long" usage="DATE" formatindex="62"> <FormatCode>[NatNum1][~buddhist]D MMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey32" default="false" type="long" usage="DATE" formatindex="63"> <FormatCode>[NatNum1][~buddhist]D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="64"> <FormatCode>[NatNum1][~buddhist]NN D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey34" default="false" type="long" usage="DATE" formatindex="65"> <FormatCode>[NatNum1][~buddhist]วันNNNNที่ D MMMM GG YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey35" default="false" type="long" usage="DATE" formatindex="66"> <FormatCode>[NatNum1][~buddhist]วันNNNNที่ D MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey5" default="false" type="medium" usage="DATE_TIME" formatindex="67"> <FormatCode>[NatNum1][~buddhist]DD/MM/YY HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateTimeFormatskey6" default="false" type="medium" usage="DATE_TIME" formatindex="68"> <FormatCode>[NatNum1][~buddhist]DD/MM/YYYY HH:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="69"> <FormatCode>[NatNum1]HH:MM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="TimeFormatsKey9" default="false" type="medium" usage="TIME" formatindex="70"> <FormatCode>[NatNum1]HH:MM:SS</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="71"> <FormatCode>[NatNum1]0%</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="72"> <FormatCode>[NatNum1]0.00%</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="50"> <FormatCode>[NatNum1]Standard</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey8" default="false" type="short" usage="FIXED_NUMBER" formatindex="73"> <FormatCode>[NatNum1]0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey9" default="false" type="medium" usage="FIXED_NUMBER" formatindex="74"> <FormatCode>[NatNum1]0.00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey10" default="false" type="short" usage="FIXED_NUMBER" formatindex="75"> <FormatCode>[NatNum1]#,##0</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER" formatindex="76"> <FormatCode>[NatNum1]#,##0.00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="FixedFormatskey12" default="false" type="medium" usage="FIXED_NUMBER" formatindex="77"> <FormatCode>[NatNum1]#,###.00</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey7" default="false" type="short" usage="CURRENCY" formatindex="78"> <FormatCode>#,##0 [$บาท-41E];-#,##0 [$บาท-41E]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium" usage="CURRENCY" formatindex="79"> <FormatCode>#,##0.00 [$บาท-41E];-#,##0.00 [$บาท-41E]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey9" default="false" type="medium" usage="CURRENCY" formatindex="80"> <FormatCode>#,##0 [$บาท-41E];[RED]-#,##0 [$บาท-41E]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey10" default="false" type="medium" usage="CURRENCY" formatindex="81"> <FormatCode>#,##0.00 [$บาท-41E];[RED]-#,##0.00 [$บาท-41E]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey11" default="false" type="short" usage="CURRENCY" formatindex="82"> <FormatCode>[NatNum1]#,##0 [$บาท-41E];[NatNum1]-#,##0 [$บาท-41E]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey12" default="false" type="medium" usage="CURRENCY" formatindex="83"> <FormatCode>[NatNum1]#,##0.00 [$บาท-41E];[NatNum1]-#,##0.00 [$บาท-41E]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey13" default="false" type="medium" usage="CURRENCY" formatindex="84"> <FormatCode>[NatNum1]#,##0 [$บาท-41E];[NatNum1][RED]-#,##0 [$บาท-41E]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey14" default="false" type="medium" usage="CURRENCY" formatindex="85"> <FormatCode>[NatNum1]#,##0.00 [$บาท-41E];[NatNum1][RED]-#,##0.00 [$บาท-41E]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> + </LC_FORMAT> <LC_COLLATION ref="en_US"/> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/ti_ER.xml b/i18npool/source/localedata/data/ti_ER.xml index 5190553f2420..187876c8eb5d 100644 --- a/i18npool/source/localedata/data/ti_ER.xml +++ b/i18npool/source/localedata/data/ti_ER.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/tk_TM.xml b/i18npool/source/localedata/data/tk_TM.xml index d95d2f23a8d2..c30d1f782811 100644 --- a/i18npool/source/localedata/data/tk_TM.xml +++ b/i18npool/source/localedata/data/tk_TM.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/tpi_PG.xml b/i18npool/source/localedata/data/tpi_PG.xml index cff7a31934c4..51cc3500cc57 100644 --- a/i18npool/source/localedata/data/tpi_PG.xml +++ b/i18npool/source/localedata/data/tpi_PG.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/tr_TR.xml b/i18npool/source/localedata/data/tr_TR.xml index cd82a381a48b..6c032ac9f50c 100644 --- a/i18npool/source/localedata/data/tr_TR.xml +++ b/i18npool/source/localedata/data/tr_TR.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/ug_CN.xml b/i18npool/source/localedata/data/ug_CN.xml index 1ae20d8f097c..b99f1f89a7ee 100644 --- a/i18npool/source/localedata/data/ug_CN.xml +++ b/i18npool/source/localedata/data/ug_CN.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/uk_UA.xml b/i18npool/source/localedata/data/uk_UA.xml index 6c4a44c713ee..1025096c7a6a 100644 --- a/i18npool/source/localedata/data/uk_UA.xml +++ b/i18npool/source/localedata/data/uk_UA.xml @@ -40,75 +40,75 @@ <LC_FORMAT> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D/M/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> <FormatCode>NN DD/MMM YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> <FormatCode>MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> <FormatCode>MMM DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> <FormatCode>MMMM</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> <FormatCode>QQ YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> <FormatCode>DD/MM/YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> <FormatCode>DD/MM/YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>NNNNMMMM DD, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>MMM D, YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> <FormatCode>MMM D, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> <FormatCode>MMMM D, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> <FormatCode>NN, MMM D, YY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> <FormatCode>NN, MMMM D, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> <FormatCode>NNNNMMMM D, YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> <FormatCode>D. MMM. YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> <FormatCode>D. MMMM YYYY</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> <FormatCode>MM-DD</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> <FormatCode>YY-MM-DD</FormatCode> @@ -120,115 +120,107 @@ </FormatElement> <FormatElement msgid="DateFormatskey21" 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 [$грн.-422];-# ##0 [$грн.-422]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> <FormatCode># ##0,00 [$грн.-422];-# ##0,00 [$грн.-422]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> <FormatCode># ##0 [$грн.-422];[RED]-# ##0 [$грн.-422]</FormatCode> - <DefaultName/> +<DefaultName></DefaultName> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> <FormatCode># ##0,00 [$грн.-422];[RED]-# ##0,00 [$грн.-422]</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,-- [$грн.-422];[RED]-# ##0,-- [$грн.-422]</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> diff --git a/i18npool/source/localedata/data/uz_UZ.xml b/i18npool/source/localedata/data/uz_UZ.xml index a03a284598d5..a8ffd3b117ee 100644 --- a/i18npool/source/localedata/data/uz_UZ.xml +++ b/i18npool/source/localedata/data/uz_UZ.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/vi_VN.xml b/i18npool/source/localedata/data/vi_VN.xml index 63477361652a..93fc1ee3adc4 100644 --- a/i18npool/source/localedata/data/vi_VN.xml +++ b/i18npool/source/localedata/data/vi_VN.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/wa_BE.xml b/i18npool/source/localedata/data/wa_BE.xml index 45b96e6801b7..aa994829dc2f 100644 --- a/i18npool/source/localedata/data/wa_BE.xml +++ b/i18npool/source/localedata/data/wa_BE.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/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx index 2fe0d898c759..8fc55c2e5428 100644 --- a/l10ntools/layout/tralay.cxx +++ b/l10ntools/layout/tralay.cxx @@ -376,14 +376,14 @@ void TranslateLayout::Main() aStr += OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ); } fprintf( stderr, "error: parsing: '%s'\n", aStr.getStr() ); - OSL_ENSURE( 0, aStr.getStr() ); + OSL_FAIL( aStr.getStr() ); } catch ( uno::Exception& rExc ) { OString aStr( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "error: UNO: '%s'\n", aStr.getStr() ); - OSL_ENSURE( 0, aStr.getStr() ); + OSL_FAIL( aStr.getStr() ); } } diff --git a/l10ntools/scripts/localize.pl b/l10ntools/scripts/localize.pl index ba9944f0076f..340357cca45b 100755 --- a/l10ntools/scripts/localize.pl +++ b/l10ntools/scripts/localize.pl @@ -170,12 +170,12 @@ 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 $ooo_src_root = $src_root."/l10n/l10n"; + 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 ccf937ef7d98..c8db7ee8ec8d 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" }; @@ -122,6 +118,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 +309,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; } /*****************************************************************************/ @@ -787,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" @@ -801,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" ); } @@ -937,9 +992,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 fa29217017d9..bf407c9189fa 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 9f02ff80ddc8..2b27e50dd48b 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; diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx index 103caa813804..efef5f3b42ff 100644 --- a/rsc/source/parser/rscyacc.cxx +++ b/rsc/source/parser/rscyacc.cxx @@ -260,7 +260,7 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop ) #if defined _MSC_VER #pragma warning(push, 1) -#pragma warning(disable:4129 4273 4701) +#pragma warning(disable:4129 4273 4701 4702) #endif #include "yyrscyacc.cxx" #if defined _MSC_VER diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index d02467a939b9..378adaa17c5e 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -39,7 +39,7 @@ FILE *pDefOut = NULL; /* ER evtl. #define's dump */ #endif #ifdef B200 -/* BP, 25.07.91, einzige Moeglichkeit unter BC Stack und Heap festzusetzen */ +/* einzige Moeglichkeit unter BC Stack und Heap festzusetzen */ extern unsigned _stklen = 24000; extern unsigned _heaplen = 30000; #endif @@ -189,7 +189,7 @@ char *magic[] = { /* Note: order is important */ "__FILE__", NULL /* Must be last */ }; - + static char *sharpfilename = NULL; int nRunde = 0; @@ -197,7 +197,6 @@ int nRunde = 0; void InitCpp1() { int i; - /* BP */ /* in der LIB-Version muessen alle Variablen initialisiert werden */ line = wrongline = errors = recursion = 0; @@ -234,7 +233,6 @@ void InitCpp1() nflag = 0; incend = incdir; sharpfilename = NULL; - /* BP */ } int MAIN(int argc, char** argv) @@ -287,8 +285,6 @@ nRunde++; if ((i = creat(useargv[3], 0, "rat=cr", "rfm=var")) == -1 || dup2(i, fileno(stdout)) == -1) { #else -/* alt if (freopen(useargv[3], "w", stdout) == NULL) { */ - pDefOut = fopen( useargv[3], "w" ); if( pDefOut == NULL ) { #endif @@ -298,7 +294,6 @@ nRunde++; } } /* Continue by opening output */ } -/* OSL_DEBUG_LEVEL > 1 */ #endif case 3: /* @@ -312,8 +307,6 @@ nRunde++; if ((i = creat(useargv[2], 0, "rat=cr", "rfm=var")) == -1 || dup2(i, fileno(stdout)) == -1) { #else -/* alt if (freopen(useargv[2], "w", stdout) == NULL) { */ - pCppOut = fopen( useargv[2], "w" ); if( pCppOut == NULL ) { #endif @@ -327,7 +320,6 @@ nRunde++; * Open input file, "-" means use stdin. */ if (!streq(useargv[1], "-")) { -/* alt: if (freopen(useargv[1], "r", stdin) == NULL) { */ pCppIn = fopen( useargv[1], "r" ); if( pCppIn == NULL) { perror(useargv[1]); @@ -349,16 +341,6 @@ nRunde++; default: exit(IO_ERROR); /* Can't happen */ } -/* if ( pfargv ) - { - for ( j=0;j++;j < PARALIMIT ) - { - if (pfargv[j]!=0) - free(pfargv[j]); - } - free(pfargv); - } -*/ setincdirs(); /* Setup -I include directories */ addfile( pCppIn, work); /* "open" main input file */ @@ -399,7 +381,7 @@ nRunde++; #endif } - + FILE_LOCAL void cppmain() /* @@ -551,7 +533,7 @@ end_line: if (c == '\n') { /* Compiling at EOL? */ EvalBuf[nEvalOff++] = '\0'; #endif } - + void output(int c) /* * Output one character to stdout -- output() is passed as an @@ -563,7 +545,6 @@ void output(int c) #else if (c != TOK_SEP) #endif -/* alt: PUTCHAR(c); */ PUTCHAR(c); } @@ -580,7 +561,6 @@ int c; #else if (c != TOK_SEP) #endif -/* alt: PUTCHAR(c); */ { PUTCHAR(c); if ( bIsInEval && nEvalOff < NEVALBUF ) diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c index ccc49a37ba8f..c9046c73724c 100644 --- a/rsc/source/rscpp/cpp2.c +++ b/rsc/source/rscpp/cpp2.c @@ -317,7 +317,7 @@ nest_err: cerror("#%s must be in an #if", token); } return (counter + 1); } - + FILE_LOCAL void doif(int hash) /* @@ -362,7 +362,7 @@ badif: cerror("#if, #ifdef, or #ifndef without an argument", NULLST); #endif return; } - + FILE_LOCAL void doinclude() /* @@ -432,7 +432,7 @@ void doinclude() incerr: cerror("#include syntax error", NULLST); return; } - + FILE_LOCAL int openinclude(char* filename, int searchlocal) /* @@ -508,7 +508,7 @@ openinclude(char* filename, int searchlocal) } return (FALSE); } - + FILE_LOCAL int hasdirectory(char* source, char* result) /* @@ -552,7 +552,7 @@ hasdirectory(char* source, char* result) #endif #endif } - + #if HOST == SYS_VMS /* diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index e2e7cdd98535..3654330a9035 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -86,16 +86,14 @@ void addfile(FILE* fp, char* filename) */ { register FILEINFO *file; -/* #ifndef _NO_PROTO */ - extern FILEINFO *getfile( int bufsize, char *filename ); /* BP */ -/* #endif */ + extern FILEINFO *getfile( int bufsize, char *filename ); file = getfile(NBUFF, filename); file->fp = fp; /* Better remember FILE * */ file->buffer[0] = EOS; /* Initialize for first read */ line = 1; /* Working on line 1 now */ wrongline = TRUE; /* Force out initial #line */ } - + void setincdirs() /* * Append system-specific directories to the include directory list. @@ -159,7 +157,7 @@ void setincdirs() #if HOST == SYS_UNKNOWN /* - * BP: 25.07.91, Kontext: GenMake + * Kontext: GenMake * Unter DOS wird nun auch die Environment-Variable INCLUDE ausgewetet. * Es kommt erschwerend hinzu, dass alle Eintraege, die mit ';' getrennt * sind, mit in die Liste aufenommen werden muessen. @@ -184,7 +182,7 @@ void setincdirs() } -/* BP: 11.09.91, Kontext: Erweiterung des INCLUDE-Services +/* Kontext: Erweiterung des INCLUDE-Services * Bislang konnte der cpp keine Include-Angaben in der Kommandozeile * vertragen, bei denen die directries mit ';' getrennt wurden. * Dies ist auch verstaendlich, da dieses cpp fuer UNIX-Systeme @@ -210,9 +208,6 @@ int AddInclude( char* pIncStr ) return( 1 ); } - - - int dooptions(int argc, char** argv) /* @@ -248,9 +243,6 @@ dooptions(int argc, char** argv) break; case 'D': /* Define symbol */ -#if HOST != SYS_UNIX -/* zap_uc(ap); */ /* Force define to U.C. */ -#endif /* * If the option is just "-Dfoo", make it -Dfoo=1 */ @@ -311,9 +303,6 @@ dooptions(int argc, char** argv) break; case 'U': /* Undefine symbol */ -#if HOST != SYS_UNIX -/* zap_uc(ap);*/ -#endif if (defendel(ap, TRUE) == NULL) cwarn("\"%s\" wasn't defined", ap); break; @@ -363,7 +352,7 @@ dooptions(int argc, char** argv) } return (j); /* Return new argc */ } - + int readoptions(char* filename, char*** pfargv) { @@ -426,8 +415,6 @@ readoptions(char* filename, char*** pfargv) return (back); } - - #if HOST != SYS_UNIX FILE_LOCAL void zap_uc(char* ap) @@ -508,7 +495,7 @@ void initdefines() #endif } } - + #if HOST == SYS_VMS /* * getredirection() is intended to aid in porting C programs diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c index f64d69e2e76a..fe7de9156cb6 100644 --- a/rsc/source/rscpp/cpp4.c +++ b/rsc/source/rscpp/cpp4.c @@ -237,7 +237,7 @@ bad_define: cerror("#define syntax error", NULLST); inmacro = FALSE; /* Stop <newline> hack */ } - + void checkparm(int c, DEFBUF* dp) /* * Replace this param if it's defined. Note that the macro name is a @@ -265,7 +265,7 @@ void checkparm(int c, DEFBUF* dp) for (cp = token; *cp != EOS;) /* And save */ save(*cp++); /* The token itself */ } - + #if STRING_FORMAL void stparmscan(delim, dp) int delim; @@ -337,7 +337,7 @@ void stparmscan(int delim) workp[-1] = wp[-1]; /* Nope, reset end quote. */ } #endif - + void doundef() /* * Remove the symbol from the defined list. @@ -385,7 +385,7 @@ void charput(int c) *parmp++ = (char)c; } } - + /* * M a c r o E x p a n s i o n */ @@ -486,7 +486,7 @@ void expand(DEFBUF* tokenp) expstuff(tokenp); /* Do actual parameters */ } /* nargs switch */ } - + FILE_LOCAL int expcollect() /* @@ -547,7 +547,7 @@ expcollect() } /* Collect all args. */ return (TRUE); /* Normal return */ } - + FILE_LOCAL void expstuff(DEFBUF* tokenp) /* diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c index 9c2cfe68f10b..4eb3183b5a86 100644 --- a/rsc/source/rscpp/cpp5.c +++ b/rsc/source/rscpp/cpp5.c @@ -114,7 +114,7 @@ register int op; #define isbinary(op) (op >= FIRST_BINOP && op <= LAST_BINOP) #define isunary(op) (op >= FIRST_UNOP && op <= LAST_UNOP) #endif - + /* * The following definitions are used to specify basic variable sizes. */ @@ -158,7 +158,7 @@ register int op; #ifndef S_PFPTR #define S_PFPTR (sizeof (int (*)())) #endif - + typedef struct types { short type; /* This is the bit if */ char *name; /* this is the token word */ @@ -203,7 +203,6 @@ SIZES size_table[] = { { T_FPTR, 0, S_PFPTR }, /* int (*()) */ { 0, 0, 0 }, /* End of table */ }; - void InitCpp5() { @@ -379,7 +378,7 @@ again: ; } /* op1 switch end */ } /* Stack unwind loop */ } - + FILE_LOCAL int evallex(int skip) /* @@ -662,7 +661,7 @@ evalnum(int c) unget(); return (value); } - + FILE_LOCAL int evalchar(int skip) /* @@ -768,7 +767,7 @@ evalchar(int skip) instring = FALSE; return (value); } - + FILE_LOCAL int * evaleval(int* valp, int op, int skip) /* @@ -906,7 +905,7 @@ evaleval(int* valp, int op, int skip) *valp++ = v1; return (valp); } - + #ifdef DEBUG_EVAL dumpstack(opstack, opp, value, valp) OPTAB opstack[NEXP]; /* Operand stack */ diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c index 360e3f75b25f..cb628ba4c04d 100644 --- a/rsc/source/rscpp/cpp6.c +++ b/rsc/source/rscpp/cpp6.c @@ -82,7 +82,7 @@ * cierror & ciwarn take a format and a single int (char) argument. * cfatal takes a format and a single string argument. */ - + /* * This table must be rewritten for a non-Ascii machine. * @@ -169,7 +169,6 @@ OP_LPA,OP_RPA,OP_MUL,OP_ADD, 000,OP_SUB, DOT,OP_DIV, /* 28 ()*+,-./ */ #endif - /* * C P P S y m b o l T a b l e s */ @@ -227,7 +226,7 @@ skipws() #endif return (c); } - + void scanid(int c) /* * Get the next token (an id) into the token buffer. @@ -268,7 +267,7 @@ macroid(int c) } return (c); } - + int catenate() /* @@ -334,7 +333,7 @@ catenate() return (FALSE); /* Not supported */ #endif } - + int scanstring(int delim, #ifndef _NO_PROTO @@ -373,7 +372,7 @@ void (*outfun)() /* BP */ return (FALSE); } } - + void scannumber(int c, #ifndef _NO_PROTO register void (*outfun)( int ) /* BP */ /* Output/store func */ @@ -503,7 +502,7 @@ nomore: unget(); /* Not part of a number */ if (octal89 && radix == 8) cwarn("Illegal digit in octal number", NULLST); } - + void save(int c) { if (workp >= &work[NWORK]) { @@ -564,7 +563,6 @@ getmem(int size) cfatal("Out of memory", NULLST); return (result); } - DEFBUF * lookid(int c) @@ -604,7 +602,7 @@ lookid(int c) } return ((temp == 0) ? dp : NULL); } - + DEFBUF * defendel(char* name, int delete) /* @@ -772,7 +770,7 @@ void dumpadef(char *why, register DEFBUF *dp) pCppOut = pRememberOut; } #endif - + /* * G E T */ @@ -1053,7 +1051,7 @@ cget() #endif return (c); } - + /* * Error messages and other hacks. The first byte of severity * is 'S' for string arguments and 'I' for int arguments. This diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h index b3adecbc41cb..2490f1df7d7b 100644 --- a/rsc/source/rscpp/cppdef.h +++ b/rsc/source/rscpp/cppdef.h @@ -185,7 +185,7 @@ #ifndef LINE_PREFIX #define LINE_PREFIX "" #endif - + /* * OLD_PREPROCESSOR forces the definition of OK_DOLLAR, OK_CONCAT, * COMMENT_INVISIBLE, and STRING_FORMAL to values appropriate for @@ -304,12 +304,7 @@ #else #define PAR_MAC (31 + 1) #endif -/* ER 13.06.95 19:33 - da Makros im file->buffer expandiert werden, muss NBUFF mindestens NWORK sein -#define NWORK 4096 -#define NBUFF 4096 - */ -/* ER 13.06.95 20:05 NWORK wg. grooossen Makros in *.src erhoeht, +/* NWORK wg. grooossen Makros in *.src erhoeht, da wir bald 10 Sprachen haben werden gleich ordentlich reingehauen.. */ #define NWORK 128000 #define NBUFF NWORK diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 122928f1d934..1417fb644679 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -457,7 +457,7 @@ inline sal_Bool SaxWriterHelper::convertToXML( const sal_Unicode * pStr, } else { - OSL_ENSURE( false, "illegal Unicode character" ); + OSL_FAIL( "illegal Unicode character" ); bRet = sal_False; } diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 5dceeb38ab0d..efa9f1687d7f 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -270,7 +270,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, sal_Int16 nSourceUnit /* = MeasureUnit::MM_100TH */, sal_Int16 nTargetUnit /* = MeasureUnit::INCH */ ) { - OSL_ENSURE( false, "Converter::convertMeasure - not implemented, tools/BigInt needs replacement" ); + OSL_FAIL( "Converter::convertMeasure - not implemented, tools/BigInt needs replacement" ); (void)rBuffer; (void)nMeasure; (void)nSourceUnit; @@ -661,7 +661,7 @@ bool Converter::convertDuration(double& rfTime, { //! how many days is a year or month? - OSL_ENSURE( false, "years or months in duration: not implemented"); + OSL_FAIL( "years or months in duration: not implemented"); bSuccess = false; } else diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx index 493ef5cb3c92..961875194a20 100644 --- a/sax/source/tools/fastserializer.hxx +++ b/sax/source/tools/fastserializer.hxx @@ -138,6 +138,7 @@ private: public: ForMerge() : maData(), maPostponed() {} + virtual ~ForMerge() {} virtual void setCurrentElement( ::sal_Int32 /*nToken*/ ) {} virtual Int8Sequence& getData(); diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index cff5394d8ea2..8ee2a30765c7 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -114,7 +114,7 @@ void FileList::Assign( const SvDataCopyStream& rCopyStream ) SvStream& operator<<( SvStream& rOStm, const FileList& /*rFileList*/ ) { - OSL_ENSURE(false, "Not implemented!"); + OSL_FAIL("Not implemented!"); return rOStm; } diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index e216cd08c746..7e5e8868f58a 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -81,7 +81,7 @@ * Sortierung mit Hilfe der Object-operatoren "<" und "==" * * 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 02e3045c6eaf..b831362e72da 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, @@ -103,11 +103,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/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index 783fce26bec9..80e9b8eeffb0 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -114,9 +114,7 @@ enum NfIndexTableOffset NF_NUMBER_1000INT, // #,##0 NF_NUMBER_1000DEC2, // #,##0.00 NF_NUMBER_SYSTEM, // #,##0.00 or whatever is set in System Regional Settings - NF_NUMBER_NEG_BRACKET, // #,##0_);(#,##0) -42 => (42) - NF_NUMBER_NEG_BRACKET_DEC2, // #,##0.00_);(#,##0.00) -42.00 => (42.00) - NF_NUMBER_END = NF_NUMBER_NEG_BRACKET_DEC2, + NF_NUMBER_END = NF_NUMBER_SYSTEM, NF_SCIENTIFIC_START, NF_SCIENTIFIC_000E000 = NF_SCIENTIFIC_START, // 0.00E+000 diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index bb8f666d77ce..aa1fdd0b61a2 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 } }; diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index 9f752aa9f471..cf486f361402 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -80,7 +80,7 @@ ItemHolder2::ItemHolder2() sMsg += ::rtl::OString(rEx.Message.getStr(), rEx.Message.getLength(), RTL_TEXTENCODING_ASCII_US); - DBG_ERROR(sMsg.getStr()); + OSL_FAIL(sMsg.getStr()); } } #else diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index a42f8e2a6e46..1702604b7fe9 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -131,7 +131,7 @@ struct SfxItemPool_Impl rStream >> nFileTag; \ if ( nTag != nFileTag ) \ { \ - DBG_ERROR( #nTag ); /*! s.u. */ \ + OSL_FAIL( #nTag ); /*! s.u. */ \ /*! error-code setzen und auswerten! */ \ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ pImp->bStreaming = sal_False; \ @@ -144,7 +144,7 @@ struct SfxItemPool_Impl rStream >> nFileTag; \ if ( nTag != nFileTag ) \ { \ - DBG_ERROR( #nTag ); /*! s.u. */ \ + OSL_FAIL( #nTag ); /*! s.u. */ \ /*! error-code setzen und auswerten! */ \ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ pImp->bStreaming = sal_False; \ @@ -158,7 +158,7 @@ struct SfxItemPool_Impl rStream >> nFileTag; \ if ( nTag1 != nFileTag && nTag2 != nFileTag ) \ { \ - DBG_ERROR( #nTag1 ); /*! s.u. */ \ + OSL_FAIL( #nTag1 ); /*! s.u. */ \ /*! error-code setzen und auswerten! */ \ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ pImp->bStreaming = sal_False; \ diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index aab2fdcfbaaf..78fbd27e8bdb 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -49,7 +49,7 @@ // STATIC DATA ----------------------------------------------------------- static const sal_uInt16 nInitCount = 10; // einzelne USHORTs => 5 Paare ohne '0' -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 static sal_uLong nRangesCopyCount = 0; // wie oft wurden Ranges kopiert #endif @@ -233,7 +233,9 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, void SfxItemSet::InitRanges_Impl(const sal_uInt16 *pWhichPairTable) { DBG_CHKTHIS(SfxItemSet, 0); - DBG_TRACE1("SfxItemSet: Ranges-CopyCount==%ul", ++nRangesCopyCount); + #if OSL_DEBUG_LEVEL > 1 + OSL_TRACE("SfxItemSet: Ranges-CopyCount==%ul", ++nRangesCopyCount); + #endif sal_uInt16 nCnt = 0; const sal_uInt16* pPtr = pWhichPairTable; @@ -313,7 +315,9 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ): *ppDst = &_pPool->Put( **ppSrc ); // dann noch die Which Ranges kopieren - DBG_TRACE1("SfxItemSet: Ranges-CopyCount==%ul", ++nRangesCopyCount); + #if OSL_DEBUG_LEVEL > 1 + OSL_TRACE("SfxItemSet: Ranges-CopyCount==%ul", ++nRangesCopyCount); + #endif std::ptrdiff_t cnt = pPtr - rASet._pWhichRanges+1; _pWhichRanges = new sal_uInt16[ cnt ]; memcpy( _pWhichRanges, rASet._pWhichRanges, sizeof( sal_uInt16 ) * cnt); diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx index 53b47c7e872a..6f3cc966995b 100644 --- a/svl/source/memtools/svarray.cxx +++ b/svl/source/memtools/svarray.cxx @@ -33,8 +33,7 @@ #define _SVSTDARR_ULONGS #define _SVSTDARR_ULONGSSORT -#define _SVSTDARR_USHORTS -#define _SVSTDARR_LONGS +#define _SVSTDARR_sal_uInt16S #define _SVSTDARR_LONGSSORT #define _SVSTDARR_STRINGS #define _SVSTDARR_STRINGSDTOR @@ -42,7 +41,7 @@ #define _SVSTDARR_STRINGSSORTDTOR #define _SVSTDARR_STRINGSISORT #define _SVSTDARR_STRINGSISORTDTOR -#define _SVSTDARR_USHORTSSORT +#define _SVSTDARR_sal_uInt16SSORT #define _SVSTDARR_BYTESTRINGS #define _SVSTDARR_BYTESTRINGSDTOR @@ -68,7 +67,6 @@ sal_uInt16 SvPtrarr::GetPos( const VoidPtr& aElement ) const SV_IMPL_VARARR( SvULongs, sal_uLong ) SV_IMPL_VARARR( SvUShorts, sal_uInt16 ) -SV_IMPL_VARARR( SvLongs, long) SV_IMPL_VARARR_SORT( SvULongsSort, sal_uLong ) SV_IMPL_VARARR_SORT( SvLongsSort, long ) diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index f3a2f18c7630..f3403327b4b5 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -2304,15 +2304,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, sal_Bool bLoadi CLOffset + SetIndexTable( NF_NUMBER_SYSTEM, ZF_STANDARD+5 ), SV_NUMBERFORMATTER_VERSION_NEWSTANDARD ); - // #,##0_);(#,##0) -42 => (42) - nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_NUMBER_NEG_BRACKET ); - ImpInsertFormat( aFormatSeq[nIdx], - CLOffset + SetIndexTable( NF_NUMBER_NEG_BRACKET, ZF_STANDARD+6 )); - - // #,##0.00_);(#,##0.00) -42.00 => (42.00) - nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_NUMBER_NEG_BRACKET_DEC2 ); - ImpInsertFormat( aFormatSeq[nIdx], - CLOffset + SetIndexTable( NF_NUMBER_NEG_BRACKET_DEC2, ZF_STANDARD+7 )); // Percent number aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::PERCENT_NUMBER ); diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index fcaba305bae7..2124c33bf411 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -1109,7 +1109,7 @@ size_t SfxUndoManager::ImplLeaveListAction( const bool i_merge, UndoManagerGuard if( !ImplIsInListAction_Lock() ) { - DBG_ERROR( "svl::SfxUndoManager::ImplLeaveListAction, called without calling EnterListAction()!" ); + OSL_TRACE( "svl::SfxUndoManager::ImplLeaveListAction, called without calling EnterListAction()!" ); return 0; } @@ -1499,4 +1499,4 @@ sal_uInt16 SfxLinkUndoAction::GetId() const return pAction ? pAction->GetId() : 0; } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 253db14d8205..31e4a187574f 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -76,7 +76,7 @@ namespace void BrowseBox::ConstructImpl( BrowserMode nMode ) { - DBG_TRACE1( "BrowseBox: %p->ConstructImpl", this ); + OSL_TRACE( "BrowseBox: %p->ConstructImpl", this ); bMultiSelection = sal_False; pColSel = 0; pDataWin = 0; @@ -155,7 +155,7 @@ BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode ) BrowseBox::~BrowseBox() { DBG_DTOR(BrowseBox,BrowseBoxCheckInvariants); - DBG_TRACE1( "BrowseBox: %p~", this ); + OSL_TRACE( "BrowseBox: %p~", this ); if ( m_pImpl->m_pAccessible ) { @@ -386,7 +386,7 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId) { pColSel->Select( GetColumnPos( _nSelectedColumnId ) ); ToggleSelection(); - DBG_TRACE1( "BrowseBox: %p->SetToggledSelectedColumn", this ); + OSL_TRACE( "BrowseBox: %p->SetToggledSelectedColumn", this ); DoShowCursor( "SetToggledSelectedColumn" ); } } @@ -1427,7 +1427,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint ) if ( bDoPaint ) { // hide cursor and selection - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); DoHideCursor( "RowRemoved" ); } @@ -1506,7 +1506,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint ) { // reshow cursor and selection ToggleSelection(); - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); DoShowCursor( "RowRemoved" ); // adjust the vertical scrollbar @@ -1778,7 +1778,7 @@ void BrowseBox::SetNoSelection() // nothing to do return; - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); // unselect all @@ -1794,7 +1794,7 @@ void BrowseBox::SetNoSelection() bSelect = sal_True; // restore screen - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); if ( isAccessibleAlive() ) { @@ -1814,7 +1814,7 @@ void BrowseBox::SetSelection( const MultiSelection &rSel ) DBG_ASSERT( bMultiSelection, "SetSelection only allowed with Multi-Selection-Mode" ); // prepare inverted areas - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); // assign Selection @@ -1831,7 +1831,7 @@ void BrowseBox::SetSelection( const MultiSelection &rSel ) // restore screen ToggleSelection(); - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); if ( isAccessibleAlive() ) { @@ -1852,7 +1852,7 @@ void BrowseBox::SelectAll() if ( !bMultiSelection ) return; - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); // select all rows @@ -1885,7 +1885,7 @@ void BrowseBox::SelectAll() bSelect = sal_True; // restore screen - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); if ( isAccessibleAlive() ) { @@ -1924,7 +1924,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand ) return; } - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); // remove old selection? if ( !bExpand || !bMultiSelection ) @@ -1966,7 +1966,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand ) bSelect = sal_True; // restore screen - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); if ( isAccessibleAlive() ) { @@ -2015,7 +2015,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B return; } - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); if ( bMultiSelection ) uRow.pSel->SelectAll(sal_False); @@ -2057,7 +2057,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B } // restore screen - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); } //------------------------------------------------------------------- @@ -2688,11 +2688,11 @@ void BrowseBox::CursorMoved() void BrowseBox::LoseFocus() { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); - DBG_TRACE1( "BrowseBox: %p->LoseFocus", this ); + OSL_TRACE( "BrowseBox: %p->LoseFocus", this ); if ( bHasFocus ) { - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); DoHideCursor( "LoseFocus" ); if ( !bKeepHighlight ) @@ -2711,7 +2711,7 @@ void BrowseBox::LoseFocus() void BrowseBox::GetFocus() { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); - DBG_TRACE1( "BrowseBox: %p->GetFocus", this ); + OSL_TRACE( "BrowseBox: %p->GetFocus", this ); if ( !bHasFocus ) { diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 74b930804e5d..9c9796baa90b 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1535,7 +1535,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) void BrowseBox::MouseMove( const MouseEvent& rEvt ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); - DBG_TRACE( "BrowseBox::MouseMove( MouseEvent )" ); + OSL_TRACE( "BrowseBox::MouseMove( MouseEvent )" ); Pointer aNewPointer; diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 246066bf8a1f..929aa3303a77 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -268,7 +268,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e #endif break; default: - OSL_ENSURE(0,"BrowseBox::GetAccessibleName: invalid enum!"); + OSL_FAIL("BrowseBox::GetAccessibleName: invalid enum!"); } return aRetText; } @@ -375,7 +375,7 @@ void BrowseBox::FillAccessibleStateSet( case ::svt::BBTYPE_ROWHEADERCELL: case ::svt::BBTYPE_COLUMNHEADERCELL: case ::svt::BBTYPE_CHECKBOXCELL: - OSL_ENSURE(0,"Illegal call here!"); + OSL_FAIL("Illegal call here!"); break; } } diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index fa7c3d6b87e4..59bb82aa2c56 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -123,7 +123,7 @@ public: aMessage.append( ::rtl::OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) ); aMessage.append( "\nname: " ); aMessage.append( ::rtl::OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) ); - OSL_ENSURE( 0, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif return ExtendedColorConfigValue(); } diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index b9b9a0cc93a1..7f57664af5f1 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -86,7 +86,7 @@ ItemHolder2::ItemHolder2() sMsg += ::rtl::OString(rEx.Message.getStr(), rEx.Message.getLength(), RTL_TEXTENCODING_ASCII_US); - DBG_ERROR(sMsg.getStr()); + OSL_FAIL(sMsg.getStr()); } } #else diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index f2bb42330099..b16d383ad277 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -353,7 +353,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bPluginsEnabled) ) { - DBG_ERROR("Wrong type of \"Misc\\PluginsEnabled\"!" ); + OSL_FAIL("Wrong type of \"Misc\\PluginsEnabled\"!" ); } m_bIsPluginsEnabledRO = seqRO[nProperty]; break; @@ -363,7 +363,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_nSymbolsSize) ) { - DBG_ERROR("Wrong type of \"Misc\\SymbolSet\"!" ); + OSL_FAIL("Wrong type of \"Misc\\SymbolSet\"!" ); } m_bIsSymbolsSizeRO = seqRO[nProperty]; break; @@ -373,7 +373,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_nToolboxStyle) ) { - DBG_ERROR("Wrong type of \"Misc\\ToolboxStyle\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ToolboxStyle\"!" ); } m_bIsToolboxStyleRO = seqRO[nProperty]; break; @@ -383,7 +383,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bUseSystemFileDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\UseSystemFileDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\UseSystemFileDialog\"!" ); } m_bIsUseSystemFileDialogRO = seqRO[nProperty]; break; @@ -393,7 +393,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bUseSystemPrintDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\UseSystemPrintDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\UseSystemPrintDialog\"!" ); } m_bIsUseSystemPrintDialogRO = seqRO[nProperty]; break; @@ -403,7 +403,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bTryODMADialog) ) { - DBG_ERROR("Wrong type of \"Misc\\TryODMADialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" ); } m_bIsTryODMADialogRO = seqRO[nProperty]; break; @@ -413,7 +413,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" ); } m_bIsShowLinkWarningDialogRO = seqRO[nProperty]; break; @@ -426,7 +426,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() SetSymbolsStyleName( aSymbolsStyle ); else { - DBG_ERROR("Wrong type of \"Misc\\SymbolStyle\"!" ); + OSL_FAIL("Wrong type of \"Misc\\SymbolStyle\"!" ); } m_bIsSymbolsStyleRO = seqRO[nProperty]; break; @@ -435,19 +435,19 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : { if( !(seqValues[nProperty] >>= m_bDisableUICustomization) ) - DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" ); + OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" ); break; } case PROPERTYHANDLE_ALWAYSALLOWSAVE : { if( !(seqValues[nProperty] >>= m_bAlwaysAllowSave) ) - DBG_ERROR("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); + OSL_FAIL("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); break; } case PROPERTYHANDLE_EXPERIMENTALMODE : { if( !(seqValues[nProperty] >>= m_bExperimentalMode) ) - DBG_ERROR("Wrong type of \"Misc\\ExperimentalMode\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ExperimentalMode\"!" ); break; } } @@ -503,49 +503,49 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) case PROPERTYHANDLE_PLUGINSENABLED : { if( !(seqValues[nProperty] >>= m_bPluginsEnabled) ) { - DBG_ERROR("Wrong type of \"Misc\\PluginsEnabled\"!" ); + OSL_FAIL("Wrong type of \"Misc\\PluginsEnabled\"!" ); } } break; case PROPERTYHANDLE_SYMBOLSET : { if( !(seqValues[nProperty] >>= m_nSymbolsSize) ) { - DBG_ERROR("Wrong type of \"Misc\\SymbolSet\"!" ); + OSL_FAIL("Wrong type of \"Misc\\SymbolSet\"!" ); } } break; case PROPERTYHANDLE_TOOLBOXSTYLE : { if( !(seqValues[nProperty] >>= m_nToolboxStyle) ) { - DBG_ERROR("Wrong type of \"Misc\\ToolboxStyle\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ToolboxStyle\"!" ); } } break; case PROPERTYHANDLE_USESYSTEMFILEDIALOG : { if( !(seqValues[nProperty] >>= m_bUseSystemFileDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\UseSystemFileDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\UseSystemFileDialog\"!" ); } } break; case PROPERTYHANDLE_USESYSTEMPRINTDIALOG : { if( !(seqValues[nProperty] >>= m_bUseSystemPrintDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\UseSystemPrintDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\UseSystemPrintDialog\"!" ); } } break; case PROPERTYHANDLE_TRYODMADIALOG : { if( !(seqValues[nProperty] >>= m_bTryODMADialog) ) { - DBG_ERROR("Wrong type of \"Misc\\TryODMADialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" ); } } break; case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG : { if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" ); } } break; @@ -555,19 +555,19 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) SetSymbolsStyleName( aSymbolsStyle ); else { - DBG_ERROR("Wrong type of \"Misc\\SymbolStyle\"!" ); + OSL_FAIL("Wrong type of \"Misc\\SymbolStyle\"!" ); } } break; case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : { if( !(seqValues[nProperty] >>= m_bDisableUICustomization) ) - DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" ); + OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" ); } break; case PROPERTYHANDLE_ALWAYSALLOWSAVE: { if( !(seqValues[nProperty] >>= m_bAlwaysAllowSave) ) - DBG_ERROR("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); + OSL_FAIL("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); } break; } diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 90d0cb9e096a..4b1c00e4c873 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -1115,7 +1115,7 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin break; default: - OSL_ENSURE(0,"BrowseBox::GetAccessibleName: invalid enum!"); + OSL_FAIL("BrowseBox::GetAccessibleName: invalid enum!"); } return aRetText; } diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 67705c48a84a..431b9c0122ab 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1112,6 +1112,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[] = { @@ -1138,6 +1146,14 @@ namespace sSampleText = rtl::OUString(aTagalog, SAL_N_ELEMENTS(aTagalog)); break; } + case vcl::UnicodeCoverage::NEW_TAI_LUE: + { + const sal_Unicode aTalu[] = { + 0x1991, 0x19BA, 0x199F, 0x19B9, 0x19C9 + }; + sSampleText = rtl::OUString(aTalu, SAL_N_ELEMENTS(aTalu)); + break; + } case TRADITIONAL_CHINESE: { const sal_Unicode aTraditionalChinese[] = { @@ -1538,12 +1554,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); @@ -1569,6 +1587,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); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 01587623fc77..51e4fed41eb1 100755 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -3230,9 +3230,7 @@ const RulerBorder* Ruler::GetBorders() const { return mpData->pBorders; } sal_uInt16 Ruler::GetIndentCount() const { return mpData->nIndents; } const RulerIndent* Ruler::GetIndents() const { return mpData->pIndents; } -/* --------------------------------------------------- - * - * ---------------------------------------------------*/ + void Ruler::DrawTicks() { mbFormat = sal_True; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index e8044231b49e..5f3f46aa669d 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -198,7 +198,7 @@ public: } else { - DBG_ERROR ( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") + OSL_FAIL( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") += ::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) += ::rtl::OString(")!") ).getStr() diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index b921c090946d..db6e4434c980 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -349,7 +349,7 @@ namespace svt { if ( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex ) { - OSL_ENSURE( false, "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ); + OSL_FAIL( "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ); return; } } diff --git a/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter.vcl/wmf/emfwr.cxx index 4c7f6b41911f..d556e889d2ad 100644 --- a/svtools/source/filter.vcl/wmf/emfwr.cxx +++ b/svtools/source/filter.vcl/wmf/emfwr.cxx @@ -1408,7 +1408,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) break; default: - DBG_ERROR( ( ByteString( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ) += ByteString::CreateFromInt32( nType ) ).GetBuffer() ); + OSL_FAIL( ( ByteString( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ) += ByteString::CreateFromInt32( nType ) ).GetBuffer() ); break; } } diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx index 8a908bacb2dd..720cf15a41f3 100644 --- a/svtools/source/productregistration/productregistration.cxx +++ b/svtools/source/productregistration/productregistration.cxx @@ -216,7 +216,7 @@ namespace svt } catch( const Exception& ) { - OSL_ENSURE( false, "lcl_isEvalVersion: caught an exception!" ); + OSL_FAIL( "lcl_isEvalVersion: caught an exception!" ); } return bIsEvaluationVersion; @@ -266,7 +266,7 @@ namespace svt } catch( const Exception& ) { - OSL_ENSURE( false, "lcl_getOnlineRegistrationDispatch: caught an exception!" ); + OSL_FAIL( "lcl_getOnlineRegistrationDispatch: caught an exception!" ); return false; } } diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index eda54726c717..6ec1ec5e7121 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -312,7 +312,7 @@ namespace svt { namespace table aRetText = GetColumnName(_nCol); break; default: - OSL_ENSURE(0,"GridControl::GetAccessibleName: invalid enum!"); + OSL_FAIL("GridControl::GetAccessibleName: invalid enum!"); } return aRetText; } diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx index f6bd2278f478..f6c36d673691 100644 --- a/svtools/source/toolpanel/drawerlayouter.cxx +++ b/svtools/source/toolpanel/drawerlayouter.cxx @@ -88,7 +88,7 @@ namespace svt const size_t nUpperBound = !!aActivePanel ? *aActivePanel : nPanelCount - 1; for ( size_t i=0; i<=nUpperBound; ++i ) { - sal_uInt32 nDrawerHeight = m_aDrawers[i]->GetPreferredHeightPixel(); + long nDrawerHeight = m_aDrawers[i]->GetPreferredHeightPixel(); m_aDrawers[i]->SetPosSizePixel( aUpperDrawerPos, Size( nWidth, nDrawerHeight ) ); aUpperDrawerPos.Move( 0, nDrawerHeight ); @@ -98,7 +98,7 @@ namespace svt Point aLowerDrawerPos( i_rDeckPlayground.BottomLeft() ); for ( size_t j = nPanelCount - 1; j > nUpperBound; --j ) { - sal_uInt32 nDrawerHeight = m_aDrawers[j]->GetPreferredHeightPixel(); + long nDrawerHeight = m_aDrawers[j]->GetPreferredHeightPixel(); m_aDrawers[j]->SetPosSizePixel( Point( aLowerDrawerPos.X(), aLowerDrawerPos.Y() - nDrawerHeight + 1 ), Size( nWidth, nDrawerHeight ) diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 902b9a5b442e..37bbcf4678c2 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -444,14 +444,14 @@ namespace svt { if ( i_rImpl.m_rPanelDeck.GetPanelCount() != i_rImpl.m_aItems.size() ) { - OSL_ENSURE( false, "lcl_checkConsistency: inconsistent array sizes!" ); + OSL_FAIL( "lcl_checkConsistency: inconsistent array sizes!" ); return; } for ( size_t i = 0; i < i_rImpl.m_rPanelDeck.GetPanelCount(); ++i ) { if ( i_rImpl.m_rPanelDeck.GetPanel( i ).get() != i_rImpl.m_aItems[i].pPanel.get() ) { - OSL_ENSURE( false, "lcl_checkConsistency: array elements are inconsistent!" ); + OSL_FAIL( "lcl_checkConsistency: array elements are inconsistent!" ); return; } } diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx index b58d703e669e..b9615dffc774 100644 --- a/svtools/source/toolpanel/tablayouter.cxx +++ b/svtools/source/toolpanel/tablayouter.cxx @@ -78,7 +78,7 @@ namespace svt { if ( !i_rData.pTabBar.get() ) { - OSL_ENSURE( false, "lcl_checkDisposed: already disposed!" ); + OSL_FAIL( "lcl_checkDisposed: already disposed!" ); return true; } return false; diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx index 46c9273ba153..5f1286b90ed6 100755 --- a/svtools/source/uno/unogridcolumnfacade.cxx +++ b/svtools/source/uno/unogridcolumnfacade.cxx @@ -150,7 +150,7 @@ namespace svt { namespace table { if ( i_event.AttributeName.equalsAscii( "DataColumnIndex" ) ) { - SolarMutexGuard aGuard; + SolarMutexGuard aGuard; if ( m_pColumnImplementation != NULL ) m_pColumnImplementation->dataColumnIndexChanged(); return; @@ -173,7 +173,7 @@ namespace svt { namespace table OSL_ENSURE( nChangedAttributes != COL_ATTRS_NONE, "ColumnChangeMultiplexer::columnChanged: unknown column attributed changed!" ); - SolarMutexGuard aGuard; + SolarMutexGuard aGuard; if ( m_pColumnImplementation != NULL ) m_pColumnImplementation->columnChanged( nChangedAttributes ); } diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 9f2034a3b02b..e8d7adaf58a2 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -92,7 +92,7 @@ namespace svt { namespace uno case WizardButton::CANCEL: return WZB_CANCEL; case WizardButton::HELP: return WZB_HELP; } - OSL_ENSURE( false, "lcl_convertWizardButtonToWZB: invalid WizardButton constant!" ); + OSL_FAIL( "lcl_convertWizardButtonToWZB: invalid WizardButton constant!" ); return WZB_NONE; } } diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 66b4dfce164d..7220091d7648 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -134,7 +134,7 @@ namespace svt { namespace uno default: break; } - OSL_ENSURE( false, "WizardShell::convertCommitReasonToTravelType: unsupported CommitPageReason!" ); + OSL_FAIL( "WizardShell::convertCommitReasonToTravelType: unsupported CommitPageReason!" ); return WizardTravelType::FINISH; } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 2169203e5916..4db3a3fde38e 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1424,7 +1424,7 @@ namespace } break; default: - OSL_ENSURE( false, "lcl_updateWritingMode: unsupported WritingMode!" ); + OSL_FAIL( "lcl_updateWritingMode: unsupported WritingMode!" ); } // switch ( nWritingMode ) _rWindow.EnableRTL( bEnableRTL ); @@ -1489,7 +1489,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: case MouseWheelBehavior::SCROLL_FOCUS_ONLY: nVclBehavior = MOUSE_WHEEL_FOCUS_ONLY; break; case MouseWheelBehavior::SCROLL_ALWAYS: nVclBehavior = MOUSE_WHEEL_ALWAYS; break; default: - OSL_ENSURE( false, "VCLXWindow::setProperty( 'MouseWheelBehavior' ): illegal property value!" ); + OSL_FAIL( "VCLXWindow::setProperty( 'MouseWheelBehavior' ): illegal property value!" ); } aMouseSettings.SetWheelBehavior( nVclBehavior ); @@ -2000,7 +2000,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: case MOUSE_WHEEL_FOCUS_ONLY: nBehavior = MouseWheelBehavior::SCROLL_FOCUS_ONLY; break; case MOUSE_WHEEL_ALWAYS: nBehavior = MouseWheelBehavior::SCROLL_ALWAYS; break; default: - OSL_ENSURE( false, "VCLXWindow::getProperty( 'MouseWheelBehavior' ): illegal VCL value!" ); + OSL_FAIL( "VCLXWindow::getProperty( 'MouseWheelBehavior' ): illegal VCL value!" ); } aProp <<= nBehavior; } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index cb1dbff80386..1c6d5418dd38 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1577,7 +1577,7 @@ void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUStri { if ( (sal_uInt16)nP == 0xFFFF ) { - OSL_ENSURE( false, "VCLXListBox::addItems: too many entries!" ); + OSL_FAIL( "VCLXListBox::addItems: too many entries!" ); // skip remaining entries, list cannot hold them, anyway break; } @@ -4319,7 +4319,7 @@ void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUStr pBox->InsertEntry( aItems.getConstArray()[n], nP ); if ( nP == 0xFFFF ) { - OSL_ENSURE( false, "VCLXComboBox::addItems: too many entries!" ); + OSL_FAIL( "VCLXComboBox::addItems: too many entries!" ); // skip remaining entries, list cannot hold them, anyway break; } diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index b74537a0c082..07b208588835 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -128,7 +128,7 @@ struct DisposeControlModel : public ::std::unary_function< Reference< XControlMo } catch( const Exception& ) { - DBG_ERROR( "DisposeControlModel::(): caught an exception while disposing a component!" ); + OSL_TRACE( "DisposeControlModel::(): caught an exception while disposing a component!" ); } } }; @@ -635,7 +635,7 @@ sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl( ) throw (RuntimeE // ---------------------------------------------------------------------------- void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool ) throw (RuntimeException) { - DBG_ERROR( "UnoControlDialogModel::setGroupControl: explicit grouping not supported" ); + OSL_TRACE( "UnoControlDialogModel::setGroupControl: explicit grouping not supported" ); } // ---------------------------------------------------------------------------- @@ -730,7 +730,7 @@ void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XC // We only have a sequence of control models, and we _know_ (yes, that's a HACK relying on // implementation details) that VCL does grouping according to the order of controls automatically // At least VCL does this for all we're interested in: Radio buttons. - DBG_ERROR( "UnoControlDialogModel::setGroup: grouping not supported" ); + OSL_TRACE( "UnoControlDialogModel::setGroup: grouping not supported" ); } ////----- XInitialization ------------------------------------------------------------------- @@ -810,7 +810,7 @@ namespace } catch( const Exception& ) { - DBG_ERROR( "lcl_getDialogStep: caught an exception while determining the dialog page!" ); + OSL_TRACE( "lcl_getDialogStep: caught an exception while determining the dialog page!" ); } return nStep; } @@ -835,7 +835,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< if ( ( _nGroup < 0 ) || ( _nGroup >= (sal_Int32)maGroups.size() ) ) { - DBG_ERROR( "UnoControlDialogModel::getGroup: invalid argument and I am not allowed to throw an exception!" ); + OSL_TRACE( "UnoControlDialogModel::getGroup: invalid argument and I am not allowed to throw an exception!" ); _rGroup.realloc( 0 ); _rName = ::rtl::OUString(); } diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 40d0eb25836a..3065515415f3 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -133,7 +133,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence( } else { - DBG_TRACE( "ImplCreateComponentSequence: Control not found" ); + OSL_TRACE( "ImplCreateComponentSequence: Control not found" ); bOK = sal_False; } } diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 42da982f97a4..a101d9fd8793 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -757,7 +757,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: ::rtl::OUString sPropertyName( GetPropertyName( pProp->GetId() ) ); sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), osl_getThreadTextEncoding() ); sMessage += "'.)"; - DBG_ERROR( sMessage ); + OSL_FAIL( sMessage.getStr() ); } #endif } @@ -958,7 +958,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: ::rtl::OUString sPropertyName( GetPropertyName( nPropId ) ); sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), osl_getThreadTextEncoding() ); sMessage += "'.)"; - DBG_ERROR( sMessage ); + OSL_FAIL( sMessage.getStr() ); } } else diff --git a/toolkit/source/layout/core/dialogbuttonhbox.cxx b/toolkit/source/layout/core/dialogbuttonhbox.cxx index 20e2f82342ba..b577e98be65f 100644 --- a/toolkit/source/layout/core/dialogbuttonhbox.cxx +++ b/toolkit/source/layout/core/dialogbuttonhbox.cxx @@ -90,7 +90,7 @@ DialogButtonHBox::setOrdering( rtl::OUString const& ordering ) mnOrdering = WINDOWS; else { - DBG_ERROR1( "DialogButtonHBox: no such ordering: %s", OUSTRING_CSTR( ordering ) ); + OSL_TRACE( "DialogButtonHBox: no such ordering: %s", OUSTRING_CSTR( ordering ) ); } } diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx index c61502bb6de3..6b50312eda86 100644 --- a/toolkit/source/layout/core/helper.cxx +++ b/toolkit/source/layout/core/helper.cxx @@ -167,7 +167,7 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::toolkitCreateWidget (uno: } catch( uno::Exception & ) { - DBG_ERROR1( "Warning: %s is not a recognized type\n", OUSTRING_CSTR( name ) ); + OSL_TRACE( "Warning: %s is not a recognized type\n", OUSTRING_CSTR( name ) ); return uno::Reference< awt::XLayoutConstrains >(); } diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx index 52b2defe9272..5114ca586a74 100644 --- a/toolkit/source/layout/core/import.cxx +++ b/toolkit/source/layout/core/import.cxx @@ -150,7 +150,7 @@ WidgetElement::startChildElement ( sal_Int32 nUid, OUString const &name, if ( !mpWidget->addChild( pChild->mpWidget ) ) { - DBG_ERROR2( "ERROR: cannot add %s to container %s, container full", OUSTRING_CSTR( name ), OUSTRING_CSTR( getLocalName() ) ); + OSL_TRACE( "ERROR: cannot add %s to container %s, container full", OUSTRING_CSTR( name ), OUSTRING_CSTR( getLocalName() ) ); throw xml::sax::SAXException(); } diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx index 9c7ad34d2e64..8ebca3cbe9d7 100644 --- a/toolkit/source/layout/core/proplist.cxx +++ b/toolkit/source/layout/core/proplist.cxx @@ -200,7 +200,7 @@ uno::Any anyFromString( OUString const& value, uno::Type const& type ) } default: - DBG_ERROR1( "ERROR: unknown property type of value: `%s'\n", OUSTRING_CSTR( value ) ); + OSL_TRACE( "ERROR: unknown property type of value: `%s'\n", OUSTRING_CSTR( value ) ); break; } throw uno::RuntimeException(); @@ -250,7 +250,7 @@ setProperties( uno::Reference< uno::XInterface > const& xPeer, for ( PropList::const_iterator it = rProps.begin(); it != rProps.end(); ++it ) { - DBG_ERROR2( "%s=%s\n", OUSTRING_CSTR( it->first ), OUSTRING_CSTR( it->second ) ); + OSL_TRACE( "%s=%s\n", OUSTRING_CSTR( it->first ), OUSTRING_CSTR( it->second ) ); } return; } @@ -277,13 +277,13 @@ setProperty( uno::Reference< uno::XInterface > const& xPeer, } catch( beans::UnknownPropertyException & ) { - DBG_ERROR1( "Warning: unknown attribute: `%s'\n", OUSTRING_CSTR( unoAttr ) ); + OSL_TRACE( "Warning: unknown attribute: `%s'\n", OUSTRING_CSTR( unoAttr ) ); return; } if ( prop.Name.getLength() <= 0 ) { - DBG_ERROR1( "Warning: missing prop: `%s'\n", OUSTRING_CSTR( unoAttr ) ); + OSL_TRACE( "Warning: missing prop: `%s'\n", OUSTRING_CSTR( unoAttr ) ); return; } @@ -295,7 +295,7 @@ setProperty( uno::Reference< uno::XInterface > const& xPeer, } catch( uno::RuntimeException & ) { - DBG_ERROR5( "Warning: %s( %s )( %s ) attribute is of type %s( rejected: %s )\n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ), OUSTRING_CSTR( prop.Name ), OUSTRING_CSTR( prop.Type.getTypeName() ), OUSTRING_CSTR( value ) ); + OSL_TRACE( "Warning: %s( %s )( %s ) attribute is of type %s( rejected: %s )\n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ), OUSTRING_CSTR( prop.Name ), OUSTRING_CSTR( prop.Type.getTypeName() ), OUSTRING_CSTR( value ) ); return; } @@ -306,7 +306,7 @@ setProperty( uno::Reference< uno::XInterface > const& xPeer, } catch( ... ) { - DBG_ERROR2( "Warning: cannot set attribute %s to %s \n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ) ); + OSL_TRACE( "Warning: cannot set attribute %s to %s \n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ) ); } } diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx index f0b6ff787b54..5e303ada03ba 100644 --- a/toolkit/source/layout/vcl/wbutton.cxx +++ b/toolkit/source/layout/vcl/wbutton.cxx @@ -64,7 +64,7 @@ class ImageImpl { if ( !mxGraphic.is() ) { - DBG_ERROR1( "ERROR: failed to load image: `%s'\n", pName ); + OSL_TRACE( "ERROR: failed to load image: `%s'\n", pName ); } } }; diff --git a/toolkit/source/layout/vcl/wcontainer.cxx b/toolkit/source/layout/vcl/wcontainer.cxx index 950a006d1fed..699a1af14761 100644 --- a/toolkit/source/layout/vcl/wcontainer.cxx +++ b/toolkit/source/layout/vcl/wcontainer.cxx @@ -44,7 +44,7 @@ Container::Container( Context const* context, char const* pId ) { if ( !mxContainer.is() ) { - DBG_ERROR1( "Error: failed to associate container with '%s'", pId ); + OSL_TRACE( "Error: failed to associate container with '%s'", pId ); } } diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx index d7a6ef81fa30..d4d16357d037 100644 --- a/toolkit/source/layout/vcl/wrapper.cxx +++ b/toolkit/source/layout/vcl/wrapper.cxx @@ -151,7 +151,7 @@ PeerHandle Context::GetPeerHandle( const char *id, sal_uInt32 nId ) const xHandle = pImpl->getByName( OUString( id, strlen( id ), RTL_TEXTENCODING_UTF8 ) ); if ( !xHandle.is() ) { - DBG_ERROR1( "Failed to fetch widget '%s'", id ); + OSL_TRACE( "Failed to fetch widget '%s'", id ); } if ( nId != 0 ) @@ -1331,14 +1331,12 @@ class FixedImageImpl: public ControlImpl public: uno::Reference< graphic::XGraphic > mxGraphic; FixedImageImpl( Context *context, const PeerHandle &peer, Window *window) -// const char *pName ) : ControlImpl( context, peer, window ) - //, mxGraphic( layoutimpl::loadGraphic( pName ) ) , mxGraphic( peer, uno::UNO_QUERY ) { if ( !mxGraphic.is() ) { - DBG_ERROR( "ERROR: failed to load image: `%s'" /*, pName*/ ); + OSL_FAIL( "ERROR: failed to load image: `%s'" ); } } }; diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx index 071d5c2d1f45..f90317a5ae37 100644 --- a/toolkit/workben/layout/test.cxx +++ b/toolkit/workben/layout/test.cxx @@ -344,14 +344,14 @@ void LayoutTest::Main() aStr += OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ); } fprintf (stderr, "Parsing error: '%s'\n", aStr.getStr()); - OSL_ENSURE( 0, aStr.getStr() ); + OSL_FAIL( aStr.getStr() ); } catch ( uno::Exception & rExc ) { OString aStr( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); fprintf (stderr, "UNO error: '%s'\n", aStr.getStr()); - OSL_ENSURE( 0, aStr.getStr() ); + OSL_FAIL( aStr.getStr() ); } Reference< lang::XComponent > xComp( mxContext, UNO_QUERY ); diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx index a4cec07f30c2..6626a984abec 100644 --- a/tools/inc/tools/debug.hxx +++ b/tools/inc/tools/debug.hxx @@ -503,64 +503,6 @@ do \ #define DBG_BF_ASSERT( sCon, aError ) ((void)0) #endif -#define DBG_TRACE( aTrace ) \ -do \ -{ \ - if ( DbgIsTraceOut() ) \ - DbgTrace( aTrace ); \ -} while(0) -#define DBG_TRACE1( aTrace, x1 ) \ -do \ -{ \ - if ( DbgIsTraceOut() ) \ - { \ - DbgOutTypef( DBG_OUT_TRACE, aTrace, \ - x1 ); \ - } \ -} while(0) -#define DBG_TRACE2( aTrace, x1, x2 ) \ -do \ -{ \ - if ( DbgIsTraceOut() ) \ - { \ - DbgOutTypef( DBG_OUT_TRACE, aTrace, \ - x1, x2 ); \ - } \ -} while(0) -#define DBG_TRACE3( aTrace, x1, x2, x3 ) \ -do \ -{ \ - if ( DbgIsTraceOut() ) \ - { \ - DbgOutTypef( DBG_OUT_TRACE, aTrace, \ - x1, x2, x3 ); \ - } \ -} while(0) -#define DBG_TRACE4( aTrace, x1, x2, x3, x4 ) \ -do \ -{ \ - if ( DbgIsTraceOut() ) \ - { \ - DbgOutTypef( DBG_OUT_TRACE, aTrace, \ - x1, x2, x3, x4 ); \ - } \ -} while(0) -#define DBG_TRACE5( aTrace, x1, x2, x3, x4, x5 ) \ -do \ -{ \ - if ( DbgIsTraceOut() ) \ - { \ - DbgOutTypef( DBG_OUT_TRACE, aTrace, \ - x1, x2, x3, x4, x5 ); \ - } \ -} while(0) -#define DBG_TRACEFILE( aTrace ) \ -do \ -{ \ - if ( DbgIsTraceOut() ) \ - DbgTrace( aTrace, __FILE__, __LINE__ ); \ -} while(0) - #define DBG_WARNING( aWarning ) \ do \ { \ @@ -619,57 +561,6 @@ do \ DbgWarning( aWarning, __FILE__, __LINE__ ); \ } while(0) -#define DBG_ERROR( aError ) \ -do \ -{ \ - if ( DbgIsErrorOut() ) \ - DbgError( aError ); \ -} while(0) -#define DBG_ERROR1( aError, x1 ) \ -do \ -{ \ - if ( DbgIsErrorOut() ) \ - { \ - DbgOutTypef( DBG_OUT_ERROR, aError, \ - x1 ); \ - } \ -} while(0) -#define DBG_ERROR2( aError, x1, x2 ) \ -do \ -{ \ - if ( DbgIsErrorOut() ) \ - { \ - DbgOutTypef( DBG_OUT_ERROR, aError, \ - x1, x2 ); \ - } \ -} while(0) -#define DBG_ERROR3( aError, x1, x2, x3 ) \ -do \ -{ \ - if ( DbgIsErrorOut() ) \ - { \ - DbgOutTypef( DBG_OUT_ERROR, aError, \ - x1, x2, x3 ); \ - } \ -} while(0) -#define DBG_ERROR4( aError, x1, x2, x3, x4 ) \ -do \ -{ \ - if ( DbgIsErrorOut() ) \ - { \ - DbgOutTypef( DBG_OUT_ERROR, aError, \ - x1, x2, x3, x4 ); \ - } \ -} while(0) -#define DBG_ERROR5( aError, x1, x2, x3, x4, x5 ) \ -do \ -{ \ - if ( DbgIsErrorOut() ) \ - { \ - DbgOutTypef( DBG_OUT_ERROR, aError, \ - x1, x2, x3, x4, x5 ); \ - } \ -} while(0) #define DBG_ERRORFILE( aError ) \ do \ { \ @@ -743,13 +634,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis ); #define DBG_ASSERTWARNING( sCon, aWarning ) ((void)0) #define DBG_ASSERT( sCon, aError ) ((void)0) #define DBG_BF_ASSERT( sCon, aError ) ((void)0) -#define DBG_TRACE( aTrace ) ((void)0) -#define DBG_TRACE1( aTrace, x1 ) ((void)0) -#define DBG_TRACE2( aTrace, x1, x2 ) ((void)0) -#define DBG_TRACE3( aTrace, x1, x2, x3 ) ((void)0) -#define DBG_TRACE4( aTrace, x1, x2, x3, x4 ) ((void)0) -#define DBG_TRACE5( aTrace, x1, x2, x3, x4, x5 ) ((void)0) -#define DBG_TRACEFILE( aTrace ) ((void)0) #define DBG_WARNING( aWarning ) ((void)0) #define DBG_WARNING1( aWarning, x1 ) ((void)0) #define DBG_WARNING2( aWarning, x1, x2 ) ((void)0) @@ -757,12 +641,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis ); #define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) ((void)0) #define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 ) ((void)0) #define DBG_WARNINGFILE( aWarning ) ((void)0) -#define DBG_ERROR( aError ) ((void)0) -#define DBG_ERROR1( aError, x1 ) ((void)0) -#define DBG_ERROR2( aError, x1, x2 ) ((void)0) -#define DBG_ERROR3( aError, x1, x2, x3 ) ((void)0) -#define DBG_ERROR4( aError, x1, x2, x3, x4 ) ((void)0) -#define DBG_ERROR5( aError, x1, x2, x3, x4, x5 ) ((void)0) #define DBG_ERRORFILE( aError ) ((void)0) #define DBG_TESTSOLARMUTEX() ((void)0) diff --git a/tools/qa/test_reversemap.cxx b/tools/qa/test_reversemap.cxx index b38771df11f3..fb62eda90d82 100644 --- a/tools/qa/test_reversemap.cxx +++ b/tools/qa/test_reversemap.cxx @@ -83,7 +83,7 @@ namespace //Taking the single byte legacy encodings, fill in all possible values std::vector<sal_Char> aAllChars(255); for (int i = 1; i <= 255; ++i) - aAllChars[i-1] = i; + aAllChars[i-1] = static_cast<sal_Char>(i); //Some slots are unused, so don't map to private, just set them to 'X' sal_uInt32 convertFlags = OUSTRING_TO_OSTRING_CVTFLAGS ^ RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE; diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 5e10224bc83d..c65745e65be0 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 diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 3bbfae5c6b5d..edfd1c2a055f 100755 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -119,7 +119,7 @@ int Sys2SolarError_Impl( int nSysErr ) #endif } - DBG_TRACE1( "FSys: unknown system error %d occurred", nSysErr ); + OSL_TRACE( "FSys: unknown system error %d occurred", nSysErr ); return FSYS_ERR_UNKNOWN; } diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx index d0d6a4f8513c..2cad032f0d65 100644 --- a/tools/source/fsys/os2.cxx +++ b/tools/source/fsys/os2.cxx @@ -107,7 +107,7 @@ int ApiRet2ToSolarError_Impl( int nApiRet ) case ERROR_FILENAME_EXCED_RANGE: return ERRCODE_IO_NAMETOOLONG; } - DBG_TRACE1( "FSys: unknown apiret error %d occurred", nApiRet ); + OSL_TRACE( "FSys: unknown apiret error %d occurred", nApiRet ); return FSYS_ERR_UNKNOWN; } diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 1a649747e41c..57531aa4b05e 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1173,7 +1173,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, break; default: - DBG_ERROR( + OSL_FAIL( "INetURLObject::setAbsURIRef():" " Bad guessFSysStyleByCounting"); break; @@ -1598,7 +1598,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, break; default: - DBG_ERROR("INetURLObject::convertRelToAbs():" + OSL_FAIL("INetURLObject::convertRelToAbs():" " Bad guessFSysStyleByCounting"); break; } @@ -3482,8 +3482,8 @@ bool INetURLObject::setPath(rtl::OUString const & rThePath, bool bOctets, //============================================================================ bool INetURLObject::checkHierarchical() const { if (m_eScheme == INET_PROT_VND_SUN_STAR_EXPAND) { - OSL_ENSURE( - false, "INetURLObject::checkHierarchical vnd.sun.star.expand"); + OSL_FAIL( + "INetURLObject::checkHierarchical vnd.sun.star.expand"); return true; } else { return getSchemeInfo().m_bHierarchical; diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index babc17e107ea..cfe64bea12f8 100755 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -825,7 +825,7 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bForceAccess ) if ( aName == "a:" || aName == "b:" ) bAccess = sal_False; else - DBG_TRACE( "FSys: will access removable device!" ); + OSL_TRACE( "FSys: will access removable device!" ); if ( bAccess && ( aName == "a:" || aName == "b:" ) ) { DBG_WARNING( "floppy will clatter" ); } @@ -885,7 +885,7 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bForceAccess ) // MI: dann gehen Umlaute auf Novell-Servern nicht / wozu ueberhaupt // CharUpperBuff( (char*) aFilePath.GetStr(), aFilePath.Len() ); - DBG_TRACE1( "FileStat: %s", aFilePath.GetBuffer() ); + OSL_TRACE( "FileStat: %s", aFilePath.GetBuffer() ); h = aFilePath.Len() < 230 // die Win32-API ist hier sehr schwammig ? FindFirstFile( (char *) aFilePath.GetBuffer(), &aEntry )//TPF: 2i diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index d44b0b26ddf1..6c533459f2a7 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -635,7 +635,7 @@ static void ImplWriteConfig( ImplConfigData* pData ) { if ( pData->mnTimeStamp != ImplSysGetConfigTimeStamp( pData->maFileName ) ) { - DBG_ERROR1( "Config overwrites modified configfile:\n %s", ByteString( pData->maFileName, RTL_TEXTENCODING_UTF8 ).GetBuffer() ); + OSL_TRACE( "Config overwrites modified configfile:\n %s", ByteString( pData->maFileName, RTL_TEXTENCODING_UTF8 ).GetBuffer() ); } } #endif @@ -779,7 +779,7 @@ Config::Config() mbPersistence = sal_True; #ifdef DBG_UTIL - DBG_TRACE( "Config::Config()" ); + OSL_TRACE( "Config::Config()" ); #endif } @@ -799,7 +799,7 @@ Config::Config( const XubString& rFileName ) ByteString aTraceStr( "Config::Config( " ); aTraceStr += ByteString( maFileName, RTL_TEXTENCODING_UTF8 ); aTraceStr += " )"; - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif } @@ -808,7 +808,7 @@ Config::Config( const XubString& rFileName ) Config::~Config() { #ifdef DBG_UTIL - DBG_TRACE( "Config::~Config()" ); + OSL_TRACE( "Config::~Config()" ); #endif Flush(); @@ -1000,7 +1000,7 @@ ByteString Config::ReadKey( const ByteString& rKey, const ByteString& rDefault ) aTraceStr += GetGroup(); aTraceStr += " in "; aTraceStr += ByteString( maFileName, RTL_TEXTENCODING_UTF8 ); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif // Config-Daten evt. updaten @@ -1037,7 +1037,7 @@ void Config::WriteKey( const ByteString& rKey, const ByteString& rStr ) aTraceStr += GetGroup(); aTraceStr += " in "; aTraceStr += ByteString( maFileName, RTL_TEXTENCODING_UTF8 ); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); DBG_ASSERTWARNING( rStr != ReadKey( rKey ), "Config::WriteKey() with the same Value" ); #endif @@ -1158,7 +1158,7 @@ sal_uInt16 Config::GetKeyCount() const aTraceStr += GetGroup(); aTraceStr += " in "; aTraceStr += ByteString( maFileName, RTL_TEXTENCODING_UTF8 ); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif // Config-Daten evt. updaten @@ -1194,7 +1194,7 @@ ByteString Config::GetKeyName( sal_uInt16 nKey ) const aTraceStr += GetGroup(); aTraceStr += " in "; aTraceStr += ByteString( maFileName, RTL_TEXTENCODING_UTF8 ); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif // Key suchen und Name zurueckgeben @@ -1229,7 +1229,7 @@ ByteString Config::ReadKey( sal_uInt16 nKey ) const aTraceStr += GetGroup(); aTraceStr += " in "; aTraceStr += ByteString( maFileName, RTL_TEXTENCODING_UTF8 ); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif // Key suchen und Value zurueckgeben diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index b4c703df1c71..472f5c4b8284 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -2038,7 +2038,7 @@ INetMIME::createPreferredCharsetList(rtl_TextEncoding eEncoding) break; default: //@@@ more cases are missing! - DBG_ERROR("INetMIME::createPreferredCharsetList():" + OSL_FAIL("INetMIME::createPreferredCharsetList():" " Unsupported encoding"); break; } diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 2d906854d035..d68b71f255ae 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -832,7 +832,7 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr, // clean up delete pNewResMgr; - DBG_ERROR( aStr.GetBuffer() ); + OSL_FAIL( aStr.GetBuffer() ); } #endif @@ -952,7 +952,7 @@ void ResMgr::Init( const OUString& rFileName ) #ifdef DBG_UTIL ByteString aStr( "Resourcefile not found:\n" ); aStr += ByteString( OUStringToOString( rFileName, RTL_TEXTENCODING_UTF8 ) ); - DBG_ERROR( aStr.GetBuffer() ); + OSL_FAIL( aStr.GetBuffer() ); #endif RscException_Impl(); } diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 9d027780e5df..9ad9b71dcba3 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -217,7 +217,7 @@ static void aDspFunc(const String &rErr, const String &rAction) aErr+= ByteString( rAction, RTL_TEXTENCODING_ASCII_US ); aErr+=" Fehler: "; aErr+= ByteString( rErr, RTL_TEXTENCODING_ASCII_US ); - DBG_ERROR(aErr.GetBuffer()); + OSL_FAIL(aErr.GetBuffer()); } @@ -347,7 +347,7 @@ sal_uInt16 ErrorHandler::HandleError_Impl( aStr += ByteString( aAction, RTL_TEXTENCODING_ASCII_US ); aStr += ByteString("\nFehler: "); aStr += ByteString( aErr, RTL_TEXTENCODING_ASCII_US ); - DBG_ERROR( aStr.GetBuffer() ); + OSL_FAIL( aStr.GetBuffer() ); } else { diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index 3def8c1b19c8..75781b427c89 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -156,7 +156,7 @@ SvPersistStream& operator >> ( SvPersistStream & rStm, aStr += ByteString::CreateFromInt32( (long)(rStm.Tell() - nObjPos) ); aStr += ", should = "; aStr += ByteString::CreateFromInt64(nObjLen); - DBG_ERROR( aStr.GetBuffer() ); + OSL_FAIL( aStr.GetBuffer() ); } #else (void)nObjLen; @@ -792,7 +792,7 @@ sal_uInt32 SvPersistStream::ReadObj aStr += ByteString::CreateFromInt32( (long)(Tell() - nObjPos) ); aStr += ", should = "; aStr += ByteString::CreateFromInt32( nObjLen ); - DBG_ERROR( aStr.GetBuffer() ); + OSL_FAIL( aStr.GetBuffer() ); } #endif rpObj->RestoreNoDelete(); diff --git a/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx index b41c2548a2cd..3957910cbfdb 100644 --- a/tools/source/stream/strmos2.cxx +++ b/tools/source/stream/strmos2.cxx @@ -194,7 +194,7 @@ sal_uIntPtr SvFileStream::GetData( void* pData, sal_uIntPtr nSize ) aTraceStr += ByteString::CreateFromInt64(nSize); aTraceStr += " Bytes from "; aTraceStr += ByteString(aFilename, osl_getThreadTextEncoding()); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif sal_uIntPtr nCount = 0L; @@ -221,7 +221,7 @@ sal_uIntPtr SvFileStream::PutData( const void* pData, sal_uIntPtr nSize ) aTraceStr += ByteString::CreateFromInt64(nSize); aTraceStr += " Bytes to "; aTraceStr += ByteString(aFilename, osl_getThreadTextEncoding()); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif sal_uIntPtr nCount = 0L; @@ -498,7 +498,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) #ifdef DBG_UTIL ByteString aTraceStr( "SvFileStream::Open(): " ); aTraceStr += aFileNameA; - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif APIRET nRet = DosOpen( aFileNameA.GetBuffer(), &pInstanceData->hFile, @@ -563,7 +563,7 @@ void SvFileStream::Close() #ifdef DBG_UTIL ByteString aTraceStr( "SvFileStream::Close(): " ); aTraceStr += ByteString(aFilename, osl_getThreadTextEncoding()); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif if( nLockCounter ) @@ -612,4 +612,4 @@ void SvFileStream::SetSize( sal_uIntPtr nSize ) } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index cbe6a658fce6..07099e941f12 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -358,7 +358,7 @@ sal_Size SvFileStream::GetData( void* pData, sal_Size nSize ) aTraceStr += ByteString::CreateFromInt64(nSize); aTraceStr += " Bytes from "; aTraceStr += ByteString(aFilename, osl_getThreadTextEncoding()); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif int nRead = 0; @@ -384,7 +384,7 @@ sal_Size SvFileStream::PutData( const void* pData, sal_Size nSize ) aTraceStr += ByteString::CreateFromInt64(nSize); aTraceStr += " Bytes to "; aTraceStr += ByteString(aFilename, osl_getThreadTextEncoding()); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif int nWrite = 0; @@ -624,7 +624,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) #ifdef DBG_UTIL ByteString aTraceStr( "SvFileStream::Open(): " ); aTraceStr += aLocalFilename; - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif if ( lstat( aLocalFilename.GetBuffer(), &buf ) == 0 ) @@ -747,7 +747,7 @@ void SvFileStream::Close() #ifdef DBG_UTIL ByteString aTraceStr( "SvFileStream::Close(): " ); aTraceStr += ByteString(aFilename, osl_getThreadTextEncoding()); - DBG_TRACE( aTraceStr.GetBuffer() ); + OSL_TRACE( "%s", aTraceStr.GetBuffer() ); #endif Flush(); diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index d05f54c728bd..62ed9e2df6c8 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -263,30 +263,6 @@ sal_uIntPtr SvFileStream::SeekPos( sal_uIntPtr nPos ) /************************************************************************* |* -|* SvFileStream::Tell() -|* -*************************************************************************/ -/* -sal_uIntPtr SvFileStream::Tell() -{ - sal_uIntPtr nPos = 0L; - - if( IsOpen() ) - { - DWORD nPos; - nPos = SetFilePointer(pInstanceData->hFile,0L,NULL,FILE_CURRENT); - if( nPos = 0xFFFFFFFF ) - { - SetError( ::GetSvError( GetLastError() ) ); - nPos = 0L; - } - } - return nPos; -} -*/ - -/************************************************************************* -|* |* SvFileStream::FlushData() |* *************************************************************************/ @@ -427,14 +403,6 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) #endif SetLastError( ERROR_SUCCESS ); // ggf. durch Redirector geaendert! - /* - #ifdef DBG_UTIL - String aTraceStr( "SvFileStream::Open(): " ); - aTraceStr += aFilename; - DBG_TRACE( aTraceStr ); - #endif - */ - DWORD nOpenAction; DWORD nShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; DWORD nAccessMode = 0L; diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx index 02ab2cd6d0b1..c7a5f380fb72 100644 --- a/tools/source/string/tstring.cxx +++ b/tools/source/string/tstring.cxx @@ -165,7 +165,7 @@ float ByteString::ToFloat() const { DBG_CHKTHIS( ByteString, DbgCheckByteString ); - OSL_ENSURE(false, "ByteString::ToFloat unusable"); + OSL_FAIL("ByteString::ToFloat unusable"); return 0; } @@ -175,7 +175,7 @@ double ByteString::ToDouble() const { DBG_CHKTHIS( ByteString, DbgCheckByteString ); - OSL_ENSURE(false, "ByteString::ToDouble unusable"); + OSL_FAIL("ByteString::ToDouble unusable"); return 0; } diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx index fb09c247aaf6..f479faa5aa07 100644 --- a/tools/source/testtoolloader/testtoolloader.cxx +++ b/tools/source/testtoolloader/testtoolloader.cxx @@ -114,12 +114,12 @@ void InitTestToolLib() (reinterpret_cast< pfunc_CreateRemoteControl >(pInitFunc))(); else { - DBG_ERROR1( "Unable to get Symbol 'CreateRemoteControl' from library %s while loading testtool support.", SVLIBRARY( "sts" ) ); + OSL_TRACE( "Unable to get Symbol 'CreateRemoteControl' from library %s while loading testtool support.", SVLIBRARY( "sts" ) ); } } else { - DBG_ERROR1( "Unable to access library %s while loading testtool support.", SVLIBRARY( "sts" ) ); + OSL_TRACE( "Unable to access library %s while loading testtool support.", SVLIBRARY( "sts" ) ); } } @@ -139,12 +139,12 @@ void InitTestToolLib() } else { - DBG_ERROR1( "Unable to get Symbol 'CreateEventLogger' from library %s while loading testtool support.", SVLIBRARY( "sts" ) ); + OSL_TRACE( "Unable to get Symbol 'CreateEventLogger' from library %s while loading testtool support.", SVLIBRARY( "sts" ) ); } } else { - DBG_ERROR1( "Unable to access library %s while loading testtool support.", SVLIBRARY( "sts" ) ); + OSL_TRACE( "Unable to access library %s while loading testtool support.", SVLIBRARY( "sts" ) ); } } } diff --git a/ucbhelper/source/provider/configureucb.cxx b/ucbhelper/source/provider/configureucb.cxx index 2b858d614c78..ae30c6b5b350 100644 --- a/ucbhelper/source/provider/configureucb.cxx +++ b/ucbhelper/source/provider/configureucb.cxx @@ -174,14 +174,14 @@ configureUcb( if (rArguments.getLength() < 2 || !(rArguments[0] >>= aKey1) || !(rArguments[1] >>= aKey2)) { - OSL_ENSURE(false, "ucb::configureUcb(): Bad arguments"); + OSL_FAIL("ucb::configureUcb(): Bad arguments"); return false; } ContentProviderDataList aData; if (!getContentProviderData(rServiceFactory, aKey1, aKey2, aData)) { - OSL_ENSURE(false, "ucb::configureUcb(): No configuration"); + OSL_FAIL("ucb::configureUcb(): No configuration"); return false; } @@ -207,8 +207,7 @@ configureUcb( pInfos->push_back(aInfo); } else - OSL_ENSURE(false, - "ucb::configureUcb(): Bad argument placeholders"); + OSL_FAIL("ucb::configureUcb(): Bad argument placeholders"); } return true; diff --git a/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx index 542ddf9351ae..3e89f9f70b4b 100644 --- a/ucbhelper/source/provider/provconf.cxx +++ b/ucbhelper/source/provider/provconf.cxx @@ -99,8 +99,7 @@ bool getContentProviderData( { if ( !rServiceMgr.is() || !rKey1.getLength() || !rKey2.getLength() ) { - OSL_ENSURE( false, - "getContentProviderData - Invalid argument!" ); + OSL_FAIL( "getContentProviderData - Invalid argument!" ); return false; } @@ -114,8 +113,7 @@ bool getContentProviderData( if ( !xConfigProv.is() ) { - OSL_ENSURE( false, - "getContentProviderData - No config provider!" ); + OSL_FAIL( "getContentProviderData - No config provider!" ); return false; } @@ -141,8 +139,7 @@ bool getContentProviderData( if ( !xInterface.is() ) { - OSL_ENSURE( false, - "getContentProviderData - No config access!" ); + OSL_FAIL( "getContentProviderData - No config access!" ); return false; } @@ -151,8 +148,7 @@ bool getContentProviderData( if ( !xNameAccess.is() ) { - OSL_ENSURE( false, - "getContentProviderData - No XNameAccess!" ); + OSL_FAIL( "getContentProviderData - No XNameAccess!" ); return false; } @@ -167,8 +163,7 @@ bool getContentProviderData( if ( !xHierNameAccess.is() ) { - OSL_ENSURE( false, - "getContentProviderData - " + OSL_FAIL( "getContentProviderData - " "No XHierarchicalNameAccess!" ); return false; } @@ -192,8 +187,7 @@ bool getContentProviderData( if ( !( xHierNameAccess->getByHierarchicalName( aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) { - OSL_ENSURE( false, - "getContentProviderData - " + OSL_FAIL( "getContentProviderData - " "Error getting item value!" ); continue; } @@ -207,8 +201,7 @@ bool getContentProviderData( if ( !( xHierNameAccess->getByHierarchicalName( aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) { - OSL_ENSURE( false, - "getContentProviderData - " + OSL_FAIL( "getContentProviderData - " "Error getting item value!" ); continue; } @@ -222,8 +215,7 @@ bool getContentProviderData( if ( !( xHierNameAccess->getByHierarchicalName( aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) { - OSL_ENSURE( false, - "getContentProviderData - " + OSL_FAIL( "getContentProviderData - " "Error getting item value!" ); continue; } @@ -237,8 +229,7 @@ bool getContentProviderData( { // getByHierarchicalName - OSL_ENSURE( false, - "getContentProviderData - " + OSL_FAIL( "getContentProviderData - " "caught NoSuchElementException!" ); } } @@ -246,16 +237,14 @@ bool getContentProviderData( } catch ( uno::RuntimeException& ) { - OSL_ENSURE( false, - "getContentProviderData - caught RuntimeException!" ); + OSL_FAIL( "getContentProviderData - caught RuntimeException!" ); return false; } catch ( uno::Exception& ) { // createInstance, createInstanceWithArguments - OSL_ENSURE( false, - "getContentProviderData - caught Exception!" ); + OSL_FAIL( "getContentProviderData - caught Exception!" ); return false; } diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx index 31bd1d0c9211..cb2014091dac 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx @@ -421,7 +421,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo, else { // See com/sun/star/ucb/ContentInfo.idl - DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - " + OSL_FAIL( "UcbExplorerListBoxEntry::createNewContent - " "Invlid type for bootstrap property!" ); } } @@ -457,7 +457,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo, OUString aSourceURL( pDlg->GetValue() ); if ( aSourceURL.getLength() == 0 ) { - DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - " + OSL_FAIL( "UcbExplorerListBoxEntry::createNewContent - " "No document data URL!" ); return FALSE; } @@ -491,7 +491,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo, } catch ( ContentCreationException const & ) { - DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - " + OSL_FAIL( "UcbExplorerListBoxEntry::createNewContent - " "No content for document data!" ); return FALSE; } diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 63af204f8ddc..b19ee6a3683f 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -271,7 +271,7 @@ bool implEnsureAbsolute(OUString & _rsURL) // also strips embedded dots !! } else { - OSL_ENSURE(false, "Could not get absolute file URL for URL"); + OSL_FAIL("Could not get absolute file URL for URL"); return false; } } @@ -359,7 +359,7 @@ PathStatus checkStatusAndNormalizeURL(OUString & _sURL) if (eStatus == Bootstrap::PATH_EXISTS) { if (!implNormalizeURL(_sURL,aDirItem)) - OSL_ENSURE(false,"Unexpected failure getting actual URL for existing object"); + OSL_FAIL("Unexpected failure getting actual URL for existing object"); } } return eStatus; diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 9d13d10223b0..b7dac4dcfab9 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -756,7 +756,7 @@ void lcl_normalizeLocalNames(Sequence< OUString >& _rNames, ConfigNameFormat _eF break; } } - OSL_ENSURE(false, "Cannot create absolute pathes: missing interface"); + OSL_FAIL("Cannot create absolute pathes: missing interface"); // make local pathes instaed case CONFIG_NAME_LOCAL_PATH: diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 24f7977bcc4e..144d53dd4401 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -356,23 +356,19 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) switch(eProp) { case INSTALLPATH: - OSL_ENSURE( false, - "ConfigManager::GetDirectConfigProperty: " + OSL_FAIL( "ConfigManager::GetDirectConfigProperty: " "INSTALLPATH no longer supported." ); return Any(); case USERINSTALLURL: - OSL_ENSURE( false, - "ConfigManager::GetDirectConfigProperty: " + OSL_FAIL( "ConfigManager::GetDirectConfigProperty: " "USERINSTALLURL no longer supported." ); return Any(); case OFFICEINSTALL: - OSL_ENSURE( false, - "ConfigManager::GetDirectConfigProperty: " + OSL_FAIL( "ConfigManager::GetDirectConfigProperty: " "OFFICEINSTALL no longer supported." ); return Any(); case OFFICEINSTALLURL: - OSL_ENSURE( false, - "ConfigManager::GetDirectConfigProperty: " + OSL_FAIL( "ConfigManager::GetDirectConfigProperty: " "OFFICEINSTALLURL no longer supported." ); return Any(); default: diff --git a/unotools/source/config/configpathes.cxx b/unotools/source/config/configpathes.cxx index fd813d4c7a9a..5c35e112bad0 100644 --- a/unotools/source/config/configpathes.cxx +++ b/unotools/source/config/configpathes.cxx @@ -98,7 +98,7 @@ sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, // strip trailing slash if (nPos > 0 && _sInPath[ nPos ] == sal_Unicode('/')) { - OSL_ENSURE(false, "Invalid config path: trailing '/' is not allowed"); + OSL_FAIL("Invalid config path: trailing '/' is not allowed"); --nPos; } diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx index bc6f3c493aff..d851102d2d23 100644 --- a/unotools/source/config/inetoptions.cxx +++ b/unotools/source/config/inetoptions.cxx @@ -280,8 +280,7 @@ SvtInetOptions::Impl::Impl(): for (sal_Int32 i = 0; i < ENTRY_COUNT; ++i) aKeys[i] = m_aEntries[i].m_aName; if (!EnableNotification(aKeys)) - OSL_ENSURE(false, - "SvtInetOptions::Impl::Impl(): Bad EnableNotifications()"); + OSL_FAIL("SvtInetOptions::Impl::Impl(): Bad EnableNotifications()"); } //============================================================================ @@ -330,8 +329,7 @@ star::uno::Any SvtInetOptions::Impl::getProperty(Index nPropIndex) } } } - OSL_ENSURE(false, - "SvtInetOptions::Impl::getProperty(): Possible life lock"); + OSL_FAIL("SvtInetOptions::Impl::getProperty(): Possible life lock"); { osl::MutexGuard aGuard(m_aMutex); return m_aEntries[nPropIndex].m_aValue; diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index e3f95101d242..656453dde274 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -1959,7 +1959,7 @@ void LocaleDataWrapper::outputCheckMessage( const char* pStr ) { fprintf( stderr, "\n%s\n", pStr); fflush( stderr); - DBG_ERROR( pStr); + OSL_TRACE("%s", pStr); } diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm index 4bbdaf9c3987..e62a950129e4 100644 --- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm +++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm @@ -522,7 +522,7 @@ static void filterAccelerator( rtl::OUString& io_rText ) } else { - DBG_ERROR( "unsupported class" ); + OSL_FAIL( "unsupported class" ); } mpController->updateEnableState(); } @@ -554,7 +554,7 @@ static void filterAccelerator( rtl::OUString& io_rText ) } else { - DBG_ERROR( "unsupported class" ); + OSL_FAIL( "unsupported class" ); } mpController->updateEnableState(); } @@ -1351,7 +1351,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO } else { - DBG_ERROR( "Unsupported UI option" ); + OSL_FAIL( "Unsupported UI option" ); } } diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm index 015c43aed70f..5c32d880e81f 100755 --- a/vcl/aqua/source/window/salnsmenu.mm +++ b/vcl/aqua/source/window/salnsmenu.mm @@ -61,7 +61,7 @@ pFrame->CallCallback(SALEVENT_MENUDEACTIVATE, &aMenuEvt); } else - DBG_ERROR( "unconnected menu" ); + OSL_FAIL( "unconnected menu" ); } } } @@ -121,7 +121,7 @@ pPopupMenu->ImplSelectWithStart( pCurMenu ); } else - DBG_ERROR( "menubar item without frame !" ); + OSL_FAIL( "menubar item without frame !" ); } } @end diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx index 132159e2fbac..25674b76ae8a 100644 --- a/vcl/inc/vcl/fontmanager.hxx +++ b/vcl/inc/vcl/fontmanager.hxx @@ -733,7 +733,7 @@ public: false else */ bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale ); - bool getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*), ImplFontOptions& rResult ) const; + ImplFontOptions* getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*)) const; rtl::OUString Substitute( const rtl::OUString& rFontName, rtl::OUString& rMissingCodes, const rtl::OString& rLangAttrib, italic::type& rItalic, weight::type& rWeight, diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx index f4d3b13c0445..b346f55273ef 100644 --- a/vcl/inc/vcl/glyphcache.hxx +++ b/vcl/inc/vcl/glyphcache.hxx @@ -186,7 +186,8 @@ public: virtual bool TestFont() const { return true; } virtual void* GetFtFace() const { return 0; } virtual int GetLoadFlags() const { return 0; } - virtual void SetFontOptions( const ImplFontOptions&) {} + virtual void SetFontOptions( const ImplFontOptions*) {} + virtual const ImplFontOptions* GetFontOptions() const { return 0; } virtual bool NeedsArtificialBold() const { return false; } virtual bool NeedsArtificialItalic() const { return false; } @@ -265,9 +266,8 @@ class VCL_PLUGIN_PUBLIC ImplServerFontEntry : public ImplFontEntry { private: ServerFont* mpServerFont; - ImplFontOptions maFontOptions; + ImplFontOptions* mpFontOptions; bool mbGotFontOptions; - bool mbValidFontOptions; public: ImplServerFontEntry( ImplFontSelectData& ); diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx deleted file mode 100644 index e005740a8065..000000000000 --- a/vcl/inc/vcl/graphite_adaptors.hxx +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_GRAPHITEADAPTORS_HXX -#define _SV_GRAPHITEADAPTORS_HXX - -// We need this to enable namespace support in libgrengine headers. -#define GR_NAMESPACE - -// Standard Library -#include <stdexcept> -// Platform - -#include <tools/svwin.h> - -#include <svsys.h> - -#include <vcl/salgdi.hxx> - -#include <vcl/sallayout.hxx> - -// Module -#include "vcl/dllapi.h" - -// Libraries -#include <graphite/GrClient.h> -#include <graphite/Font.h> -#include <graphite/ITextSource.h> - -// Module type definitions and forward declarations. -// -#ifndef MSC -// SAL/VCL types -class ServerFont; -class FreetypeServerFont; - -// Graphite types - -struct FontProperties : gr::FontProps -{ - FontProperties(const FreetypeServerFont & font) throw(); -}; - -namespace grutils -{ - class GrFeatureParser; -} - -// This class adapts the Sal font and graphics services to form required by -// the Graphite engine. -// @author tse -// -class VCL_PLUGIN_PUBLIC GraphiteFontAdaptor : public gr::Font -{ - typedef std::map<const gr::gid16, std::pair<gr::Rect, gr::Point> > GlyphMetricMap; - friend class GrFontHasher; -public: - static bool IsGraphiteEnabledFont(ServerFont &) throw(); - - GraphiteFontAdaptor(ServerFont & font, const sal_Int32 dpi_x, const sal_Int32 dpi_y); - GraphiteFontAdaptor(const GraphiteFontAdaptor &) throw(); - ~GraphiteFontAdaptor() throw(); - - gr::Font * copyThis(); - - // Basic attribute accessors. - virtual float ascent(); - virtual float descent(); - virtual bool bold(); - virtual bool italic(); - virtual float height(); - virtual unsigned int getDPIx(); - virtual unsigned int getDPIy(); - - // Font access methods. - virtual const void * getTable(gr::fontTableId32 tableID, size_t * pcbSize); - virtual void getFontMetrics(float * ascent_out, float * descent_out = 0, float * em_square_out = 0); - - // Glyph metrics. - virtual void getGlyphMetrics(gr::gid16 glyphID, gr::Rect & boundingBox, gr::Point & advances); - - // Adaptor attributes. - const FontProperties & fontProperties() const throw(); - FreetypeServerFont & font() const throw(); - const grutils::GrFeatureParser * features() const { return mpFeatures; }; - -private: - virtual void UniqueCacheInfo(std::wstring &, bool &, bool &); - - FreetypeServerFont& mrFont; - FontProperties maFontProperties; - const unsigned int mnDpiX, mnDpiY; - const float mfAscent, - mfDescent, - mfEmUnits; - grutils::GrFeatureParser * mpFeatures; - GlyphMetricMap maGlyphMetricMap; -}; - -// Partial implementation of class GraphiteFontAdaptor. -// -inline const FontProperties & GraphiteFontAdaptor::fontProperties() const throw() { - return maFontProperties; -} - -inline FreetypeServerFont & GraphiteFontAdaptor::font() const throw() { - return mrFont; -} -#endif // not MFC - -// Partial implementation of class TextSourceAdaptor. -// -//inline const ImplLayoutArgs & TextSourceAdaptor::layoutArgs() const throw() { -// return _layout_args; -//} - - -#endif // _SV_GRAPHITEADAPTORS_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx deleted file mode 100644 index ecf667fdbaaf..000000000000 --- a/vcl/inc/vcl/graphite_cache.hxx +++ /dev/null @@ -1,290 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// Description: Classes to cache Graphite Segments to try to improve -// rendering performance. - -#ifndef GraphiteSegmentCache_h -#define GraphiteSegmentCache_h - -#include <tools/solar.h> -#include <rtl/ustring.h> - -#define GRCACHE_REUSE_VECTORS 1 - -#include <boost/unordered_map.hpp> - -class TextSourceAdaptor; -/** -* GrSegRecord stores a Graphite Segment and its associated text -*/ -class GrSegRecord { -public: - GrSegRecord(rtl::OUString * rope, TextSourceAdaptor * textSrc, gr::Segment * seg, bool bIsRtl); - - ~GrSegRecord(); - - void reuse(rtl::OUString * rope, TextSourceAdaptor * textSrc, gr::Segment * seg, bool bIsRtl); - - void clearVectors(); - void clear(); -#ifdef GRCACHE_REUSE_VECTORS - void setGlyphVectors(long nWidth, GraphiteLayout::Glyphs & vGlyphs, std::vector<int> vCharDxs, - std::vector<int> & vChar2Base, std::vector<int> & vGlyph2Char, float fScale) - { - clearVectors(); - mnWidth = nWidth; - m_fontScale = fScale; - mvGlyphs.insert(mvGlyphs.begin(), vGlyphs.begin(), vGlyphs.end()); - mvCharDxs.insert(mvCharDxs.begin(),vCharDxs.begin(),vCharDxs.end()); - mvChar2BaseGlyph.insert(mvChar2BaseGlyph.begin(),vChar2Base.begin(),vChar2Base.end()); - mvGlyph2Char.insert(mvGlyph2Char.begin(),vGlyph2Char.begin(),vGlyph2Char.end()); - } -#endif - gr::Segment * getSegment() { return m_seg; } - TextSourceAdaptor * getTextSrc() { return m_text; } - void unlock() { --m_lockCount; } - bool isRtl() const { return mbIsRtl; } -#ifdef GRCACHE_REUSE_VECTORS - const long & width() const { return mnWidth; } - const GraphiteLayout::Glyphs & glyphs() const { return mvGlyphs; } - const std::vector<int> & charDxs() const { return mvCharDxs; } - const std::vector<int> & char2BaseGlyph() const { return mvChar2BaseGlyph; } - const std::vector<int> & glyph2Char() const { return mvGlyph2Char; } - float & fontScale() { return m_fontScale; } -#endif -private: - rtl::OUString * m_rope; - TextSourceAdaptor * m_text; - gr::Segment * m_seg; - const xub_Unicode * m_nextKey; - const xub_Unicode* m_pStr; - size_t m_startChar; - float m_fontScale; - long mnWidth; - GraphiteLayout::Glyphs mvGlyphs; // glyphs in display order - std::vector<int> mvCharDxs; // right hand side x offset of each glyph - std::vector<int> mvChar2BaseGlyph; - std::vector<int> mvGlyph2Char; - bool mbIsRtl; - int m_lockCount; - friend class GraphiteSegmentCache; -}; - -typedef boost::unordered_map<long, GrSegRecord*, boost::hash<long> > GraphiteSegMap; -typedef boost::unordered_multimap<size_t, GrSegRecord*> GraphiteRopeMap; -typedef std::pair<GraphiteRopeMap::iterator, GraphiteRopeMap::iterator> GrRMEntry; - -/** -* GraphiteSegmentCache contains the cached Segments for one particular font size -*/ -class GraphiteSegmentCache -{ -public: - enum { - // not really sure what good values are here, - // bucket size should be >> cache size - SEG_BUCKET_FACTOR = 4, - SEG_DEFAULT_CACHE_SIZE = 2047 - }; - GraphiteSegmentCache(sal_uInt32 nSegCacheSize) - : m_segMap(nSegCacheSize * SEG_BUCKET_FACTOR), - m_nSegCacheSize(nSegCacheSize), - m_oldestKey(NULL) {}; - ~GraphiteSegmentCache() - { - m_ropeMap.clear(); - GraphiteSegMap::iterator i = m_segMap.begin(); - while (i != m_segMap.end()) - { - GrSegRecord *r = i->second; - delete r; - ++i; - } - m_segMap.clear(); - }; - GrSegRecord * getSegment(ImplLayoutArgs & layoutArgs, bool bIsRtl, int segCharLimit) - { - GrSegRecord * found = NULL; - // try to find a segment starting at correct place, if not, try to find a - // match for the complete buffer - GraphiteSegMap::iterator iMap = - m_segMap.find(reinterpret_cast<long>(layoutArgs.mpStr + - layoutArgs.mnMinCharPos)); - if (iMap != m_segMap.end()) - { - found = iMap->second; - } - else - { - iMap = m_segMap.find(reinterpret_cast<long>(layoutArgs.mpStr)); - if (iMap != m_segMap.end()) - { - found = iMap->second; - } - } - if (found) - { - if (found->m_seg->startCharacter() <= layoutArgs.mnMinCharPos && - found->m_seg->stopCharacter() >= layoutArgs.mnEndCharPos) - { - DBG_ASSERT(found && found->m_seg, "null entry in GraphiteSegmentCache"); - // restore original start character, in case it has changed - found->m_seg->setTextSourceOffset(found->m_startChar); - // check that characters are the same, at least in the range of - // interest - // We could use substr and ==, but substr does a copy, - // so its probably faster to do it like this - for (int i = layoutArgs.mnMinCharPos; i < segCharLimit; i++) - { - //if (!found->m_rope->match(rtl::OUString(layoutArgs.mpStr[i], layoutArgs.mnLength), i - found->m_seg->startCharacter())) - if (found->m_rope->getStr()[i-found->m_seg->startCharacter()] != layoutArgs.mpStr[i]) - return NULL; - } - if (found->isRtl() != bIsRtl) - { - return NULL; - } - if (found->m_seg->stopCharacter() > layoutArgs.mnEndCharPos && - static_cast<int>(found->char2BaseGlyph().size()) > layoutArgs.mnEndCharPos) - { - // check that the requested end character isn't mid cluster - if (found->char2BaseGlyph()[layoutArgs.mnEndCharPos-layoutArgs.mnMinCharPos] == -1) - { - return NULL; - } - } -// if (found->m_lockCount != 0) -// OutputDebugString("Multple users of SegRecord!"); - found->m_lockCount++; - } - else found = NULL; - } - else - { - // the pointers aren't the same, but we might still have the same text in a segment - // this is expecially needed when editing a large paragraph - // each edit changes the pointers, but if we don't reuse any segments it gets very - // slow. - rtl::OUString * rope = new rtl::OUString(layoutArgs.mpStr + layoutArgs.mnMinCharPos, - segCharLimit - layoutArgs.mnMinCharPos); - if (!rope) return NULL; - size_t nHash = (*(rope)).hashCode(); - GrRMEntry range = m_ropeMap.equal_range(nHash); - while (range.first != range.second) - { - found = range.first->second; - if (found->m_lockCount == 0) - { - if(rope->match(*(found->m_rope))) - { - // found, but the pointers are all wrong - found->m_seg->setTextSourceOffset(layoutArgs.mnMinCharPos); - // the switch is done in graphite_layout.cxx - //found->m_text->switchLayoutArgs(layoutArgs); - found->m_lockCount++; - break; - } - else - found = NULL; - } - else - found = NULL; - ++(range.first); - } - delete rope; - } - return found; - }; - GrSegRecord * cacheSegment(TextSourceAdaptor * adapter, gr::Segment * seg, bool bIsRtl); -private: - GraphiteSegMap m_segMap; - GraphiteRopeMap m_ropeMap; - sal_uInt32 m_nSegCacheSize; - const xub_Unicode * m_oldestKey; - const xub_Unicode * m_prevKey; -}; - -typedef boost::unordered_map<int, GraphiteSegmentCache *, boost::hash<int> > GraphiteCacheMap; - -/** -* GraphiteCacheHandler maps a particular font, style, size to a GraphiteSegmentCache -*/ -class GraphiteCacheHandler -{ -public: - GraphiteCacheHandler() : m_cacheMap(255) - { - const char * pEnvCache = getenv( "SAL_GRAPHITE_CACHE_SIZE" ); - if (pEnvCache != NULL) - { - int envCacheSize = atoi(pEnvCache); - if (envCacheSize <= 0) - m_nSegCacheSize = GraphiteSegmentCache::SEG_DEFAULT_CACHE_SIZE; - else - { - m_nSegCacheSize = envCacheSize; - } - } - else - { - m_nSegCacheSize = GraphiteSegmentCache::SEG_DEFAULT_CACHE_SIZE; - } - }; - ~GraphiteCacheHandler() - { - GraphiteCacheMap::iterator i = m_cacheMap.begin(); - while (i != m_cacheMap.end()) - { - GraphiteSegmentCache *r = i->second; - delete r; - ++i; - } - m_cacheMap.clear(); - }; - - static GraphiteCacheHandler instance; - - GraphiteSegmentCache * getCache(sal_Int32 & fontHash) - { - if (m_cacheMap.count(fontHash) > 0) - { - return m_cacheMap.find(fontHash)->second; - } - GraphiteSegmentCache *pCache = new GraphiteSegmentCache(m_nSegCacheSize); - m_cacheMap[fontHash] = pCache; - return pCache; - } -private: - GraphiteCacheMap m_cacheMap; - sal_uInt32 m_nSegCacheSize; -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/vcl/graphite_features.hxx index 5dda6825ce76..742ad2c3f5f5 100644 --- a/vcl/inc/vcl/graphite_features.hxx +++ b/vcl/inc/vcl/graphite_features.hxx @@ -30,12 +30,17 @@ // Parse a string of features specified as ; separated pairs. // e.g. // 1001=1&2002=2&fav1=0 -#include <graphite/GrClient.h> -#include <graphite/Font.h> -#include <graphite/GrFeature.h> +#include <sal/types.h> +#include <rtl/ustring.hxx> +#include <graphite2/Font.h> namespace grutils { + union FeatId + { + gr_uint32 num; + unsigned char label[5]; + }; class GrFeatureParser { @@ -44,32 +49,30 @@ namespace grutils static const char FEAT_PREFIX; static const char FEAT_SEPARATOR; static const char FEAT_ID_VALUE_SEPARATOR; - GrFeatureParser(gr::Font & font, const std::string features, const std::string lang); - GrFeatureParser(gr::Font & font, const std::string lang); - GrFeatureParser(const GrFeatureParser & copy); + GrFeatureParser(const gr_face * face, const ::rtl::OString features, const ::rtl::OString lang); + GrFeatureParser(const gr_face * face, const ::rtl::OString lang); ~GrFeatureParser(); - size_t getFontFeatures(gr::FeatureSetting settings[MAX_FEATURES]) const; + //size_t getFontFeatures(gr::FeatureSetting settings[MAX_FEATURES]) const; bool parseErrors() { return mbErrors; }; - static bool isValid(gr::Font & font, gr::FeatureSetting & setting); - gr::isocode getLanguage() const { return maLang; }; - bool hasLanguage() const { return (maLang.rgch[0] != '\0'); } - sal_Int32 hashCode() const; + //static bool isValid(gr::Font & font, gr::FeatureSetting & setting); + gr_uint32 getLanguage() const { return maLang.num; }; + bool hasLanguage() const { return (maLang.label[0] != '\0'); } + sal_Int32 hashCode() const { return mnHash; } + size_t numFeatures() const { return mnNumSettings; } + gr_feature_val * values() const { return mpSettings; }; private: - void setLang(gr::Font & font, const std::string & lang); - bool isCharId(const std::string & id, size_t offset, size_t length); - int getCharId(const std::string & id, size_t offset, size_t length); - int getIntValue(const std::string & id, size_t offset, size_t length); + GrFeatureParser(const GrFeatureParser & copy); + void setLang(const gr_face * face, const ::rtl::OString & lang); + bool isCharId(const ::rtl::OString & id, size_t offset, size_t length); + gr_uint32 getCharId(const ::rtl::OString & id, size_t offset, size_t length); + short getIntValue(const ::rtl::OString & id, size_t offset, size_t length); size_t mnNumSettings; - gr::isocode maLang; + FeatId maLang; bool mbErrors; - gr::FeatureSetting maSettings[64]; + sal_uInt32 mnHash; + gr_feature_val * mpSettings; }; - union FeatId - { - gr::featid num; - unsigned char label[5]; - }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx index 92a6ec07c222..f605f190f669 100644 --- a/vcl/inc/vcl/graphite_layout.hxx +++ b/vcl/inc/vcl/graphite_layout.hxx @@ -34,29 +34,19 @@ // We need this to enable namespace support in libgrengine headers. #define GR_NAMESPACE -#define GRCACHE 1 - // Standard Library #include <memory> #include <vector> +#include <map> #include <utility> // Libraries -#include <graphite/GrClient.h> -#include <graphite/Font.h> -#include <graphite/GrConstants.h> -#include <graphite/GrAppData.h> -#include <graphite/SegmentAux.h> +#include <graphite2/Font.h> +#include <graphite2/Segment.h> // Platform #include <vcl/sallayout.hxx> #include <vcl/dllapi.h> // Module -// For backwards compatibility with 2.4.x -#if (SUPD == 680) -typedef sal_Int32 sal_GlyphId; -#endif - - // Module type definitions and forward declarations. // class TextSourceAdaptor; @@ -65,21 +55,40 @@ class GrSegRecord; // SAL/VCL types class ServerFont; -#ifdef WNT -// The GraphiteWinFont is just a wrapper to enable GrFontHasher to be a friend -// so that UniqueCacheInfo can be called. -#include <graphite/WinFont.h> -class GraphiteWinFont : public gr::WinFont +// Graphite types +namespace grutils { class GrFeatureParser; } + +class GraphiteFaceWrapper { - friend class GrFontHasher; public: - GraphiteWinFont(HDC hdc) : gr::WinFont(hdc) {}; - virtual ~GraphiteWinFont() {}; + typedef std::map<int, gr_font*> GrFontMap; + GraphiteFaceWrapper(gr_face * pFace) : m_pFace(pFace) {} + ~GraphiteFaceWrapper() + { + GrFontMap::iterator i = m_fonts.begin(); + while (i != m_fonts.end()) + gr_font_destroy((*i++).second); + m_fonts.clear(); + gr_face_destroy(m_pFace); + } + const gr_face * face() const { return m_pFace; } + gr_font * font(int ppm) const + { + GrFontMap::const_iterator i = m_fonts.find(ppm); + if (i != m_fonts.end()) + return i->second; + return NULL; + }; + void addFont(int ppm, gr_font * pFont) + { + if (m_fonts[ppm]) + gr_font_destroy(m_fonts[ppm]); + m_fonts[ppm] = pFont; + } +private: + gr_face * m_pFace; + GrFontMap m_fonts; }; -#endif -// Graphite types -namespace gr { class Segment; class GlyphIterator; } -namespace grutils { class GrFeatureParser; } // This class uses the SIL Graphite engine to provide complex text layout services to the VCL // @author tse @@ -87,63 +96,38 @@ namespace grutils { class GrFeatureParser; } class VCL_PLUGIN_PUBLIC GraphiteLayout : public SalLayout { public: - // Mask to allow Word break status to be stored within mvChar2BaseGlyph - enum { - WORD_BREAK_BEFORE = 0x40000000, - HYPHEN_BREAK_BEFORE = 0x80000000, - BREAK_MASK = 0xC0000000, - GLYPH_INDEX_MASK = 0x3FFFFFFF - } LineBreakMask; class Glyphs : public std::vector<GlyphItem> { public: typedef std::pair<Glyphs::const_iterator, Glyphs::const_iterator> iterator_pair_t; - void fill_from(gr::Segment & rSeg, ImplLayoutArgs & rArgs, - bool bRtl, long &rWidth, float fScaling, - std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char, - std::vector<int> & rCharDxs); - void move_glyph(Glyphs::iterator, long dx); - - const_iterator cluster_base(const_iterator) const; - iterator_pair_t neighbour_clusters(const_iterator) const; - private: - std::pair<float,float> appendCluster(gr::Segment & rSeg, ImplLayoutArgs & rArgs, - bool bRtl, float fSegmentAdvance, int nFirstCharInCluster, int nNextChar, - int nFirstGlyphInCluster, int nNextGlyph, float fScaling, - std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char, - std::vector<int> & rCharDxs, long & rDXOffset); - void append(gr::Segment & rSeg, ImplLayoutArgs & rArgs, gr::GlyphInfo & rGi, float nextGlyphOrigin, float fScaling, std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char, std::vector<int> & rCharDxs, long & rDXOffset, bool bIsBase); }; mutable Glyphs mvGlyphs; void clear(); private: - TextSourceAdaptor * mpTextSrc; // Text source. - gr::LayoutEnvironment maLayout; - const gr::Font &mrFont; + const gr_face * mpFace; // not owned by layout + gr_font * mpFont; // not owned by layout + int mnSegCharOffset; // relative to ImplLayoutArgs::mpStr long mnWidth; - std::vector<int> mvCharDxs; std::vector<int> mvChar2BaseGlyph; std::vector<int> mvGlyph2Char; + std::vector<int> mvCharDxs; + std::vector<int> mvCharBreaks; float mfScaling; const grutils::GrFeatureParser * mpFeatures; public: - explicit GraphiteLayout( const gr::Font& font, const grutils::GrFeatureParser* features = NULL ) throw(); + GraphiteLayout(const gr_face * pFace, gr_font * pFont = NULL, + const grutils::GrFeatureParser * features = NULL) throw(); // used by upper layers virtual bool LayoutText( ImplLayoutArgs& ); // first step of layout // split into two stages to allow dc to be restored on the segment -#ifdef GRCACHE - gr::Segment * CreateSegment(ImplLayoutArgs& rArgs, GrSegRecord ** pRecord = NULL); - bool LayoutGlyphs(ImplLayoutArgs& rArgs, gr::Segment * pSegment, GrSegRecord * pSegRecord); -#else - gr::Segment * CreateSegment(ImplLayoutArgs& rArgs); - bool LayoutGlyphs(ImplLayoutArgs& rArgs, gr::Segment * pSegment); -#endif + gr_segment * CreateSegment(ImplLayoutArgs& rArgs); + bool LayoutGlyphs(ImplLayoutArgs& rArgs, gr_segment * pSegment); virtual void AdjustLayout( ImplLayoutArgs& ); // adjusting positions @@ -167,19 +151,23 @@ public: virtual void DrawText(SalGraphics&) const {}; virtual ~GraphiteLayout() throw(); + void SetFont(gr_font * pFont) { mpFont = pFont; } + gr_font * GetFont() { return mpFont; } void SetFeatures(grutils::GrFeatureParser * aFeature) { mpFeatures = aFeature; } void SetFontScale(float s) { mfScaling = s; }; - const TextSourceAdaptor * textSrc() const { return mpTextSrc; }; virtual sal_GlyphId getKashidaGlyph(int & width) = 0; void kashidaJustify(std::vector<int> & rDeltaWidth, sal_GlyphId, int width); static const int EXTRA_CONTEXT_LENGTH; private: - int glyph_to_char(Glyphs::iterator); - std::pair<int,int> glyph_to_chars(const GlyphItem &) const; - - std::pair<long,long> caret_positions(size_t) const; void expandOrCondense(ImplLayoutArgs &rArgs); + void fillFrom(gr_segment * rSeg, ImplLayoutArgs & rArgs, float fScaling); + + void append(gr_segment * pSeg, + ImplLayoutArgs & rArgs, + const gr_slot * pSlot, + float nextGlyphOrigin, float fScaling, + long & rDXOffset, bool bIsBase, int baseChar); }; #endif // _SV_GRAPHITELAYOUT_HXX diff --git a/vcl/inc/vcl/graphite_serverfont.hxx b/vcl/inc/vcl/graphite_serverfont.hxx index f0f7fecb0277..b4a6e10be925 100644 --- a/vcl/inc/vcl/graphite_serverfont.hxx +++ b/vcl/inc/vcl/graphite_serverfont.hxx @@ -33,20 +33,20 @@ #define GR_NAMESPACE #ifndef MSC -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_adaptors.hxx> +#include "vcl/graphite_layout.hxx" // Modules class VCL_PLUGIN_PUBLIC GraphiteLayoutImpl : public GraphiteLayout { public: - GraphiteLayoutImpl(const gr::Font & font, const grutils::GrFeatureParser * features, GraphiteFontAdaptor * pFont) throw() - : GraphiteLayout(font, features), mpFont(pFont) {}; + GraphiteLayoutImpl(const gr_face * pFace, + ServerFont & rServerFont) throw() + : GraphiteLayout(pFace), mrServerFont(rServerFont) {}; virtual ~GraphiteLayoutImpl() throw() {}; virtual sal_GlyphId getKashidaGlyph(int & width); private: - GraphiteFontAdaptor * mpFont; + ServerFont & mrServerFont; }; // This class implments the server font specific parts. @@ -55,13 +55,19 @@ private: class VCL_PLUGIN_PUBLIC GraphiteServerFontLayout : public ServerFontLayout { private: - mutable GraphiteFontAdaptor * mpFont; // mutable so that the DrawOffset/DrawBase can be set mutable GraphiteLayoutImpl maImpl; + grutils::GrFeatureParser * mpFeatures; + const sal_Unicode * mpStr; public: - explicit GraphiteServerFontLayout( GraphiteFontAdaptor* font ) throw(); + GraphiteServerFontLayout(ServerFont& pServerFont) throw(); - virtual bool LayoutText( ImplLayoutArgs& rArgs) { SalLayout::AdjustLayout(rArgs); return maImpl.LayoutText(rArgs); }; // first step of layout + virtual bool LayoutText( ImplLayoutArgs& rArgs) + { + mpStr = rArgs.mpStr; + SalLayout::AdjustLayout(rArgs); + return maImpl.LayoutText(rArgs); + }; // first step of layout virtual void AdjustLayout( ImplLayoutArgs& rArgs) { SalLayout::AdjustLayout(rArgs); @@ -89,8 +95,9 @@ public: virtual ~GraphiteServerFontLayout() throw(); + static bool IsGraphiteEnabledFont(ServerFont * pServerFont); // For use with PspGraphics - const sal_Unicode* getTextPtr() const; + const sal_Unicode* getTextPtr() const { return mpStr; }; int getMinCharPos() const { return mnMinCharPos; } int getMaxCharPos() const { return mnEndCharPos; } }; diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/vcl/impfont.hxx index b1a73939e3d8..630297e1d2f8 100644 --- a/vcl/inc/vcl/impfont.hxx +++ b/vcl/inc/vcl/impfont.hxx @@ -135,7 +135,7 @@ public: }; // ------------------ -// - ImplFontHints - +// - ImplFontOptions - // ------------------ class ImplFontOptions @@ -154,19 +154,20 @@ public: meHinting(HINTING_DONTKNOW), meHintStyle(HINT_SLIGHT) {} - ImplFontOptions( FontEmbeddedBitmap eEmbeddedBitmap, FontAntiAlias eAntiAlias, - FontAutoHint eAutoHint, FontHinting eHinting, FontHintStyle eHintStyle) : - meEmbeddedBitmap(eEmbeddedBitmap), - meAntiAlias(eAntiAlias), - meAutoHint(eAutoHint), - meHinting(eHinting), - meHintStyle(eHintStyle) + virtual ~ImplFontOptions() {} - FontAutoHint GetUseAutoHint() const { return meAutoHint; } - FontHintStyle GetHintStyle() const { return meHintStyle; } - bool DontUseEmbeddedBitmaps() const { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; } - bool DontUseAntiAlias() const { return meAntiAlias == ANTIALIAS_FALSE; } - bool DontUseHinting() const { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); } + FontAutoHint GetUseAutoHint() const + { return meAutoHint; } + FontHintStyle GetHintStyle() const + { return meHintStyle; } + bool DontUseEmbeddedBitmaps() const + { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; } + bool DontUseAntiAlias() const + { return meAntiAlias == ANTIALIAS_FALSE; } + bool DontUseHinting() const + { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); } + virtual void *GetPattern(void * /*pFace*/) const + { return NULL; } }; // ------------------- diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index bf05dd040583..e6aaec2c9971 100755 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -279,6 +279,8 @@ enum OutDevViewType { OUTDEV_VIEWTYPE_DONTKNOW, OUTDEV_VIEWTYPE_PRINTPREVIEW, OU class VirtualDevice; class Printer; +class ImplFontSelectData; +class ImplFontMetricData; const char* ImplDbgCheckOutputDevice( const void* pObj ); @@ -565,6 +567,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/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx index 49aa93d47b38..e4fd783ccb27 100644 --- a/vcl/os2/source/app/salinst.cxx +++ b/vcl/os2/source/app/salinst.cxx @@ -662,7 +662,7 @@ MRESULT EXPENTRY SalComWndProc( HWND hWnd, ULONG nMsg, //in the structure (GetWindowPtr()). if (WinDestroyWindow((HWND)nMP2) == 0) { - OSL_ENSURE(0, "DestroyWindow failed!"); + OSL_FAIL("DestroyWindow failed!"); //Failure: We remove the SalFrame from the window structure. So we avoid that // the window structure may contain an invalid pointer, once the SalFrame is deleted. SetWindowPtr((HWND)nMP2, 0); diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index dd7d7f7ba375..4e3f8ceb0cf2 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -1777,8 +1777,6 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t ) void CloseTTFont(TrueTypeFont *ttf) /*FOLD01*/ { - if (ttf->tag != TTFontClassTag) return; - #if !defined(WIN32) && !defined(OS2) if( ttf->fname ) munmap((char *) ttf->ptr, ttf->fsize); diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index dd7b64f1abd6..d1f130d9d1cc 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -108,7 +108,7 @@ BitmapEx::BitmapEx( const ResId& rResId ) : { #ifdef DBG_UTIL ByteString aErrorStr( "BitmapEx::BitmapEx( const ResId& rResId ): could not load image <" ); - DBG_ERROR( ( ( aErrorStr += ByteString( aFileName, RTL_TEXTENCODING_ASCII_US ) ) += '>' ).GetBuffer() ); + OSL_FAIL( ( ( aErrorStr += ByteString( aFileName, RTL_TEXTENCODING_ASCII_US ) ) += '>' ).GetBuffer() ); #endif } } diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 2329a9673d23..2d9fbef36e44 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -2434,7 +2434,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, ByteString aStr( "Missing implementation for Action#: " ); aStr += ByteString::CreateFromInt32( pAction->GetType() ); aStr += '!'; - DBG_ERROR( aStr.GetBuffer() ); + OSL_FAIL( aStr.GetBuffer() ); } break; #endif diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index e212efc00e23..24c86c326910 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -504,7 +504,7 @@ void ImageAryData::Load(const rtl::OUString &rPrefix) aMessage.append( "ImageAryData::Load: failed to load image '" ); aMessage.append( ::rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() ); aMessage.append( "'" ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); } #endif } diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index df0e3adddb1d..21c0cbb0abd4 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -363,7 +363,7 @@ public: inline void ImplAdd( sal_uInt8 nCode ); void ImplEndAdd( sal_uLong nTypeFlag ); - const Polygon& ImplGetPoly() { return maPoly; } + const Polygon& ImplGetPoly() const { return maPoly; } }; // ----------------------------------------------------------------------------- diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk index c530c0148783..d01c46a77ca0 100755 --- a/vcl/source/gdi/makefile.mk +++ b/vcl/source/gdi/makefile.mk @@ -43,6 +43,9 @@ CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE .ENDIF .IF "$(ENABLE_GRAPHITE)" == "TRUE" CDEFS+=-DENABLE_GRAPHITE +.IF "$(SYSTEM_GRAPHITE)" != "YES" +CDEFS+=-DGR2_STATIC +.ENDIF .ENDIF # --- Files -------------------------------------------------------- diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index ffc71df7b98f..efd5484dad01 100755 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -1047,7 +1047,7 @@ void OutputDevice::ImplSetClipRegion( const Region* pRegion ) void OutputDevice::SetClipRegion() { - DBG_TRACE( "OutputDevice::SetClipRegion()" ); + OSL_TRACE( "OutputDevice::SetClipRegion()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1063,7 +1063,7 @@ void OutputDevice::SetClipRegion() void OutputDevice::SetClipRegion( const Region& rRegion ) { - DBG_TRACE( "OutputDevice::SetClipRegion( rRegion )" ); + OSL_TRACE( "OutputDevice::SetClipRegion( rRegion )" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rRegion, Region, ImplDbgTestRegion ); @@ -1118,7 +1118,7 @@ Region OutputDevice::GetActiveClipRegion() const void OutputDevice::MoveClipRegion( long nHorzMove, long nVertMove ) { - DBG_TRACE( "OutputDevice::MoveClipRegion()" ); + OSL_TRACE( "OutputDevice::MoveClipRegion()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mbClipRegion ) @@ -1139,7 +1139,7 @@ void OutputDevice::MoveClipRegion( long nHorzMove, long nVertMove ) void OutputDevice::IntersectClipRegion( const Rectangle& rRect ) { - DBG_TRACE( "OutputDevice::IntersectClipRegion( rRect )" ); + OSL_TRACE( "OutputDevice::IntersectClipRegion( rRect )" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1158,7 +1158,7 @@ void OutputDevice::IntersectClipRegion( const Rectangle& rRect ) void OutputDevice::IntersectClipRegion( const Region& rRegion ) { - DBG_TRACE( "OutputDevice::IntersectClipRegion( rRegion )" ); + OSL_TRACE( "OutputDevice::IntersectClipRegion( rRegion )" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rRegion, Region, ImplDbgTestRegion ); @@ -1183,7 +1183,7 @@ void OutputDevice::IntersectClipRegion( const Region& rRegion ) void OutputDevice::SetDrawMode( sal_uLong nDrawMode ) { - DBG_TRACE1( "OutputDevice::SetDrawMode( %lx )", nDrawMode ); + OSL_TRACE( "OutputDevice::SetDrawMode( %lx )", nDrawMode ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); mnDrawMode = nDrawMode; @@ -1196,7 +1196,7 @@ void OutputDevice::SetDrawMode( sal_uLong nDrawMode ) void OutputDevice::SetRasterOp( RasterOp eRasterOp ) { - DBG_TRACE1( "OutputDevice::SetRasterOp( %d )", (int)eRasterOp ); + OSL_TRACE( "OutputDevice::SetRasterOp( %d )", (int)eRasterOp ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1219,7 +1219,7 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp ) void OutputDevice::SetLineColor() { - DBG_TRACE( "OutputDevice::SetLineColor()" ); + OSL_TRACE( "OutputDevice::SetLineColor()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1240,7 +1240,7 @@ void OutputDevice::SetLineColor() void OutputDevice::SetLineColor( const Color& rColor ) { - DBG_TRACE1( "OutputDevice::SetLineColor( %lx )", rColor.GetColor() ); + OSL_TRACE( "OutputDevice::SetLineColor( %lx )", rColor.GetColor() ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Color aColor( rColor ); @@ -1308,7 +1308,7 @@ void OutputDevice::SetLineColor( const Color& rColor ) void OutputDevice::SetFillColor() { - DBG_TRACE( "OutputDevice::SetFillColor()" ); + OSL_TRACE( "OutputDevice::SetFillColor()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1329,7 +1329,7 @@ void OutputDevice::SetFillColor() void OutputDevice::SetFillColor( const Color& rColor ) { - DBG_TRACE1( "OutputDevice::SetFillColor( %lx )", rColor.GetColor() ); + OSL_TRACE( "OutputDevice::SetFillColor( %lx )", rColor.GetColor() ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Color aColor( rColor ); @@ -1401,7 +1401,7 @@ void OutputDevice::SetFillColor( const Color& rColor ) void OutputDevice::SetBackground() { - DBG_TRACE( "OutputDevice::SetBackground()" ); + OSL_TRACE( "OutputDevice::SetBackground()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); maBackground = Wallpaper(); @@ -1415,7 +1415,7 @@ void OutputDevice::SetBackground() void OutputDevice::SetBackground( const Wallpaper& rBackground ) { - DBG_TRACE( "OutputDevice::SetBackground( rBackground )" ); + OSL_TRACE( "OutputDevice::SetBackground( rBackground )" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); maBackground = rBackground; @@ -1433,7 +1433,7 @@ void OutputDevice::SetBackground( const Wallpaper& rBackground ) void OutputDevice::SetRefPoint() { - DBG_TRACE( "OutputDevice::SetRefPoint()" ); + OSL_TRACE( "OutputDevice::SetRefPoint()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1450,7 +1450,7 @@ void OutputDevice::SetRefPoint() void OutputDevice::SetRefPoint( const Point& rRefPoint ) { - DBG_TRACE( "OutputDevice::SetRefPoint( rRefPoint )" ); + OSL_TRACE( "OutputDevice::SetRefPoint( rRefPoint )" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1467,7 +1467,7 @@ void OutputDevice::SetRefPoint( const Point& rRefPoint ) void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt ) { - DBG_TRACE( "OutputDevice::DrawLine()" ); + OSL_TRACE( "OutputDevice::DrawLine()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1665,7 +1665,7 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand( void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt, const LineInfo& rLineInfo ) { - DBG_TRACE( "OutputDevice::DrawLine()" ); + OSL_TRACE( "OutputDevice::DrawLine()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( rLineInfo.IsDefault() ) @@ -1719,7 +1719,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt, void OutputDevice::DrawRect( const Rectangle& rRect ) { - DBG_TRACE( "OutputDevice::DrawRect()" ); + OSL_TRACE( "OutputDevice::DrawRect()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1760,7 +1760,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect ) void OutputDevice::DrawPolyLine( const Polygon& rPoly ) { - DBG_TRACE( "OutputDevice::DrawPolyLine()" ); + OSL_TRACE( "OutputDevice::DrawPolyLine()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rPoly, Polygon, NULL ); @@ -1838,7 +1838,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly ) void OutputDevice::DrawPolyLine( const Polygon& rPoly, const LineInfo& rLineInfo ) { - DBG_TRACE( "OutputDevice::DrawPolyLine()" ); + OSL_TRACE( "OutputDevice::DrawPolyLine()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rPoly, Polygon, NULL ); @@ -1930,7 +1930,7 @@ void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineI void OutputDevice::DrawPolygon( const Polygon& rPoly ) { - DBG_TRACE( "OutputDevice::DrawPolygon()" ); + OSL_TRACE( "OutputDevice::DrawPolygon()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rPoly, Polygon, NULL ); @@ -2020,7 +2020,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly ) void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) { - DBG_TRACE( "OutputDevice::DrawPolyPolygon()" ); + OSL_TRACE( "OutputDevice::DrawPolyPolygon()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rPolyPoly, PolyPolygon, NULL ); @@ -2131,7 +2131,7 @@ void OutputDevice::DrawPolygon( const ::basegfx::B2DPolygon& rB2DPolygon) void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly ) { - DBG_TRACE( "OutputDevice::DrawPolyPolygon(B2D&)" ); + OSL_TRACE( "OutputDevice::DrawPolyPolygon(B2D&)" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -2247,7 +2247,7 @@ void OutputDevice::DrawPolyLine( double fLineWidth, basegfx::B2DLineJoin eLineJoin) { - DBG_TRACE( "OutputDevice::DrawPolyLine(B2D&)" ); + OSL_TRACE( "OutputDevice::DrawPolyLine(B2D&)" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); (void)eLineJoin; // ATM used in UNX, but not in WNT, access it for warning-free @@ -2360,7 +2360,7 @@ sal_uInt32 OutputDevice::GetGCStackDepth() const void OutputDevice::Push( sal_uInt16 nFlags ) { - DBG_TRACE( "OutputDevice::Push()" ); + OSL_TRACE( "OutputDevice::Push()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -2449,7 +2449,7 @@ void OutputDevice::Push( sal_uInt16 nFlags ) void OutputDevice::Pop() { - DBG_TRACE( "OutputDevice::Pop()" ); + OSL_TRACE( "OutputDevice::Pop()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if( mpMetaFile ) diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index f00ca53b400d..356542952360 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -243,7 +243,7 @@ void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pVoi void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPt, const Size& rSrcSize ) { - DBG_TRACE( "OutputDevice::DrawOutDev()" ); + OSL_TRACE( "OutputDevice::DrawOutDev()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_ASSERT( meOutDevType != OUTDEV_PRINTER, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); @@ -317,7 +317,7 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPt, const Size& rSrcSize, const OutputDevice& rOutDev ) { - DBG_TRACE( "OutputDevice::DrawOutDev()" ); + OSL_TRACE( "OutputDevice::DrawOutDev()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rOutDev, OutputDevice, ImplDbgCheckOutputDevice ); DBG_ASSERT( meOutDevType != OUTDEV_PRINTER, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); @@ -390,7 +390,7 @@ void OutputDevice::CopyArea( const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize, sal_uInt16 nFlags ) { - DBG_TRACE( "OutputDevice::CopyArea()" ); + OSL_TRACE( "OutputDevice::CopyArea()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_ASSERT( meOutDevType != OUTDEV_PRINTER, "Don't use OutputDevice::CopyArea(...) with printer devices!" ); @@ -520,7 +520,7 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap ) { - DBG_TRACE( "OutputDevice::DrawBitmap()" ); + OSL_TRACE( "OutputDevice::DrawBitmap()" ); if( ImplIsRecordLayout() ) return; @@ -539,7 +539,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap ) void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize, const Bitmap& rBitmap ) { - DBG_TRACE( "OutputDevice::DrawBitmap( Size )" ); + OSL_TRACE( "OutputDevice::DrawBitmap( Size )" ); if( ImplIsRecordLayout() ) return; @@ -559,7 +559,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const Bitmap& rBitmap ) { - DBG_TRACE( "OutputDevice::DrawBitmap( Point, Size )" ); + OSL_TRACE( "OutputDevice::DrawBitmap( Point, Size )" ); if( ImplIsRecordLayout() ) return; @@ -737,7 +737,7 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize, void OutputDevice::DrawBitmapEx( const Point& rDestPt, const BitmapEx& rBitmapEx ) { - DBG_TRACE( "OutputDevice::DrawBitmapEx()" ); + OSL_TRACE( "OutputDevice::DrawBitmapEx()" ); if( ImplIsRecordLayout() ) return; @@ -756,7 +756,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const BitmapEx& rBitmapEx ) { - DBG_TRACE( "OutputDevice::DrawBitmapEx( Size )" ); + OSL_TRACE( "OutputDevice::DrawBitmapEx( Size )" ); if( ImplIsRecordLayout() ) return; @@ -773,7 +773,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const BitmapEx& rBitmapEx ) { - DBG_TRACE( "OutputDevice::DrawBitmapEx( Point, Size )" ); + OSL_TRACE( "OutputDevice::DrawBitmapEx( Point, Size )" ); if( ImplIsRecordLayout() ) return; @@ -1008,7 +1008,7 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize void OutputDevice::DrawMask( const Point& rDestPt, const Bitmap& rBitmap, const Color& rMaskColor ) { - DBG_TRACE( "OutputDevice::DrawMask()" ); + OSL_TRACE( "OutputDevice::DrawMask()" ); if( ImplIsRecordLayout() ) return; @@ -1036,7 +1036,7 @@ void OutputDevice::DrawMask( const Point& rDestPt, void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize, const Bitmap& rBitmap, const Color& rMaskColor ) { - DBG_TRACE( "OutputDevice::DrawMask( Size )" ); + OSL_TRACE( "OutputDevice::DrawMask( Size )" ); if( ImplIsRecordLayout() ) return; @@ -1065,7 +1065,7 @@ void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const Bitmap& rBitmap, const Color& rMaskColor ) { - DBG_TRACE( "OutputDevice::DrawMask( Point, Size )" ); + OSL_TRACE( "OutputDevice::DrawMask( Point, Size )" ); if( ImplIsRecordLayout() ) return; @@ -1446,7 +1446,7 @@ Color* OutputDevice::GetPixel( const Polygon& rPts ) const void OutputDevice::DrawPixel( const Point& rPt ) { - DBG_TRACE( "OutputDevice::DrawPixel()" ); + OSL_TRACE( "OutputDevice::DrawPixel()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -1482,7 +1482,7 @@ void OutputDevice::DrawPixel( const Point& rPt ) void OutputDevice::DrawPixel( const Point& rPt, const Color& rColor ) { - DBG_TRACE( "OutputDevice::DrawPixel()" ); + OSL_TRACE( "OutputDevice::DrawPixel()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Color aColor( rColor ); @@ -1554,7 +1554,7 @@ void OutputDevice::DrawPixel( const Polygon& rPts, const Color* pColors ) DrawPixel( rPts, GetLineColor() ); else { - DBG_TRACE( "OutputDevice::DrawPixel()" ); + OSL_TRACE( "OutputDevice::DrawPixel()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_ASSERT( pColors, "OutputDevice::DrawPixel: No color array specified" ); diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index fd399c6c0a11..9a3d07353fff 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -500,7 +500,7 @@ static void ImplFontSubstitute( String& rFontName, Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, sal_uLong nFlags, const OutputDevice* pOutDev ) { - DBG_TRACE( "OutputDevice::GetDefaultFont()" ); + OSL_TRACE( "OutputDevice::GetDefaultFont()" ); com::sun::star::lang::Locale aLocale; if( eLang == LANGUAGE_NONE || eLang == LANGUAGE_SYSTEM || eLang == LANGUAGE_DONTKNOW ) @@ -5017,7 +5017,7 @@ void OutputDevice::SetAntialiasing( sal_uInt16 nMode ) void OutputDevice::SetFont( const Font& rNewFont ) { - DBG_TRACE( "OutputDevice::SetFont()" ); + OSL_TRACE( "OutputDevice::SetFont()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rNewFont, Font, NULL ); @@ -5129,7 +5129,7 @@ void OutputDevice::SetFont( const Font& rNewFont ) void OutputDevice::SetLayoutMode( sal_uLong nTextLayoutMode ) { - DBG_TRACE( "OutputDevice::SetTextLayoutMode()" ); + OSL_TRACE( "OutputDevice::SetTextLayoutMode()" ); if( mpMetaFile ) mpMetaFile->AddAction( new MetaLayoutModeAction( nTextLayoutMode ) ); @@ -5144,7 +5144,7 @@ void OutputDevice::SetLayoutMode( sal_uLong nTextLayoutMode ) void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage ) { - DBG_TRACE( "OutputDevice::SetTextLanguage()" ); + OSL_TRACE( "OutputDevice::SetTextLanguage()" ); if( mpMetaFile ) mpMetaFile->AddAction( new MetaTextLanguageAction( eTextLanguage ) ); @@ -5159,7 +5159,7 @@ void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage ) void OutputDevice::SetTextColor( const Color& rColor ) { - DBG_TRACE( "OutputDevice::SetTextColor()" ); + OSL_TRACE( "OutputDevice::SetTextColor()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Color aColor( rColor ); @@ -5205,7 +5205,7 @@ void OutputDevice::SetTextColor( const Color& rColor ) void OutputDevice::SetTextFillColor() { - DBG_TRACE( "OutputDevice::SetTextFillColor()" ); + OSL_TRACE( "OutputDevice::SetTextFillColor()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -5224,7 +5224,7 @@ void OutputDevice::SetTextFillColor() void OutputDevice::SetTextFillColor( const Color& rColor ) { - DBG_TRACE( "OutputDevice::SetTextFillColor()" ); + OSL_TRACE( "OutputDevice::SetTextFillColor()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Color aColor( rColor ); @@ -5288,7 +5288,7 @@ Color OutputDevice::GetTextFillColor() const void OutputDevice::SetTextLineColor() { - DBG_TRACE( "OutputDevice::SetTextLineColor()" ); + OSL_TRACE( "OutputDevice::SetTextLineColor()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -5304,7 +5304,7 @@ void OutputDevice::SetTextLineColor() void OutputDevice::SetTextLineColor( const Color& rColor ) { - DBG_TRACE( "OutputDevice::SetTextLineColor()" ); + OSL_TRACE( "OutputDevice::SetTextLineColor()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Color aColor( rColor ); @@ -5347,7 +5347,7 @@ void OutputDevice::SetTextLineColor( const Color& rColor ) void OutputDevice::SetOverlineColor() { - DBG_TRACE( "OutputDevice::SetOverlineColor()" ); + OSL_TRACE( "OutputDevice::SetOverlineColor()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -5363,7 +5363,7 @@ void OutputDevice::SetOverlineColor() void OutputDevice::SetOverlineColor( const Color& rColor ) { - DBG_TRACE( "OutputDevice::SetOverlineColor()" ); + OSL_TRACE( "OutputDevice::SetOverlineColor()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Color aColor( rColor ); @@ -5407,7 +5407,7 @@ void OutputDevice::SetOverlineColor( const Color& rColor ) void OutputDevice::SetTextAlign( TextAlign eAlign ) { - DBG_TRACE( "OutputDevice::SetTextAlign()" ); + OSL_TRACE( "OutputDevice::SetTextAlign()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -5431,7 +5431,7 @@ void OutputDevice::DrawTextLine( const Point& rPos, long nWidth, FontUnderline eOverline, sal_Bool bUnderlineAbove ) { - DBG_TRACE( "OutputDevice::DrawTextLine()" ); + OSL_TRACE( "OutputDevice::DrawTextLine()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -5482,7 +5482,7 @@ sal_Bool OutputDevice::IsTextUnderlineAbove( const Font& rFont ) void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos, sal_uInt16 nStyle ) { - DBG_TRACE( "OutputDevice::DrawWaveLine()" ); + OSL_TRACE( "OutputDevice::DrawWaveLine()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() ) @@ -5561,7 +5561,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const String& rStr, pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText; } - DBG_TRACE( "OutputDevice::DrawText()" ); + OSL_TRACE( "OutputDevice::DrawText()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); #if OSL_DEBUG_LEVEL > 2 @@ -5637,7 +5637,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const String& rStr, long OutputDevice::GetTextWidth( const String& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const { - DBG_TRACE( "OutputDevice::GetTextWidth()" ); + OSL_TRACE( "OutputDevice::GetTextWidth()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); long nWidth = GetTextArray( rStr, NULL, nIndex, nLen ); @@ -5648,7 +5648,7 @@ long OutputDevice::GetTextWidth( const String& rStr, long OutputDevice::GetTextHeight() const { - DBG_TRACE( "OutputDevice::GetTextHeight()" ); + OSL_TRACE( "OutputDevice::GetTextHeight()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if( mbNewFont ) @@ -5672,7 +5672,7 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const String& rStr, const sal_Int32* pDXAry, xub_StrLen nIndex, xub_StrLen nLen ) { - DBG_TRACE( "OutputDevice::DrawTextArray()" ); + OSL_TRACE( "OutputDevice::DrawTextArray()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -5703,7 +5703,7 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const String& rStr, long OutputDevice::GetTextArray( const String& rStr, sal_Int32* pDXAry, xub_StrLen nIndex, xub_StrLen nLen ) const { - DBG_TRACE( "OutputDevice::GetTextArray()" ); + OSL_TRACE( "OutputDevice::GetTextArray()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if( nIndex >= rStr.Len() ) @@ -5752,7 +5752,7 @@ bool OutputDevice::GetCaretPositions( const XubString& rStr, sal_Int32* pCaretXA sal_Int32* pDXAry, long nLayoutWidth, sal_Bool bCellBreaking ) const { - DBG_TRACE( "OutputDevice::GetCaretPositions()" ); + OSL_TRACE( "OutputDevice::GetCaretPositions()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if( nIndex >= rStr.Len() ) @@ -5820,7 +5820,7 @@ void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const String& rStr, xub_StrLen nIndex, xub_StrLen nLen ) { - DBG_TRACE( "OutputDevice::DrawStretchText()" ); + OSL_TRACE( "OutputDevice::DrawStretchText()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -6073,6 +6073,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 @@ -6131,28 +6183,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay } } - - // TODO: try to get the metric data from the GFB's mpFontEntry - ImplFontMetricData aSubstituteMetric( aFontSelData ); pFallbackFont->mnSetFontFlags = mpGraphics->SetFont( &aFontSelData, nFallbackLevel ); - mpGraphics->GetFontMetric( &aSubstituteMetric, nFallbackLevel ); - - const long nOriginalHeight = aOrigMetric.mnAscent + aOrigMetric.mnDescent; - const 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? - // TODO: should we scale by max-ascent/max-descent instead of design height? - if( nSubstituteHeight > nOriginalHeight ) - { - const float fScale = nOriginalHeight / (float)nSubstituteHeight; - const float fOrigHeight = aFontSelData.mfExactHeight; - const int nOrigHeight = aFontSelData.mnHeight; - aFontSelData.mfExactHeight *= fScale; - aFontSelData.mnHeight = static_cast<int>(aFontSelData.mfExactHeight); - pFallbackFont->mnSetFontFlags = mpGraphics->SetFont( &aFontSelData, nFallbackLevel ); - aFontSelData.mnHeight = nOrigHeight; - aFontSelData.mfExactHeight = fOrigHeight; - } // create and add glyph fallback layout to multilayout rLayoutArgs.ResetPos(); @@ -6161,6 +6192,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, @@ -6212,7 +6246,7 @@ xub_StrLen OutputDevice::GetTextBreak( const String& rStr, long nTextWidth, xub_StrLen nIndex, xub_StrLen nLen, long nCharExtra, sal_Bool /*TODO: bCellBreaking*/ ) const { - DBG_TRACE( "OutputDevice::GetTextBreak()" ); + OSL_TRACE( "OutputDevice::GetTextBreak()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); SalLayout* pSalLayout = ImplLayout( rStr, nIndex, nLen ); @@ -6248,7 +6282,7 @@ xub_StrLen OutputDevice::GetTextBreak( const String& rStr, long nTextWidth, xub_StrLen nIndex, xub_StrLen nLen, long nCharExtra ) const { - DBG_TRACE( "OutputDevice::GetTextBreak()" ); + OSL_TRACE( "OutputDevice::GetTextBreak()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); rHyphenatorPos = STRING_LEN; @@ -6582,7 +6616,7 @@ void OutputDevice::AddTextRectActions( const Rectangle& rRect, sal_uInt16 nStyle, GDIMetaFile& rMtf ) { - DBG_TRACE( "OutputDevice::AddTextRectActions( const Rectangle& )" ); + OSL_TRACE( "OutputDevice::AddTextRectActions( const Rectangle& )" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( !rOrigStr.Len() || rRect.IsEmpty() ) @@ -6624,7 +6658,7 @@ void OutputDevice::DrawText( const Rectangle& rRect, const String& rOrigStr, sal pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText; } - DBG_TRACE( "OutputDevice::DrawText( const Rectangle& )" ); + OSL_TRACE( "OutputDevice::DrawText( const Rectangle& )" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); bool bDecomposeTextRectAction = ( _pTextLayout != NULL ) && _pTextLayout->DecomposeTextRectAction(); @@ -6667,7 +6701,7 @@ Rectangle OutputDevice::GetTextRect( const Rectangle& rRect, TextRectInfo* pInfo, const ::vcl::ITextLayout* _pTextLayout ) const { - DBG_TRACE( "OutputDevice::GetTextRect()" ); + OSL_TRACE( "OutputDevice::GetTextRect()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Rectangle aRect = rRect; @@ -6806,7 +6840,7 @@ String OutputDevice::GetEllipsisString( const String& rOrigStr, long nMaxWidth, String OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, const XubString& rOrigStr, long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ) { - DBG_TRACE( "OutputDevice::ImplGetEllipsisString()" ); + OSL_TRACE( "OutputDevice::ImplGetEllipsisString()" ); String aStr = rOrigStr; xub_StrLen nIndex = _rLayout.GetTextBreak( aStr, nMaxWidth, 0, aStr.Len() ); @@ -6939,7 +6973,7 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const XubString& rStr, xub_StrLen nIndex, xub_StrLen nLen, sal_uInt16 nStyle, MetricVector* pVector, String* pDisplayText ) { - DBG_TRACE( "OutputDevice::DrawCtrlText()" ); + OSL_TRACE( "OutputDevice::DrawCtrlText()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( !IsDeviceOutputNecessary() || (nIndex >= rStr.Len()) ) @@ -7072,7 +7106,7 @@ long OutputDevice::GetCtrlTextWidth( const String& rStr, xub_StrLen nIndex, xub_StrLen nLen, sal_uInt16 nStyle ) const { - DBG_TRACE( "OutputDevice::GetCtrlTextSize()" ); + OSL_TRACE( "OutputDevice::GetCtrlTextSize()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( nStyle & TEXT_DRAW_MNEMONIC ) @@ -7131,7 +7165,7 @@ String OutputDevice::GetNonMnemonicString( const String& rStr, xub_StrLen& rMnem int OutputDevice::GetDevFontCount() const { - DBG_TRACE( "OutputDevice::GetDevFontCount()" ); + OSL_TRACE( "OutputDevice::GetDevFontCount()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if( !mpGetDevFontList ) @@ -7143,7 +7177,7 @@ int OutputDevice::GetDevFontCount() const FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const { - DBG_TRACE( "OutputDevice::GetDevFont()" ); + OSL_TRACE( "OutputDevice::GetDevFont()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); FontInfo aFontInfo; @@ -7175,7 +7209,7 @@ FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const sal_Bool OutputDevice::AddTempDevFont( const String& rFileURL, const String& rFontName ) { - DBG_TRACE( "OutputDevice::AddTempDevFont()" ); + OSL_TRACE( "OutputDevice::AddTempDevFont()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); ImplInitFontList(); @@ -7198,7 +7232,7 @@ sal_Bool OutputDevice::AddTempDevFont( const String& rFileURL, const String& rFo int OutputDevice::GetDevFontSizeCount( const Font& rFont ) const { - DBG_TRACE( "OutputDevice::GetDevFontSizeCount()" ); + OSL_TRACE( "OutputDevice::GetDevFontSizeCount()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); delete mpGetDevSizeList; @@ -7212,7 +7246,7 @@ int OutputDevice::GetDevFontSizeCount( const Font& rFont ) const Size OutputDevice::GetDevFontSize( const Font& rFont, int nSizeIndex ) const { - DBG_TRACE( "OutputDevice::GetDevFontSize()" ); + OSL_TRACE( "OutputDevice::GetDevFontSize()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); // check range @@ -7247,7 +7281,7 @@ Size OutputDevice::GetDevFontSize( const Font& rFont, int nSizeIndex ) const sal_Bool OutputDevice::IsFontAvailable( const String& rFontName ) const { - DBG_TRACE( "OutputDevice::IsFontAvailable()" ); + OSL_TRACE( "OutputDevice::IsFontAvailable()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); ImplDevFontListData* pFound = mpFontList->FindFontFamily( rFontName ); @@ -7258,7 +7292,7 @@ sal_Bool OutputDevice::IsFontAvailable( const String& rFontName ) const FontMetric OutputDevice::GetFontMetric() const { - DBG_TRACE( "OutputDevice::GetFontMetric()" ); + OSL_TRACE( "OutputDevice::GetFontMetric()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); FontMetric aMetric; @@ -7366,7 +7400,7 @@ SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, const XubString& rStr, xub_StrLen nIndex, xub_StrLen nLen, const sal_Int32* pDXAry) const { - DBG_TRACE( "OutputDevice::GetSysTextLayoutData()" ); + OSL_TRACE( "OutputDevice::GetSysTextLayoutData()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); SystemTextLayoutData aSysLayoutData; @@ -7414,7 +7448,7 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c long OutputDevice::GetMinKashida() const { - DBG_TRACE( "OutputDevice::GetMinKashida()" ); + OSL_TRACE( "OutputDevice::GetMinKashida()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if( mbNewFont && !ImplNewFont() ) return 0; @@ -7467,7 +7501,7 @@ xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt, // TODO: best is to get rid of this method completely sal_uLong OutputDevice::GetKerningPairCount() const { - DBG_TRACE( "OutputDevice::GetKerningPairCount()" ); + OSL_TRACE( "OutputDevice::GetKerningPairCount()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if( mbNewFont && !ImplNewFont() ) @@ -7493,7 +7527,7 @@ inline bool CmpKernData( const KerningPair& a, const KerningPair& b ) // TODO: best is to get rid of this method completely void OutputDevice::GetKerningPairs( sal_uLong nRequestedPairs, KerningPair* pKernPairs ) const { - DBG_TRACE( "OutputDevice::GetKerningPairs()" ); + OSL_TRACE( "OutputDevice::GetKerningPairs()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if( mbNewFont && !ImplNewFont() ) @@ -7516,7 +7550,7 @@ void OutputDevice::GetKerningPairs( sal_uLong nRequestedPairs, KerningPair* pKer sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) { - DBG_TRACE( "OutputDevice::GetGlyphBoundRect_CTL()" ); + OSL_TRACE( "OutputDevice::GetGlyphBoundRect_CTL()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); rVector.clear(); @@ -7542,7 +7576,7 @@ sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen, sal_uLong nLayoutWidth, const sal_Int32* pDXAry ) const { - DBG_TRACE( "OutputDevice::GetTextBoundRect()" ); + OSL_TRACE( "OutputDevice::GetTextBoundRect()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); sal_Bool bRet = sal_False; diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index 91d8845c7788..94226e863de5 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -606,7 +606,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, void OutputDevice::DrawGradient( const Rectangle& rRect, const Gradient& rGradient ) { - DBG_TRACE( "OutputDevice::DrawGradient()" ); + OSL_TRACE( "OutputDevice::DrawGradient()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rGradient, Gradient, NULL ); @@ -737,7 +737,7 @@ void OutputDevice::DrawGradient( const Rectangle& rRect, void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) { - DBG_TRACE( "OutputDevice::DrawGradient()" ); + OSL_TRACE( "OutputDevice::DrawGradient()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKOBJ( &rGradient, Gradient, NULL ); @@ -1004,7 +1004,7 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) { - DBG_TRACE( "OutputDevice::DrawHatch()" ); + OSL_TRACE( "OutputDevice::DrawHatch()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Hatch aHatch( rHatch ); diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index 539ecc0fa091..2df0ff86dc3e 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -51,7 +51,7 @@ DBG_NAMEEX( OutputDevice ) void OutputDevice::DrawRect( const Rectangle& rRect, sal_uLong nHorzRound, sal_uLong nVertRound ) { - DBG_TRACE( "OutputDevice::DrawRoundRect()" ); + OSL_TRACE( "OutputDevice::DrawRoundRect()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -110,7 +110,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect, void OutputDevice::DrawEllipse( const Rectangle& rRect ) { - DBG_TRACE( "OutputDevice::DrawEllipse()" ); + OSL_TRACE( "OutputDevice::DrawEllipse()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -161,7 +161,7 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect ) void OutputDevice::DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { - DBG_TRACE( "OutputDevice::DrawArc()" ); + OSL_TRACE( "OutputDevice::DrawArc()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -208,7 +208,7 @@ void OutputDevice::DrawArc( const Rectangle& rRect, void OutputDevice::DrawPie( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { - DBG_TRACE( "OutputDevice::DrawPie()" ); + OSL_TRACE( "OutputDevice::DrawPie()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) @@ -262,7 +262,7 @@ void OutputDevice::DrawPie( const Rectangle& rRect, void OutputDevice::DrawChord( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { - DBG_TRACE( "OutputDevice::DrawChord()" ); + OSL_TRACE( "OutputDevice::DrawChord()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); if ( mpMetaFile ) diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 4b63c47eca83..92898ebfdf3a 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -60,7 +60,7 @@ DBG_NAMEEX( OutputDevice ) void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLong nFlags ) { - DBG_TRACE( "OutputDevice::DrawGrid()" ); + OSL_TRACE( "OutputDevice::DrawGrid()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); Rectangle aDstRect( PixelToLogic( Point() ), GetOutputSize() ); @@ -159,7 +159,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency) { - DBG_TRACE( "OutputDevice::DrawTransparent(B2D&,transparency)" ); + OSL_TRACE( "OutputDevice::DrawTransparent(B2D&,transparency)" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); // AW: Do NOT paint empty PolyPolygons @@ -225,7 +225,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { - DBG_TRACE( "OutputDevice::DrawTransparent()" ); + OSL_TRACE( "OutputDevice::DrawTransparent()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); // short circuit for drawing an opaque polygon @@ -622,7 +622,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rTransparenceGradient ) { - DBG_TRACE( "OutputDevice::DrawTransparent()" ); + OSL_TRACE( "OutputDevice::DrawTransparent()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); const Color aBlack( COL_BLACK ); diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index d1b3bf8ac396..4ac1d4610b3f 100755 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -214,7 +214,7 @@ static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const Im } break; default: - OSL_ENSURE( 0, "unknown ImplControlValue type !" ); + OSL_FAIL( "unknown ImplControlValue type !" ); break; } return aResult; diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 143c55a83ab1..3e957d175897 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -830,7 +830,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa case( META_MASKSCALE_ACTION ): case( META_MASKSCALEPART_ACTION ): { - DBG_ERROR( "MetaMask...Action not supported yet" ); + OSL_TRACE( "MetaMask...Action not supported yet" ); } break; @@ -1051,7 +1051,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa if( !bAssertionFired ) { bAssertionFired = true; - DBG_ERROR( "PDFExport::ImplWriteActions: deprecated and unsupported MetaAction encountered" ); + OSL_TRACE( "PDFExport::ImplWriteActions: deprecated and unsupported MetaAction encountered" ); } break; } diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index b1eb2a268f5c..c277d16305e7 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -1458,7 +1458,7 @@ bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) co else { // if the type does not match something is awry - OSL_ENSURE( 0, "strange type in control dependency" ); + OSL_FAIL( "strange type in control dependency" ); bEnabled = false; } } @@ -1526,7 +1526,7 @@ rtl::OUString PrinterController::makeEnabled( const rtl::OUString& i_rProperty ) else { // if the type does not match something is awry - OSL_ENSURE( 0, "strange type in control dependency" ); + OSL_FAIL( "strange type in control dependency" ); } } } diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 421cd6a33f0a..1afa8840fcf3 100755 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -227,7 +227,7 @@ namespace vcl aTrace.append( ", " ); } aTrace.append( ")" ); - OSL_TRACE( aTrace.makeStringAndClear().getStr() ); + OSL_TRACE( "%s", aTrace.makeStringAndClear().getStr() ); } #endif return nTextWidth; diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index e7ec24ca87d2..981fc38b7375 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -139,7 +139,7 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount ) : mpVirDev( NULL ), meRefDevMode( REFDEV_NONE ) { - DBG_TRACE1( "VirtualDevice::VirtualDevice( %hu )", nBitCount ); + OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount ); ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount ); } @@ -150,7 +150,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount : mpVirDev( NULL ), meRefDevMode( REFDEV_NONE ) { - DBG_TRACE1( "VirtualDevice::VirtualDevice( %hu )", nBitCount ); + OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount ); ImplInitVirDev( &rCompDev, 1, 1, nBitCount ); } @@ -161,7 +161,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount : mpVirDev( NULL ), meRefDevMode( REFDEV_NONE ) { - DBG_TRACE1( "VirtualDevice::VirtualDevice( %hu )", nBitCount ); + OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount ); ImplInitVirDev( &rCompDev, 1, 1, nBitCount ); @@ -175,7 +175,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCo : mpVirDev( NULL ), meRefDevMode( REFDEV_NONE ) { - DBG_TRACE1( "VirtualDevice::VirtualDevice( %hu )", nBitCount ); + OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount ); ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount, pData ); } @@ -184,7 +184,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCo VirtualDevice::~VirtualDevice() { - DBG_TRACE( "VirtualDevice::~VirtualDevice()" ); + OSL_TRACE( "VirtualDevice::~VirtualDevice()" ); ImplSVData* pSVData = ImplGetSVData(); @@ -209,7 +209,7 @@ VirtualDevice::~VirtualDevice() sal_Bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, sal_Bool bErase ) { - DBG_TRACE3( "VirtualDevice::ImplSetOutputSizePixel( %ld, %ld, %d )", rNewSize.Width(), rNewSize.Height(), (int)bErase ); + OSL_TRACE( "VirtualDevice::ImplSetOutputSizePixel( %ld, %ld, %d )", rNewSize.Width(), rNewSize.Height(), (int)bErase ); if ( !mpVirDev ) return sal_False; diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 6a27dac4330f..52c80febe64b 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -39,6 +39,10 @@ #include "vcl/svapp.hxx" #include "vcl/outfont.hxx" #include "vcl/impfont.hxx" +#ifdef ENABLE_GRAPHITE +#include <graphite2/Font.h> +#include "vcl/graphite_layout.hxx" +#endif #include "tools/poly.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" @@ -137,7 +141,7 @@ static bool bEnableSizeFT = false; struct EqStr{ bool operator()(const char* a, const char* b) const { return !strcmp(a,b); } }; struct HashStr { size_t operator()( const char* s ) const { return rtl_str_hashCode(s); } }; -typedef ::boost::unordered_map<const char*,FtFontFile*,HashStr, EqStr> FontFileList; +typedef ::boost::unordered_map<const char*,boost::shared_ptr<FtFontFile>,HashStr, EqStr> FontFileList; namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } // ----------------------------------------------------------------------- @@ -212,12 +216,12 @@ FtFontFile* FtFontFile::FindFontFile( const ::rtl::OString& rNativeFileName ) FontFileList &rFontFileList = vclFontFileList::get(); FontFileList::const_iterator it = rFontFileList.find( pFileName ); if( it != rFontFileList.end() ) - return (*it).second; + return it->second.get(); // no => create new one FtFontFile* pFontFile = new FtFontFile( rNativeFileName ); pFileName = pFontFile->maNativeFileName.getStr(); - rFontFileList[ pFileName ] = pFontFile; + rFontFileList[pFileName].reset(pFontFile); return pFontFile; } @@ -290,6 +294,33 @@ void FtFontFile::Unmap() mpFileMap = NULL; } +#ifdef ENABLE_GRAPHITE +// wrap FtFontInfo's table function +const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, size_t *len) +{ + const FtFontInfo * pFontInfo = reinterpret_cast<const FtFontInfo*>(appFaceHandle); + typedef union { + char m_c[5]; + unsigned int m_id; + } TableId; + TableId tableId; + tableId.m_id = name; +#ifndef WORDS_BIGENDIAN + TableId swapped; + swapped.m_c[3] = tableId.m_c[0]; + swapped.m_c[2] = tableId.m_c[1]; + swapped.m_c[1] = tableId.m_c[2]; + swapped.m_c[0] = tableId.m_c[3]; + tableId.m_id = swapped.m_id; +#endif + tableId.m_c[4] = '\0'; + sal_uLong nLength = 0; + const void * pTable = static_cast<const void*>(pFontInfo->GetTable(tableId.m_c, &nLength)); + if (len) *len = static_cast<size_t>(nLength); + return pTable; +} +#endif + // ======================================================================= FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, @@ -301,6 +332,10 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, mnFaceNum( nFaceNum ), mnRefCount( 0 ), mnSynthetic( nSynthetic ), +#ifdef ENABLE_GRAPHITE + mbCheckedGraphite(false), + mpGraphiteFace(NULL), +#endif mnFontId( nFontId ), maDevFontAttributes( rDevFontAttributes ), mpFontCharMap( NULL ), @@ -326,6 +361,10 @@ FtFontInfo::~FtFontInfo() delete mpExtraKernInfo; delete mpChar2Glyph; delete mpGlyph2Char; +#ifdef ENABLE_GRAPHITE + if (mpGraphiteFace) + delete mpGraphiteFace; +#endif } void FtFontInfo::InitHashes() const @@ -354,6 +393,30 @@ FT_FaceRec_* FtFontInfo::GetFaceFT() return maFaceFT; } +#ifdef ENABLE_GRAPHITE +GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace() +{ + if (mbCheckedGraphite) + return mpGraphiteFace; + // test for graphite here so that it is cached most efficiently + if (GetTable("Silf", 0)) + { + int graphiteSegCacheSize = 10000; + static const char* pGraphiteCacheStr = getenv( "SAL_GRAPHITE_CACHE_SIZE" ); + graphiteSegCacheSize = pGraphiteCacheStr ? (atoi(pGraphiteCacheStr)) : 0; + gr_face * pGraphiteFace; + if (graphiteSegCacheSize > 500) + pGraphiteFace = gr_make_face_with_seg_cache(this, graphiteFontTable, graphiteSegCacheSize, gr_face_cacheCmap); + else + pGraphiteFace = gr_make_face(this, graphiteFontTable, gr_face_cacheCmap); + if (pGraphiteFace) + mpGraphiteFace = new GraphiteFaceWrapper(pGraphiteFace); + } + mbCheckedGraphite = true; + return mpGraphiteFace; +} +#endif + // ----------------------------------------------------------------------- void FtFontInfo::ReleaseFaceFT( FT_FaceRec_* pFaceFT ) @@ -525,25 +588,11 @@ void* FreetypeServerFont::GetFtFace() const FreetypeManager::~FreetypeManager() { - // an application about to exit can omit garbage collecting the heap - // since it makes things slower and introduces risks if the heap was not perfect - // for debugging, for memory grinding or leak checking the env allows to force GC - const char* pEnv = getenv( "SAL_FORCE_GC_ON_EXIT" ); - if( pEnv && (*pEnv != '0') ) - { - // cleanup container of fontinfos - for( FontList::const_iterator it = maFontList.begin(); it != maFontList.end(); ++it ) - { - FtFontInfo* pInfo = (*it).second; - delete pInfo; - } - maFontList.clear(); - -#if 0 // FT_Done_FreeType crashes on Solaris 10 - // TODO: check which versions have this problem - FT_Error rcFT = FT_Done_FreeType( aLibFT ); -#endif - } + ClearFontList(); +// This crashes on Solaris 10 +// TODO: check which versions have this problem +// +// FT_Error rcFT = FT_Done_FreeType( aLibFT ); } // ----------------------------------------------------------------------- @@ -720,6 +769,7 @@ FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontIn mpFontInfo( pFI ), maFaceFT( NULL ), maSizeFT( NULL ), + mpFontOptions( NULL ), mbFaceOk( false ), maRecodeConverter( NULL ), mpLayoutEngine( NULL ) @@ -865,9 +915,14 @@ FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontIn mnLoadFlags |= FT_LOAD_NO_BITMAP; } -void FreetypeServerFont::SetFontOptions( const ImplFontOptions& rFontOptions) +void FreetypeServerFont::SetFontOptions( const ImplFontOptions* pFontOptions) { - FontAutoHint eHint = rFontOptions.GetUseAutoHint(); + mpFontOptions = pFontOptions; + + if (!mpFontOptions) + return; + + FontAutoHint eHint = mpFontOptions->GetUseAutoHint(); if( eHint == AUTOHINT_DONTKNOW ) eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE; @@ -878,11 +933,11 @@ void FreetypeServerFont::SetFontOptions( const ImplFontOptions& rFontOptions) mnLoadFlags |= FT_LOAD_NO_HINTING; mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334# - if( rFontOptions.DontUseAntiAlias() ) + if( mpFontOptions->DontUseAntiAlias() ) mnPrioAntiAlias = 0; - if( rFontOptions.DontUseEmbeddedBitmaps() ) + if( mpFontOptions->DontUseEmbeddedBitmaps() ) mnPrioEmbedded = 0; - if( rFontOptions.DontUseHinting() ) + if( mpFontOptions->DontUseHinting() ) mnPrioAutoHint = 0; #if (FTVERSION >= 2005) || defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER) @@ -894,7 +949,7 @@ void FreetypeServerFont::SetFontOptions( const ImplFontOptions& rFontOptions) if( !(mnLoadFlags & FT_LOAD_NO_HINTING) && (nFTVERSION >= 2103)) { mnLoadFlags |= FT_LOAD_TARGET_NORMAL; - switch( rFontOptions.GetHintStyle() ) + switch( mpFontOptions->GetHintStyle() ) { case HINT_NONE: mnLoadFlags |= FT_LOAD_NO_HINTING; @@ -915,6 +970,11 @@ void FreetypeServerFont::SetFontOptions( const ImplFontOptions& rFontOptions) mnLoadFlags |= FT_LOAD_NO_BITMAP; } +const ImplFontOptions* FreetypeServerFont::GetFontOptions() const +{ + return mpFontOptions; +} + // ----------------------------------------------------------------------- bool FreetypeServerFont::TestFont() const diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx index b644fbace2da..caf8bfab1f9c 100644 --- a/vcl/source/glyphs/gcach_ftyp.hxx +++ b/vcl/source/glyphs/gcach_ftyp.hxx @@ -36,6 +36,10 @@ #include FT_FREETYPE_H class FreetypeServerFont; +#ifdef ENABLE_GRAPHITE +class GraphiteFaceWrapper; +#endif + struct FT_GlyphRec_; // ----------------------------------------------------------------------- @@ -81,6 +85,9 @@ public: const unsigned char* GetTable( const char*, sal_uLong* pLength=0 ) const; FT_FaceRec_* GetFaceFT(); +#ifdef ENABLE_GRAPHITE + GraphiteFaceWrapper* GetGraphiteFace(); +#endif void ReleaseFaceFT( FT_FaceRec_* ); const ::rtl::OString* GetFontFileName() const { return mpFontFile->GetFileName(); } @@ -108,7 +115,10 @@ private: const int mnFaceNum; int mnRefCount; const int mnSynthetic; - +#ifdef ENABLE_GRAPHITE + bool mbCheckedGraphite; + GraphiteFaceWrapper * mpGraphiteFace; +#endif sal_IntPtr mnFontId; ImplDevFontAttributes maDevFontAttributes; @@ -181,7 +191,8 @@ public: virtual int GetFontFaceNum() const { return mpFontInfo->GetFaceNum(); } virtual bool TestFont() const; virtual void* GetFtFace() const; - virtual void SetFontOptions( const ImplFontOptions&); + virtual void SetFontOptions( const ImplFontOptions*); + virtual const ImplFontOptions* GetFontOptions() const; virtual int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); } virtual bool NeedsArtificialBold() const { return mbArtBold; } virtual bool NeedsArtificialItalic() const { return mbArtItalic; } @@ -204,6 +215,9 @@ public: { return mpFontInfo->GetTable( pName, pLength ); } int GetEmUnits() const; const FT_Size_Metrics& GetMetricsFT() const { return maSizeFT->metrics; } +#ifdef ENABLE_GRAPHITE + GraphiteFaceWrapper* GetGraphiteFace() const { return mpFontInfo->GetGraphiteFace(); } +#endif protected: friend class GlyphCache; @@ -225,6 +239,8 @@ private: FT_FaceRec_* maFaceFT; FT_SizeRec_* maSizeFT; + const ImplFontOptions* mpFontOptions; + bool mbFaceOk; bool mbArtItalic; bool mbArtBold; diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx index 4374ad2f6b1b..deef658c0c56 100644 --- a/vcl/source/glyphs/glyphcache.cxx +++ b/vcl/source/glyphs/glyphcache.cxx @@ -71,6 +71,12 @@ GlyphCache::GlyphCache( GlyphCachePeer& rPeer ) GlyphCache::~GlyphCache() { InvalidateAllGlyphs(); + for( FontList::iterator it = maFontList.begin(), end = maFontList.end(); it != end; ++it ) + { + ServerFont* pServerFont = it->second; + mrPeer.RemovingFont(*pServerFont); + delete pServerFont; + } if( mpFtManager ) delete mpFtManager; } @@ -343,7 +349,7 @@ void GlyphCache::GarbageCollect() pServerFont->GarbageCollect( mnLruIndex+0x10000000 ); if( pServerFont == mpCurrentGCFont ) mpCurrentGCFont = NULL; - const ImplFontSelectData& rIFSD = pServerFont->GetFontSelData(); + const ImplFontSelectData& rIFSD = pServerFont->GetFontSelData(); maFontList.erase( rIFSD ); mrPeer.RemovingFont( *pServerFont ); mnBytesUsed -= pServerFont->GetByteCount(); @@ -528,8 +534,8 @@ bool ServerFont::IsGlyphInvisible( int nGlyphIndex ) ImplServerFontEntry::ImplServerFontEntry( ImplFontSelectData& rFSD ) : ImplFontEntry( rFSD ) , mpServerFont( NULL ) +, mpFontOptions( NULL ) , mbGotFontOptions( false ) -, mbValidFontOptions( false ) {} // ----------------------------------------------------------------------- @@ -537,6 +543,7 @@ ImplServerFontEntry::ImplServerFontEntry( ImplFontSelectData& rFSD ) ImplServerFontEntry::~ImplServerFontEntry() { // TODO: remove the ServerFont here instead of in the GlyphCache + delete mpFontOptions; } // ======================================================================= diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx deleted file mode 100644 index c1b9794927fc..000000000000 --- a/vcl/source/glyphs/graphite_adaptors.cxx +++ /dev/null @@ -1,339 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// Description: Implements the Graphite interfaces with access to the -// platform's font and graphics systems. - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" - -// We need this to enable namespace support in libgrengine headers. -#define GR_NAMESPACE - -// Header files -// -// Standard Library -#include <string> -#include <cassert> -// Libraries -#include <rtl/string.hxx> -#include <rtl/ustring.hxx> -#include <i18npool/mslangid.hxx> -// Platform -#ifndef WNT -#include <saldisp.hxx> - -#include <vcl/salgdi.hxx> - -#include <freetype/ftsynth.h> - -// Module -#include "gcach_ftyp.hxx" - -#include <vcl/graphite_features.hxx> -#include <vcl/graphite_adaptors.hxx> - -// Module private type definitions and forward declarations. -// -using gr::GrResult; -namespace -{ - inline float from_hinted(const int x) { - return static_cast<float>(x + 32) / 64.0; - } - typedef boost::unordered_map<long,bool> SilfMap; -} -extern FT_Error (*pFTEmbolden)(FT_GlyphSlot); -extern FT_Error (*pFTOblique)(FT_GlyphSlot); - -// class CharacterRenderProperties implentation. -// -FontProperties::FontProperties(const FreetypeServerFont &font) throw() -{ - clrFore = gr::kclrBlack; - clrBack = gr::kclrTransparent; - - pixHeight = from_hinted(font.GetMetricsFT().height); - - switch (font.GetFontSelData().meWeight) - { - case WEIGHT_SEMIBOLD: case WEIGHT_BOLD: - case WEIGHT_ULTRABOLD: case WEIGHT_BLACK: - fBold = true; - break; - default : - fBold = false; - } - - switch (font.GetFontSelData().meItalic) - { - case ITALIC_NORMAL: case ITALIC_OBLIQUE: - fItalic = true; - break; - default : - fItalic = false; - } - - // Get the font name, but prefix with file name hash in case - // there are 2 fonts on the system with the same face name - sal_Int32 nHashCode = font.GetFontFileName()->hashCode(); - ::rtl::OUStringBuffer nHashFaceName; - nHashFaceName.append(nHashCode, 16); - const sal_Unicode * name = font.GetFontSelData().maName.GetBuffer(); - nHashFaceName.append(name); - - const size_t name_sz = std::min(sizeof szFaceName/sizeof(wchar_t)-1, - static_cast<size_t>(nHashFaceName.getLength())); - - std::copy(nHashFaceName.getStr(), nHashFaceName.getStr() + name_sz, szFaceName); - szFaceName[name_sz] = '\0'; -} - -// class GraphiteFontAdaptor implementaion. -// -GraphiteFontAdaptor::GraphiteFontAdaptor(ServerFont & sfont, const sal_Int32 dpiX, const sal_Int32 dpiY) - : mrFont(static_cast<FreetypeServerFont &>(sfont)), - maFontProperties(static_cast<FreetypeServerFont &>(sfont)), - mnDpiX(dpiX), - mnDpiY(dpiY), - mfAscent(from_hinted(static_cast<FreetypeServerFont &>(sfont).GetMetricsFT().ascender)), - mfDescent(from_hinted(static_cast<FreetypeServerFont &>(sfont).GetMetricsFT().descender)), - mfEmUnits(static_cast<FreetypeServerFont &>(sfont).GetMetricsFT().y_ppem), - mpFeatures(NULL) -{ - const rtl::OString aLang = MsLangId::convertLanguageToIsoByteString( sfont.GetFontSelData().meLanguage ); - rtl::OString name = rtl::OUStringToOString( - sfont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 ); -#ifdef DEBUG - printf("GraphiteFontAdaptor %lx %s italic=%u bold=%u\n", (long)this, name.getStr(), - maFontProperties.fItalic, maFontProperties.fBold); -#endif - sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; - if (nFeat > 0) - { - rtl::OString aFeat = name.copy(nFeat, name.getLength() - nFeat); - mpFeatures = new grutils::GrFeatureParser(*this, aFeat.getStr(), aLang.getStr()); -#ifdef DEBUG - printf("GraphiteFontAdaptor %s/%s/%s %x language %d features %d errors\n", - rtl::OUStringToOString( sfont.GetFontSelData().maName, - RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( sfont.GetFontSelData().maTargetName, - RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( sfont.GetFontSelData().maSearchName, - RTL_TEXTENCODING_UTF8 ).getStr(), - sfont.GetFontSelData().meLanguage, - (int)mpFeatures->getFontFeatures(NULL), mpFeatures->parseErrors()); -#endif - } - else - { - mpFeatures = new grutils::GrFeatureParser(*this, aLang.getStr()); - } -} - -GraphiteFontAdaptor::GraphiteFontAdaptor(const GraphiteFontAdaptor &rhs) throw() - : Font(rhs), - mrFont (rhs.mrFont), maFontProperties(rhs.maFontProperties), - mnDpiX(rhs.mnDpiX), mnDpiY(rhs.mnDpiY), - mfAscent(rhs.mfAscent), mfDescent(rhs.mfDescent), mfEmUnits(rhs.mfEmUnits), - mpFeatures(NULL) -{ - if (rhs.mpFeatures) mpFeatures = new grutils::GrFeatureParser(*(rhs.mpFeatures)); -} - - -GraphiteFontAdaptor::~GraphiteFontAdaptor() throw() -{ - maGlyphMetricMap.clear(); - if (mpFeatures) delete mpFeatures; - mpFeatures = NULL; -} - -void GraphiteFontAdaptor::UniqueCacheInfo(std::wstring & face_name_out, bool & bold_out, bool & italic_out) -{ - face_name_out = maFontProperties.szFaceName; - bold_out = maFontProperties.fBold; - italic_out = maFontProperties.fItalic; -} - -bool GraphiteFontAdaptor::IsGraphiteEnabledFont(ServerFont & font) throw() -{ - static SilfMap sSilfMap; - // NOTE: this assumes that the same FTFace pointer won't be reused, - // so FtFontInfo::ReleaseFaceFT must only be called at shutdown. - FreetypeServerFont & aFtFont = dynamic_cast<FreetypeServerFont &>(font); - FT_Face aFace = reinterpret_cast<FT_FaceRec_*>(aFtFont.GetFtFace()); - SilfMap::iterator i = sSilfMap.find(reinterpret_cast<long>(aFace)); - if (i != sSilfMap.end()) - { -#ifdef DEBUG - if (static_cast<bool>(aFtFont.GetTable("Silf", 0)) != (*i).second) - printf("Silf cache font mismatch\n"); -#endif - return (*i).second; - } - bool bHasSilf = aFtFont.GetTable("Silf", 0); - sSilfMap[reinterpret_cast<long>(aFace)] = bHasSilf; - return bHasSilf; -} - - -gr::Font * GraphiteFontAdaptor::copyThis() { - return new GraphiteFontAdaptor(*this); -} - - -unsigned int GraphiteFontAdaptor::getDPIx() { - return mnDpiX; -} - - -unsigned int GraphiteFontAdaptor::getDPIy() { - return mnDpiY; -} - - -float GraphiteFontAdaptor::ascent() { - return mfAscent; -} - - -float GraphiteFontAdaptor::descent() { - return mfDescent; -} - - -bool GraphiteFontAdaptor::bold() { - return maFontProperties.fBold; -} - - -bool GraphiteFontAdaptor::italic() { - return maFontProperties.fItalic; -} - - -float GraphiteFontAdaptor::height() { - return maFontProperties.pixHeight; -} - - -void GraphiteFontAdaptor::getFontMetrics(float * ascent_out, float * descent_out, float * em_square_out) { - if (ascent_out) *ascent_out = mfAscent; - if (descent_out) *descent_out = mfDescent; - if (em_square_out) *em_square_out = mfEmUnits; -} - - -const void * GraphiteFontAdaptor::getTable(gr::fontTableId32 table_id, size_t * buffer_sz) -{ - char tag_name[5] = {char(table_id >> 24), char(table_id >> 16), char(table_id >> 8), char(table_id), 0}; - sal_uLong temp = *buffer_sz; - - const void * const tbl_buf = static_cast<FreetypeServerFont &>(mrFont).GetTable(tag_name, &temp); - *buffer_sz = temp; - - return tbl_buf; -} - -#define fix26_6(x) (x >> 6) + (x & 32 ? (x > 0 ? 1 : 0) : (x < 0 ? -1 : 0)) - -// Return the glyph's metrics in pixels. -void GraphiteFontAdaptor::getGlyphMetrics(gr::gid16 nGlyphId, gr::Rect & aBounding, gr::Point & advances) -{ - // There used to be problems when orientation was set however, this no - // longer seems to be the case and the Glyph Metric cache in - // FreetypeServerFont is more efficient since it lasts between calls to VCL -#if 1 - const GlyphMetric & metric = mrFont.GetGlyphMetric(nGlyphId); - - aBounding.right = aBounding.left = metric.GetOffset().X(); - aBounding.bottom = aBounding.top = -metric.GetOffset().Y(); - aBounding.right += metric.GetSize().Width(); - aBounding.bottom -= metric.GetSize().Height(); - - advances.x = metric.GetDelta().X(); - advances.y = -metric.GetDelta().Y(); - -#else - // The problem with the code below is that the cache only lasts - // as long as the life time of the GraphiteFontAdaptor, which - // is created once per call to X11SalGraphics::GetTextLayout - GlyphMetricMap::const_iterator gm_itr = maGlyphMetricMap.find(nGlyphId); - if (gm_itr != maGlyphMetricMap.end()) - { - // We've cached the results from last time. - aBounding = gm_itr->second.first; - advances = gm_itr->second.second; - } - else - { - // We need to look up the glyph. - FT_Int nLoadFlags = mrFont.GetLoadFlags(); - - FT_Face aFace = reinterpret_cast<FT_Face>(mrFont.GetFtFace()); - if (!aFace) - { - aBounding.top = aBounding.bottom = aBounding.left = aBounding.right = 0; - advances.x = advances.y = 0; - return; - } - FT_Error aStatus = -1; - aStatus = FT_Load_Glyph(aFace, nGlyphId, nLoadFlags); - if( aStatus != FT_Err_Ok || (!aFace->glyph)) - { - aBounding.top = aBounding.bottom = aBounding.left = aBounding.right = 0; - advances.x = advances.y = 0; - return; - } - // check whether we need synthetic bold/italic otherwise metric is wrong - if (mrFont.NeedsArtificialBold() && pFTEmbolden) - (*pFTEmbolden)(aFace->glyph); - - if (mrFont.NeedsArtificialItalic() && pFTOblique) - (*pFTOblique)(aFace->glyph); - - const FT_Glyph_Metrics &gm = aFace->glyph->metrics; - - // Fill out the bounding box an advances. - aBounding.top = aBounding.bottom = fix26_6(gm.horiBearingY); - aBounding.bottom -= fix26_6(gm.height); - aBounding.left = aBounding.right = fix26_6(gm.horiBearingX); - aBounding.right += fix26_6(gm.width); - advances.x = fix26_6(gm.horiAdvance); - advances.y = 0; - - // Now add an entry to our metrics map. - maGlyphMetricMap[nGlyphId] = std::make_pair(aBounding, advances); - } -#endif -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx deleted file mode 100644 index b3f48aa1c476..000000000000 --- a/vcl/source/glyphs/graphite_cache.cxx +++ /dev/null @@ -1,201 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" - -#ifdef WNT -#include <tools/svwin.h> -#include <svsys.h> -#endif - -#include <tools/debug.hxx> -#include <vcl/sallayout.hxx> - -#include <graphite/GrClient.h> -#include <graphite/Segment.h> - -#include <rtl/ustring.hxx> -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_cache.hxx> - -#include "graphite_textsrc.hxx" - -GrSegRecord::GrSegRecord(rtl::OUString * rope, TextSourceAdaptor * textSrc, gr::Segment * seg, bool bIsRtl) - : m_rope(rope), m_text(textSrc), m_seg(seg), m_nextKey(NULL), - m_fontScale(0.0f), mbIsRtl(bIsRtl), m_lockCount(0) -{ - m_pStr = textSrc->getLayoutArgs().mpStr + seg->startCharacter(); - m_startChar = seg->startCharacter(); -} - -GrSegRecord::~GrSegRecord() -{ - clear(); -} - -void GrSegRecord::reuse(rtl::OUString * rope, TextSourceAdaptor * textSrc, gr::Segment * seg, bool bIsRtl) -{ - clear(); - mnWidth = 0; - m_rope = rope; - m_text = textSrc; - m_seg = seg; - m_nextKey = NULL; - m_pStr = textSrc->getLayoutArgs().mpStr + seg->startCharacter(); - m_startChar = seg->startCharacter(); - mbIsRtl = bIsRtl; -} - -void GrSegRecord::clearVectors() -{ - mvGlyphs.clear(); - mvCharDxs.clear(); - mvChar2BaseGlyph.clear(); - mvGlyph2Char.clear(); -} - -void GrSegRecord::clear() -{ -#ifdef GR_DEBUG_TEXT - if (m_lockCount != 0) - OutputDebugString("GrSegRecord locked!"); -#endif - clearVectors(); - delete m_rope; - delete m_seg; - delete m_text; - m_rope = NULL; - m_seg = NULL; - m_text = NULL; - m_fontScale = 0.0f; - m_lockCount = 0; -} - -GrSegRecord * GraphiteSegmentCache::cacheSegment(TextSourceAdaptor * adapter, gr::Segment * seg, bool bIsRtl) -{ - GrSegRecord * record = NULL; - // We keep a record of the oldest key and the last key added - // when the next key is added, the record for the prevKey's m_nextKey field - // is updated to the newest key so that m_oldestKey can be updated to the - // next oldest key when the record for m_oldestKey is deleted - if (m_segMap.size() > m_nSegCacheSize) - { - GraphiteSegMap::iterator oldestPair = m_segMap.find(reinterpret_cast<long>(m_oldestKey)); - // oldest record may no longer exist if a buffer was changed - if (oldestPair != m_segMap.end()) - { - record = oldestPair->second; - m_segMap.erase(reinterpret_cast<long>(m_oldestKey)); - GrRMEntry range = m_ropeMap.equal_range((*(record->m_rope)).hashCode()); - while (range.first != range.second) - { - if (range.first->second == record) - { - m_ropeMap.erase(range.first); - break; - } - ++range.first; - } - m_oldestKey = record->m_nextKey; - // record will be reused, so don't delete - } - } - - -// const int seg_char_limit = min(adapter->maLayoutArgs().mnLength, -// adapter->maLayoutArgs().mnEndCharPos -// + GraphiteLayout::EXTRA_CONTEXT_LENGTH); -// if (seg->stopCharacter() - seg->startCharacter() <= 0) -// OutputDebugString("Invalid seg indices\n"); - rtl::OUString * pRope = new rtl::OUString(adapter->getLayoutArgs().mpStr + seg->startCharacter(), - seg->stopCharacter() - seg->startCharacter()); - if (!pRope) return NULL; - bool reuse = false; - if (record) - record->reuse(pRope, adapter, seg, bIsRtl); - else - record = new GrSegRecord(pRope, adapter, seg, bIsRtl); - if (!record) - { - delete pRope; - return NULL; - } - GraphiteSegMap::iterator iMap = - m_segMap.find(reinterpret_cast<long>(record->m_pStr)); - if (iMap != m_segMap.end()) - { - // the buffer has changed, so the old cached Segment is useless - reuse = true; - GrSegRecord * found = iMap->second; - // Note: we reuse the old next key to avoid breaking our history - // chain. This means it will be prematurely deleted, but this is - // unlikely to happen very often. - record->m_nextKey = found->m_nextKey; - // overwrite the old record - m_segMap[reinterpret_cast<long>(record->m_pStr)] = record; - // erase the old rope key and save the new one - GrRMEntry range = m_ropeMap.equal_range((*(found->m_rope)).hashCode()); - while (range.first != range.second) - { - if (range.first->second == found) - { - m_ropeMap.erase(range.first); - break; - } - ++range.first; - } - GraphiteRopeMap::value_type mapEntry(record->m_rope->hashCode(), record); - m_ropeMap.insert(mapEntry); - // remove the old record - delete found; - record->m_lockCount++; - return record; - } - m_segMap[reinterpret_cast<long>(record->m_pStr)] = record; - GraphiteRopeMap::value_type mapEntry((*(record->m_rope)).hashCode(), record); - m_ropeMap.insert(mapEntry); - - if (m_oldestKey == NULL) - { - m_oldestKey = record->m_pStr; - m_prevKey = record->m_pStr; - } - else if (reuse == false) - { - DBG_ASSERT(m_segMap.count(reinterpret_cast<long>(m_prevKey)), - "Previous key got lost somehow!"); - m_segMap.find(reinterpret_cast<long>(m_prevKey)) - ->second->m_nextKey = record->m_pStr; - m_prevKey = record->m_pStr; - } - record->m_lockCount++; - return record; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx index a49505d7d9e5..c5b578f4cc97 100644 --- a/vcl/source/glyphs/graphite_features.cxx +++ b/vcl/source/glyphs/graphite_features.cxx @@ -49,79 +49,107 @@ const char GrFeatureParser::FEAT_PREFIX = ':'; const char GrFeatureParser::FEAT_SEPARATOR = '&'; const char GrFeatureParser::FEAT_ID_VALUE_SEPARATOR = '='; -GrFeatureParser::GrFeatureParser(gr::Font & font, const std::string lang) - : mnNumSettings(0), mbErrors(false) +GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString lang) + : mnNumSettings(0), mbErrors(false), mpSettings(NULL) { - maLang.rgch[0] = maLang.rgch[1] = maLang.rgch[2] = maLang.rgch[3] = '\0'; - setLang(font, lang); + maLang.label[0] = maLang.label[1] = maLang.label[2] = maLang.label[3] = '\0'; + setLang(pFace, lang); } -GrFeatureParser::GrFeatureParser(gr::Font & font, const std::string features, const std::string lang) - : mnNumSettings(0), mbErrors(false) +GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString features, const ::rtl::OString lang) + : mnNumSettings(0), mbErrors(false), mpSettings(NULL) { - size_t nEquals = 0; - size_t nFeatEnd = 0; - size_t pos = 0; - maLang.rgch[0] = maLang.rgch[1] = maLang.rgch[2] = maLang.rgch[3] = '\0'; - setLang(font, lang); - while (pos < features.length() && mnNumSettings < MAX_FEATURES) + sal_Int32 nEquals = 0; + sal_Int32 nFeatEnd = 0; + sal_Int32 pos = 0; + maLang.num = 0u; + setLang(pFace, lang); + while ((pos < features.getLength()) && (mnNumSettings < MAX_FEATURES)) { - nEquals = features.find(FEAT_ID_VALUE_SEPARATOR,pos); - if (nEquals == std::string::npos) + nEquals = features.indexOf(FEAT_ID_VALUE_SEPARATOR, pos); + if (nEquals == -1) { mbErrors = true; break; } // check for a lang=xxx specification - if (features.compare(pos, nEquals - pos, "lang") == 0) + const ::rtl::OString aLangPrefix("lang"); + if (features.match(aLangPrefix, pos )) { pos = nEquals + 1; - nFeatEnd = features.find(FEAT_SEPARATOR, pos); - if (nFeatEnd == std::string::npos) + nFeatEnd = features.indexOf(FEAT_SEPARATOR, pos); + if (nFeatEnd == -1) { - nFeatEnd = features.length(); + nFeatEnd = features.getLength(); } if (nFeatEnd - pos > 3) mbErrors = true; else { - gr::isocode aLang = maLang; - for (size_t i = pos; i < nFeatEnd; i++) - aLang.rgch[i-pos] = features[i]; - std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported - = font.getSupportedLanguages(); - gr::LanguageIterator iL = aSupported.first; - while (iL != aSupported.second) + FeatId aLang = maLang; + aLang.num = 0; + for (sal_Int32 i = pos; i < nFeatEnd; i++) + aLang.label[i-pos] = features[i]; + + //ext_std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported + // = font.getSupportedLanguages(); + //gr::LanguageIterator iL = aSupported.first; + unsigned short i = 0; + for (; i < gr_face_n_languages(pFace); i++) { - gr::isocode aSupportedLang = *iL; + gr_uint32 nFaceLang = gr_face_lang_by_index(pFace, i); + FeatId aSupportedLang; + aSupportedLang.num = nFaceLang; +#ifdef __BIG_ENDIAN__ // here we only expect full 3 letter codes - if (aLang.rgch[0] == aSupportedLang.rgch[0] && - aLang.rgch[1] == aSupportedLang.rgch[1] && - aLang.rgch[2] == aSupportedLang.rgch[2] && - aLang.rgch[3] == aSupportedLang.rgch[3]) break; - ++iL; + if (aLang.label[0] == aSupportedLang.label[0] && + aLang.label[1] == aSupportedLang.label[1] && + aLang.label[2] == aSupportedLang.label[2] && + aLang.label[3] == aSupportedLang.label[3]) +#else + if (aLang.label[0] == aSupportedLang.label[3] && + aLang.label[1] == aSupportedLang.label[2] && + aLang.label[2] == aSupportedLang.label[1] && + aLang.label[3] == aSupportedLang.label[0]) +#endif + { + maLang = aSupportedLang; + break; + } + } + if (i == gr_face_n_languages(pFace)) mbErrors = true; + else + { + mnHash = maLang.num; + mpSettings = gr_face_featureval_for_lang(pFace, maLang.num); } - if (iL == aSupported.second) mbErrors = true; - else maLang = aLang; } } else { + sal_uInt32 featId = 0; if (isCharId(features, pos, nEquals - pos)) - maSettings[mnNumSettings].id = getCharId(features, pos, nEquals - pos); - else maSettings[mnNumSettings].id = getIntValue(features, pos, nEquals - pos); - pos = nEquals + 1; - nFeatEnd = features.find(FEAT_SEPARATOR, pos); - if (nFeatEnd == std::string::npos) { - nFeatEnd = features.length(); + featId = getCharId(features, pos, nEquals - pos); } - if (isCharId(features, pos, nFeatEnd - pos)) - maSettings[mnNumSettings].value = getCharId(features, pos, nFeatEnd - pos); else - maSettings[mnNumSettings].value= getIntValue(features, pos, nFeatEnd - pos); - if (isValid(font, maSettings[mnNumSettings])) + { + featId = getIntValue(features, pos, nEquals - pos); + } + const gr_feature_ref * pFref = gr_face_find_fref(pFace, featId); + pos = nEquals + 1; + nFeatEnd = features.indexOf(FEAT_SEPARATOR, pos); + if (nFeatEnd == -1) + { + nFeatEnd = features.getLength(); + } + sal_Int16 featValue = 0; + featValue = getIntValue(features, pos, nFeatEnd - pos); + if (pFref && gr_fref_set_feature_value(pFref, featValue, mpSettings)) + { + mnHash = (mnHash << 16) ^ ((featId << 8) | featValue); mnNumSettings++; + } else mbErrors = true; } @@ -129,89 +157,76 @@ GrFeatureParser::GrFeatureParser(gr::Font & font, const std::string features, co } } -void GrFeatureParser::setLang(gr::Font & font, const std::string & lang) +void GrFeatureParser::setLang(const gr_face * pFace, const rtl::OString & lang) { - gr::isocode aLang = {{0,0,0,0}}; - if (lang.length() > 2) + FeatId aLang; + aLang.num = 0; + if (lang.getLength() >= 2) { - for (size_t i = 0; i < lang.length() && i < 3; i++) + for (sal_Int32 i = 0; i < lang.getLength() && i < 3; i++) { if (lang[i] == '-') break; - aLang.rgch[i] = lang[i]; + aLang.label[i] = lang[i]; } - std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported - = font.getSupportedLanguages(); - gr::LanguageIterator iL = aSupported.first; - while (iL != aSupported.second) + unsigned short i = 0; + for (; i < gr_face_n_languages(pFace); i++) { - gr::isocode aSupportedLang = *iL; - if (aLang.rgch[0] == aSupportedLang.rgch[0] && - aLang.rgch[1] == aSupportedLang.rgch[1] && - aLang.rgch[2] == aSupportedLang.rgch[2] && - aLang.rgch[3] == aSupportedLang.rgch[3]) break; - ++iL; - } - if (iL != aSupported.second) - maLang = aLang; -#ifdef DEBUG - else - printf("%s has no features\n", aLang.rgch); + gr_uint32 nFaceLang = gr_face_lang_by_index(pFace, i); + FeatId aSupportedLang; + aSupportedLang.num = nFaceLang; + // here we only expect full 2 & 3 letter codes +#ifdef __BIG_ENDIAN__ + if (aLang.label[0] == aSupportedLang.label[0] && + aLang.label[1] == aSupportedLang.label[1] && + aLang.label[2] == aSupportedLang.label[2] && + aLang.label[3] == aSupportedLang.label[3]) +#else + if (aLang.label[0] == aSupportedLang.label[3] && + aLang.label[1] == aSupportedLang.label[2] && + aLang.label[2] == aSupportedLang.label[1] && + aLang.label[3] == aSupportedLang.label[0]) #endif + { + maLang = aSupportedLang; + break; + } + } + if (i != gr_face_n_languages(pFace)) + { + if (mpSettings) + gr_featureval_destroy(mpSettings); + mpSettings = gr_face_featureval_for_lang(pFace, maLang.num); + mnHash = maLang.num; + } } -} - -GrFeatureParser::GrFeatureParser(const GrFeatureParser & aCopy) - : maLang(aCopy.maLang), mbErrors(aCopy.mbErrors) -{ - mnNumSettings = aCopy.getFontFeatures(maSettings); + if (!mpSettings) + mpSettings = gr_face_featureval_for_lang(pFace, 0); } GrFeatureParser::~GrFeatureParser() { -} - -size_t GrFeatureParser::getFontFeatures(gr::FeatureSetting settings[64]) const -{ - if (settings) - { - std::copy(maSettings, maSettings + mnNumSettings, settings); - } - return mnNumSettings; -} - -bool GrFeatureParser::isValid(gr::Font & font, gr::FeatureSetting & setting) -{ - gr::FeatureIterator i = font.featureWithID(setting.id); - if (font.getFeatures().second == i) + if (mpSettings) { - return false; + gr_featureval_destroy(mpSettings); + mpSettings = NULL; } - std::pair< gr::FeatureSettingIterator, gr::FeatureSettingIterator > - validValues = font.getFeatureSettings(i); - gr::FeatureSettingIterator j = validValues.first; - while (j != validValues.second) - { - if (*j == setting.value) return true; - ++j; - } - return false; } -bool GrFeatureParser::isCharId(const std::string & id, size_t offset, size_t length) +bool GrFeatureParser::isCharId(const rtl::OString & id, size_t offset, size_t length) { if (length > 4) return false; for (size_t i = 0; i < length; i++) { if (i > 0 && id[offset+i] == '\0') continue; - if ((id[offset+i]) < 0x20 || (id[offset+i]) < 0) + if ((id[offset+i] < 0x20) || (id[offset+i] < 0)) return false; - if (i==0 && id[offset+i] < 0x41) + if (i==0 && (id[offset+i] < 0x41)) return false; } return true; } -int GrFeatureParser::getCharId(const std::string & id, size_t offset, size_t length) +gr_uint32 GrFeatureParser::getCharId(const rtl::OString & id, size_t offset, size_t length) { FeatId charId; charId.num = 0; @@ -229,9 +244,9 @@ int GrFeatureParser::getCharId(const std::string & id, size_t offset, size_t len return charId.num; } -int GrFeatureParser::getIntValue(const std::string & id, size_t offset, size_t length) +short GrFeatureParser::getIntValue(const rtl::OString & id, size_t offset, size_t length) { - int value = 0; + short value = 0; int sign = 1; for (size_t i = 0; i < length; i++) { @@ -271,18 +286,4 @@ int GrFeatureParser::getIntValue(const std::string & id, size_t offset, size_t l return value; } - -sal_Int32 GrFeatureParser::hashCode() const -{ - union IsoHash { sal_Int32 mInt; gr::isocode mCode; }; - IsoHash isoHash; - isoHash.mCode = maLang; - sal_Int32 hash = isoHash.mInt; - for (size_t i = 0; i < mnNumSettings; i++) - { - hash = (hash << 16) ^ ((maSettings[i].id << 8) | maSettings[i].value); - } - return hash; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 0fb1d824a17f..76db71bfb0dc 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -37,8 +37,9 @@ // Enable lots of debug info #ifdef DEBUG +#include <cstdio> //#define GRLAYOUT_DEBUG 1 -//#undef NDEBUG +#undef NDEBUG #endif // Header files @@ -57,10 +58,6 @@ #include <svsys.h> #endif -#ifdef UNX -#include <vcl/graphite_adaptors.hxx> -#endif - #include <vcl/salgdi.hxx> #include <unicode/uchar.h> @@ -68,16 +65,10 @@ #include <unicode/uscript.h> // Graphite Libraries (must be after vcl headers on windows) -#include <graphite/GrClient.h> -#include <graphite/Font.h> -#include <graphite/ITextSource.h> -#include <graphite/Segment.h> -#include <graphite/SegmentPainter.h> - -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_features.hxx> -#include "graphite_textsrc.hxx" +#include <graphite2/Segment.h> +#include "vcl/graphite_layout.hxx" +#include "vcl/graphite_features.hxx" // Module private type definitions and forward declarations. // @@ -85,48 +76,38 @@ // #ifdef GRLAYOUT_DEBUG -FILE * grLogFile = NULL; -FILE * grLog() +static FILE * grLogFile = NULL; +static FILE * grLog() { #ifdef WNT std::string logFileName(getenv("TEMP")); - logFileName.append("\\graphitelayout.log"); + logFileName.append("/graphitelayout.log"); if (grLogFile == NULL) grLogFile = fopen(logFileName.c_str(),"w"); else fflush(grLogFile); return grLogFile; #else + fflush(stdout); return stdout; #endif } #endif -#ifdef GRCACHE -#include <vcl/graphite_cache.hxx> -#endif - - namespace { - typedef std::pair<gr::GlyphIterator, gr::GlyphIterator> glyph_range_t; - typedef std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> glyph_set_range_t; - inline long round(const float n) { return long(n + (n < 0 ? -0.5 : 0.5)); } - template<typename T> inline bool in_range(const T i, const T b, const T e) { return !(b > i) && i < e; } - template<typename T> inline bool is_subrange(const T sb, const T se, const T b, const T e) { return !(b > sb || se > e); } - template<typename T> inline bool is_subrange(const std::pair<T, T> &s, const T b, const T e) { return is_subrange(s.first, s.second, b, e); @@ -149,9 +130,18 @@ namespace return limit; } -} // namespace - + template <typename T> + T maximum(T a, T b) + { + return (a > b)? a : b; + } + template <typename T> + T minimum(T a, T b) + { + return (a < b)? a : b; + } +} // namespace // Impementation of the GraphiteLayout::Glyphs container class. // This is an extended vector class with methods added to enable @@ -160,412 +150,368 @@ namespace // o manipulations that affect neighouring glyphs. const int GraphiteLayout::EXTRA_CONTEXT_LENGTH = 10; -#ifdef GRCACHE -GraphiteCacheHandler GraphiteCacheHandler::instance; -#endif + +// find first slot of cluster and first slot of subsequent cluster +static void findFirstClusterSlot(const gr_slot* base, gr_slot const** first, gr_slot const** after, int * firstChar, int * lastChar, bool bRtl) +{ + if (gr_slot_attached_to(base) == NULL) + { + *first = base; + *after = (bRtl)? gr_slot_prev_in_segment(base) : + gr_slot_next_in_segment(base); + *firstChar = gr_slot_before(base); + *lastChar = gr_slot_after(base); + } + const gr_slot * attachment = gr_slot_first_attachment(base); + while (attachment) + { + if (gr_slot_origin_X(*first) > gr_slot_origin_X(attachment)) + *first = attachment; + const gr_slot* attachmentNext = (bRtl)? + gr_slot_prev_in_segment(attachment) : gr_slot_next_in_segment(attachment); + if (attachmentNext) + { + if (*after && (gr_slot_origin_X(*after) < gr_slot_origin_X(attachmentNext))) + *after = attachmentNext; + } + else + { + *after = NULL; + } + if (gr_slot_before(attachment) < *firstChar) + *firstChar = gr_slot_before(attachment); + if (gr_slot_after(attachment) > *lastChar) + *lastChar = gr_slot_after(attachment); + if (gr_slot_first_attachment(attachment)) + findFirstClusterSlot(attachment, first, after, firstChar, lastChar, bRtl); + attachment = gr_slot_next_sibling_attachment(attachment); + } +} // The Graphite glyph stream is really a sequence of glyph attachment trees -// each rooted at a non-attached base glyph. fill_from walks the glyph stream -// find each non-attached base glyph and calls append to record them as a +// each rooted at a non-attached base glyph. fill_from walks the glyph stream, +// finds each non-attached base glyph and calls append to record them as a // sequence of clusters. void -GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs, - bool bRtl, long &rWidth, float fScaling, std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char, std::vector<int> & rCharDxs) +GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fScaling) { - // Create a glyph item for each of the glyph and append it to the base class glyph list. - typedef std::pair< gr::GlyphSetIterator, gr::GlyphSetIterator > GrGlyphSet; - int nChar = rArgs.mnEndCharPos - rArgs.mnMinCharPos; - glyph_range_t iGlyphs = rSegment.glyphs(); - int nGlyphs = iGlyphs.second - iGlyphs.first; - float fSegmentAdvance = rSegment.advanceWidth(); - float fMinX = fSegmentAdvance; + bool bRtl = (rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL); + int nCharRequested = rArgs.mnEndCharPos - rArgs.mnMinCharPos; + int nChar = gr_seg_n_cinfo(pSegment); + float fMinX = gr_seg_advance_X(pSegment); float fMaxX = 0.0f; - rGlyph2Char.assign(nGlyphs, -1); - long nDxOffset = 0; - int nGlyphIndex = (bRtl)? (nGlyphs - 1) : 0; - // OOo always expects the glyphs in ltr order - int nDelta = (bRtl)? -1 : 1; - - int nLastGlyph = (bRtl)? nGlyphs - 1: 0; - int nNextChar = (bRtl)? (rSegment.stopCharacter() - 1) : rSegment.startCharacter();//rArgs.mnMinCharPos; - // current glyph number (Graphite glyphs) - //int currGlyph = 0; - int nFirstCharInCluster = nNextChar; - int nFirstGlyphInCluster = nLastGlyph; - - // ltr first char in cluster is lowest, same is true for rtl - // ltr first glyph in cluster is lowest, rtl first glyph is highest - - // loop over the glyphs determining which characters are linked to them - gr::GlyphIterator gi; - for (gi = iGlyphs.first + nGlyphIndex; - nGlyphIndex >= 0 && nGlyphIndex < nGlyphs; - nGlyphIndex+= nDelta, gi = iGlyphs.first + nGlyphIndex) + long nDxOffset = 0; // from dropped glyphs + int nFirstCharInCluster = 0; + int nLastCharInCluster = 0; + unsigned int nGlyphs = gr_seg_n_slots(pSegment); + mvGlyph2Char.assign(nGlyphs, -1); + mvGlyphs.reserve(nGlyphs); + + if (bRtl) { - gr::GlyphInfo info = (*gi); -#ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"Glyph %d %f,%f\n", (int)info.logicalIndex(), info.origin(), info.yOffset()); -#endif - // the last character associated with this glyph is after - // our current cluster buffer position - if ((bRtl && ((signed)info.firstChar() <= nNextChar)) || - (!bRtl && ((signed)info.lastChar() >= nNextChar))) + const gr_slot* baseSlot = gr_seg_last_slot(pSegment); + // find first base + while (baseSlot && (gr_slot_attached_to(baseSlot) != NULL)) + baseSlot = gr_slot_prev_in_segment(baseSlot); + int iChar = nChar - 1; + int iNextChar = nChar - 1; + bool reordered = false; + int nBaseGlyphIndex = 0; + // now loop over bases + while (baseSlot) { - if ((bRtl && nGlyphIndex < nLastGlyph) || - (!bRtl && nGlyphIndex > nLastGlyph)) + bool bCluster = !reordered; + const gr_slot * clusterFirst = NULL; + const gr_slot * clusterAfter = NULL; + int firstChar = -1; + int lastChar = -1; + findFirstClusterSlot(baseSlot, &clusterFirst, &clusterAfter, &firstChar, &lastChar, bRtl); + iNextChar = minimum<int>(firstChar, iNextChar); + if (bCluster) { - // this glyph is after the previous one left->right - // if insertion is allowed before it then we are in a - // new cluster - int nAttachedBase = (*(info.attachedClusterBase())).logicalIndex(); - if (!info.isAttached() || - !in_range(nAttachedBase, nFirstGlyphInCluster, nGlyphIndex)) + nBaseGlyphIndex = mvGlyphs.size(); + mvGlyph2Char[nBaseGlyphIndex] = iChar + mnSegCharOffset; + nFirstCharInCluster = firstChar; + nLastCharInCluster = lastChar; + } + else + { + mvGlyph2Char[mvGlyphs.size()] = firstChar + mnSegCharOffset; + nFirstCharInCluster = minimum<int>(firstChar, nFirstCharInCluster); + nLastCharInCluster = maximum<int>(firstChar, nLastCharInCluster); + } + float leftBoundary = gr_slot_origin_X(clusterFirst); + float rightBoundary = (clusterAfter)? + gr_slot_origin_X(clusterAfter) : gr_seg_advance_X(pSegment); + if ( + lastChar < iChar && + (gr_cinfo_after(gr_seg_cinfo(pSegment, iChar)) > + static_cast<int>(gr_slot_index(clusterAfter))) + ) + { + reordered = true; + } + else + { + reordered = false; + iChar = iNextChar - 1; + } + if (mnSegCharOffset + nFirstCharInCluster >= mnMinCharPos && + mnSegCharOffset + nFirstCharInCluster < mnEndCharPos) + { + fMinX = minimum<float>(fMinX, leftBoundary); + fMaxX = maximum<float>(fMaxX, rightBoundary); + if (!reordered) { - if (in_range(nFirstCharInCluster, rArgs.mnMinCharPos, rArgs.mnEndCharPos) && - nFirstGlyphInCluster != nGlyphIndex) + for (int i = nFirstCharInCluster; i <= nLastCharInCluster; i++) { - std::pair <float,float> aBounds = - appendCluster(rSegment, rArgs, bRtl, - fSegmentAdvance, nFirstCharInCluster, - nNextChar, nFirstGlyphInCluster, nGlyphIndex, fScaling, - rChar2Base, rGlyph2Char, rCharDxs, nDxOffset); - fMinX = std::min(aBounds.first, fMinX); - fMaxX = std::max(aBounds.second, fMaxX); + if (mnSegCharOffset + i >= mnEndCharPos) + break; + // from the point of view of the dx array, the xpos is + // the origin of the first glyph of the cluster rtl + mvCharDxs[mnSegCharOffset + i - mnMinCharPos] = + static_cast<int>(leftBoundary * fScaling) + nDxOffset; + mvCharBreaks[mnSegCharOffset + i - mnMinCharPos] = gr_cinfo_break_weight(gr_seg_cinfo(pSegment, i)); } - nFirstCharInCluster = (bRtl)? info.lastChar() : info.firstChar(); - nFirstGlyphInCluster = nGlyphIndex; + mvChar2BaseGlyph[mnSegCharOffset + nFirstCharInCluster - mnMinCharPos] = nBaseGlyphIndex; } - nLastGlyph = (bRtl)? std::min(nGlyphIndex, nAttachedBase) : - std::max(nGlyphIndex, nAttachedBase); + append(pSegment, rArgs, baseSlot, rightBoundary, fScaling, + nDxOffset, bCluster, mnSegCharOffset + firstChar); + } + if (mnSegCharOffset + nLastCharInCluster < mnMinCharPos) + break; + baseSlot = gr_slot_next_sibling_attachment(baseSlot); + } + } + else + { + const gr_slot* baseSlot = gr_seg_first_slot(pSegment); + // find first base + while (baseSlot && (gr_slot_attached_to(baseSlot) != NULL)) + baseSlot = gr_slot_next_in_segment(baseSlot); + int iChar = 0; // relative to segment + int iNextChar = 0; + bool reordered = false; + int nBaseGlyphIndex = 0; + // now loop over bases + while (baseSlot) + { + bool bCluster = !reordered; + const gr_slot * clusterFirst = NULL; + const gr_slot * clusterAfter = NULL; + int firstChar = -1; + int lastChar = -1; + findFirstClusterSlot(baseSlot, &clusterFirst, &clusterAfter, &firstChar, &lastChar, bRtl); + iNextChar = maximum<int>(lastChar, iNextChar); + if (bCluster) + { + nBaseGlyphIndex = mvGlyphs.size(); + mvGlyph2Char[nBaseGlyphIndex] = iChar + mnSegCharOffset; + nFirstCharInCluster = firstChar; + nLastCharInCluster = lastChar; } - // loop over chacters associated with this glyph and characters - // between nextChar and the last character associated with this glyph - // giving them the current cluster id. This allows for character /glyph - // order reversal. - // For each character we do a reverse glyph id look up - // and store the glyph id with the highest logical index in nLastGlyph - while ((bRtl && ((signed)info.firstChar() <= nNextChar)) || - (!bRtl && (signed)info.lastChar() >= nNextChar)) + else { - GrGlyphSet charGlyphs = rSegment.charToGlyphs(nNextChar); - nNextChar += nDelta; - gr::GlyphSetIterator gj = charGlyphs.first; - while (gj != charGlyphs.second) - { - nLastGlyph = (bRtl)? min(nLastGlyph, (signed)(*gj).logicalIndex()) : max(nLastGlyph, (signed)(*gj).logicalIndex()); - ++gj; - } + mvGlyph2Char[mvGlyphs.size()] = firstChar + mnSegCharOffset; + nFirstCharInCluster = minimum<int>(firstChar, nFirstCharInCluster); + nLastCharInCluster = maximum<int>(lastChar, nLastCharInCluster); } - // Loop over attached glyphs and make sure they are all in the cluster since you - // can have glyphs attached with another base glyph in between - glyph_set_range_t iAttached = info.attachedClusterGlyphs(); - for (gr::GlyphSetIterator agi = iAttached.first; agi != iAttached.second; ++agi) + if ( + firstChar > iChar && + (gr_cinfo_before(gr_seg_cinfo(pSegment, iChar)) > + static_cast<int>(gr_slot_index(clusterFirst))) + ) { - nLastGlyph = (bRtl)? min(nLastGlyph, (signed)(*agi).logicalIndex()) : max(nLastGlyph, (signed)(*agi).logicalIndex()); + reordered = true; } - - // if this is a rtl attached glyph, then we need to include its - // base in the cluster, which will have a lower graphite index - if (bRtl) + else + { + reordered = false; + iChar = iNextChar + 1; + } + float leftBoundary = gr_slot_origin_X(clusterFirst); + float rightBoundary = (clusterAfter)? + gr_slot_origin_X(clusterAfter) : gr_seg_advance_X(pSegment); + if (mnSegCharOffset + nFirstCharInCluster >= mnMinCharPos && + mnSegCharOffset + nFirstCharInCluster < mnEndCharPos) { - if ((signed)info.attachedClusterBase()->logicalIndex() < nLastGlyph) + fMinX = minimum<float>(fMinX, leftBoundary); + fMaxX = maximum<float>(fMaxX, rightBoundary); + if (!reordered) { - nLastGlyph = info.attachedClusterBase()->logicalIndex(); + for (int i = nFirstCharInCluster; i <= nLastCharInCluster; i++) + { + if (mnSegCharOffset + i >= mnEndCharPos) + break; + // from the point of view of the dx array, the xpos is + // the origin of the first glyph of the next cluster ltr + mvCharDxs[mnSegCharOffset + i - mnMinCharPos] = + static_cast<int>(rightBoundary * fScaling) + nDxOffset; + mvCharBreaks[mnSegCharOffset + i - mnMinCharPos] = gr_cinfo_break_weight(gr_seg_cinfo(pSegment, i)); + } + // only set mvChar2BaseGlyph for first character of cluster + mvChar2BaseGlyph[mnSegCharOffset + nFirstCharInCluster - mnMinCharPos] = nBaseGlyphIndex; } + append(pSegment, rArgs, baseSlot, rightBoundary, fScaling, + nDxOffset, true, mnSegCharOffset + firstChar); } + if (mnSegCharOffset + nFirstCharInCluster >= mnEndCharPos) + break; + baseSlot = gr_slot_next_sibling_attachment(baseSlot); } - - // it is possible for the lastChar to be after nextChar and - // firstChar to be before the nFirstCharInCluster in rare - // circumstances e.g. Myanmar word for cemetery - if ((bRtl && ((signed)info.lastChar() > nFirstCharInCluster)) || - (!bRtl && ((signed)info.firstChar() < nFirstCharInCluster))) - { - nFirstCharInCluster = info.firstChar(); - } - } - // process last cluster - if (in_range(nFirstCharInCluster, rArgs.mnMinCharPos, rArgs.mnEndCharPos) && - nFirstGlyphInCluster != nGlyphIndex) - { - std::pair <float,float> aBounds = - appendCluster(rSegment, rArgs, bRtl, fSegmentAdvance, - nFirstCharInCluster, nNextChar, - nFirstGlyphInCluster, nGlyphIndex, fScaling, - rChar2Base, rGlyph2Char, rCharDxs, nDxOffset); - fMinX = std::min(aBounds.first, fMinX); - fMaxX = std::max(aBounds.second, fMaxX); } long nXOffset = round(fMinX * fScaling); - rWidth = round(fMaxX * fScaling) - nXOffset + nDxOffset; - if (rWidth < 0) + mnWidth = round(fMaxX * fScaling) - nXOffset + nDxOffset; + if (mnWidth < 0) { // This can happen when there was no base inside the range - rWidth = 0; + mnWidth = 0; } // fill up non-base char dx with cluster widths from previous base glyph if (bRtl) { - if (rCharDxs[nChar-1] == -1) - rCharDxs[nChar-1] = 0; + if (mvCharDxs[nCharRequested-1] == -1) + mvCharDxs[nCharRequested-1] = 0; else - rCharDxs[nChar-1] -= nXOffset; - for (int i = nChar - 2; i >= 0; i--) + mvCharDxs[nCharRequested-1] -= nXOffset; + for (int i = nCharRequested - 2; i >= 0; i--) { - if (rCharDxs[i] == -1) rCharDxs[i] = rCharDxs[i+1]; - else rCharDxs[i] -= nXOffset; + if (mvCharDxs[i] == -1) mvCharDxs[i] = mvCharDxs[i+1]; + else mvCharDxs[i] -= nXOffset; } } else { - if (rCharDxs[0] == -1) - rCharDxs[0] = 0; + if (mvCharDxs[0] == -1) + mvCharDxs[0] = 0; else - rCharDxs[0] -= nXOffset; - for (int i = 1; i < nChar; i++) + mvCharDxs[0] -= nXOffset; + for (int i = 1; i < nCharRequested; i++) { - if (rCharDxs[i] == -1) rCharDxs[i] = rCharDxs[i-1]; - else rCharDxs[i] -= nXOffset; - } - } + if (mvCharDxs[i] == -1) mvCharDxs[i] = mvCharDxs[i-1]; + else mvCharDxs[i] -= nXOffset; #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"Glyphs xOff%ld dropDx%ld w%ld\n", nXOffset, nDxOffset, rWidth); + fprintf(grLog(),"%d,%d ", (int)i, (int)mvCharDxs[i]); #endif - // remove offset due to context if there is one - if (nXOffset != 0) - { - for (size_t i = 0; i < size(); i++) - (*this)[i].maLinearPos.X() -= nXOffset; - } -} - -std::pair<float,float> GraphiteLayout::Glyphs::appendCluster(gr::Segment& rSeg, - ImplLayoutArgs & rArgs, bool bRtl,float fSegmentAdvance, - int nFirstCharInCluster, int nNextChar, int nFirstGlyphInCluster, - int nNextGlyph, float fScaling, std::vector<int> & rChar2Base, - std::vector<int> & rGlyph2Char, std::vector<int> & rCharDxs, long & rDXOffset) -{ - glyph_range_t iGlyphs = rSeg.glyphs(); - int nGlyphs = iGlyphs.second - iGlyphs.first; - int nDelta = (bRtl)? -1 : 1; - gr::GlyphInfo aFirstGlyph = *(iGlyphs.first + nFirstGlyphInCluster); - std::pair <float, float> aBounds; - aBounds.first = aFirstGlyph.origin(); - aBounds.second = aFirstGlyph.origin(); - // before we add the glyphs to this vector, we record the - // glyph's index in the vector (which is not the same as - // the Segment's glyph index!) - assert(size() < rGlyph2Char.size()); - rChar2Base[nFirstCharInCluster-rArgs.mnMinCharPos] = size(); - rGlyph2Char[size()] = nFirstCharInCluster; - - // can we break before this cluster? - // Glyphs may have either a positive or negative breakWeight refering to - // the position after or before the glyph respectively - int nPrevBreakWeight = 0; - if (nFirstGlyphInCluster > 0) - { - nPrevBreakWeight = (iGlyphs.first + (nFirstGlyphInCluster - 1))->breakweight(); - } - int nBreakWeight = aFirstGlyph.breakweight(); - if (nBreakWeight < 0) - { - // negative means it applies to the position before the glyph's character - nBreakWeight *= -1; - if (nPrevBreakWeight > 0 && nPrevBreakWeight < nBreakWeight) - { - // prevBreakWeight wins - nBreakWeight = nPrevBreakWeight; } } - else - { - nBreakWeight = 0; - // positive means break after - if (nPrevBreakWeight > 0) - nBreakWeight = nPrevBreakWeight; - } - if (nBreakWeight > gr::klbNoBreak/*0*/ && - // nBreakWeight <= gr::klbHyphenBreak) // uses Graphite hyphenation - nBreakWeight <= gr::klbLetterBreak) // Needed for issue 111272 - { - if (nBreakWeight < gr::klbHyphenBreak) - rChar2Base[nFirstCharInCluster-rArgs.mnMinCharPos] |= WORD_BREAK_BEFORE; - else - rChar2Base[nFirstCharInCluster-rArgs.mnMinCharPos] |= HYPHEN_BREAK_BEFORE; - } - // always allow a break before a space even if graphite doesn't - if (rArgs.mpStr[nFirstCharInCluster] == 0x20) - rChar2Base[nFirstCharInCluster-rArgs.mnMinCharPos] |= WORD_BREAK_BEFORE; - - bool bBaseGlyph = true; - for (int j = nFirstGlyphInCluster; - j != nNextGlyph; j += nDelta) - { - long nNextOrigin; - float fNextOrigin; - gr::GlyphInfo aGlyph = *(iGlyphs.first + j); - if (j + nDelta >= nGlyphs || j + nDelta < 0) // at rhs ltr,rtl - { - fNextOrigin = fSegmentAdvance; - nNextOrigin = round(fSegmentAdvance * fScaling + rDXOffset); - aBounds.second = std::max(fSegmentAdvance, aBounds.second); - } - else - { - gr::GlyphInfo aNextGlyph = *(iGlyphs.first + j + nDelta); - fNextOrigin = std::max(aNextGlyph.attachedClusterBase()->origin(), aNextGlyph.origin()); - aBounds.second = std::max(fNextOrigin, aBounds.second); - nNextOrigin = round(fNextOrigin * fScaling + rDXOffset); - } - aBounds.first = std::min(aGlyph.origin(), aBounds.first); - if ((signed)aGlyph.firstChar() < rArgs.mnEndCharPos && - (signed)aGlyph.firstChar() >= rArgs.mnMinCharPos) - { - rCharDxs[aGlyph.firstChar()-rArgs.mnMinCharPos] = nNextOrigin; - } - if ((signed)aGlyph.attachedClusterBase()->logicalIndex() == j) - { - append(rSeg, rArgs, aGlyph, fNextOrigin, fScaling, rChar2Base, rGlyph2Char, rCharDxs, rDXOffset, bBaseGlyph); - bBaseGlyph = false; - } - } - // from the point of view of the dx array, the xpos is - // the origin of the first glyph of the next cluster ltr - // rtl it is the origin of the 1st glyph of the cluster - long nXPos = (bRtl)? - round(aFirstGlyph.attachedClusterBase()->origin() * fScaling) + rDXOffset : - round(aBounds.second * fScaling) + rDXOffset; - // force the last char in range to have the width of the cluster - if (bRtl) - { - for (int n = nNextChar + 1; n <= nFirstCharInCluster; n++) - { - if ((n < rArgs.mnEndCharPos) && (n >= rArgs.mnMinCharPos)) - rCharDxs[n-rArgs.mnMinCharPos] = nXPos; - } - } - else + // remove offset due to context if there is one + if (nXOffset != 0) { - for (int n = nNextChar - 1; n >= nFirstCharInCluster; n--) - { - if (n < rArgs.mnEndCharPos && n >= rArgs.mnMinCharPos) - rCharDxs[n-rArgs.mnMinCharPos] = nXPos; - } + for (size_t i = 0; i < mvGlyphs.size(); i++) + mvGlyphs[i].maLinearPos.X() -= nXOffset; } #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"Cluster g[%d-%d) c[%d-%d)%x x%ld y%f bw%d\n", nFirstGlyphInCluster, nNextGlyph, nFirstCharInCluster, nNextChar, rArgs.mpStr[nFirstCharInCluster], nXPos, aFirstGlyph.yOffset(), nBreakWeight); + fprintf(grLog(), "fillFrom %d glyphs offset %ld width %d\n", mvGlyphs.size(), nXOffset, mnWidth); #endif - return aBounds; } // append walks an attachment tree, flattening it, and converting it into a // sequence of GlyphItem objects which we can later manipulate. void -GraphiteLayout::Glyphs::append(gr::Segment &segment, ImplLayoutArgs &args, gr::GlyphInfo & gi, float nextGlyphOrigin, float scaling, std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char, std::vector<int> & rCharDxs, long & rDXOffset, bool bIsBase) +GraphiteLayout::append(gr_segment *pSeg, ImplLayoutArgs &rArgs, + const gr_slot * gi, float nextGlyphOrigin, float scaling, long & rDXOffset, + bool bIsBase, int baseChar) { + bool bRtl = (rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL); float nextOrigin = nextGlyphOrigin; - int firstChar = std::min(gi.firstChar(), gi.lastChar()); - assert(size() < rGlyph2Char.size()); - if (!bIsBase) rGlyph2Char[size()] = firstChar; + assert(gi); + assert(gr_slot_before(gi) <= gr_slot_after(gi)); + int firstChar = gr_slot_before(gi) + mnSegCharOffset; + assert(mvGlyphs.size() < mvGlyph2Char.size()); + if (!bIsBase) mvGlyph2Char[mvGlyphs.size()] = baseChar;//firstChar; // is the next glyph attached or in the next cluster? - glyph_set_range_t iAttached = gi.attachedClusterGlyphs(); - if (iAttached.first != iAttached.second) + //glyph_set_range_t iAttached = gi.attachedClusterGlyphs(); + const gr_slot * pFirstAttached = gr_slot_first_attachment(gi); + if (pFirstAttached) { - nextOrigin = iAttached.first->origin(); + nextOrigin = gr_slot_origin_X(pFirstAttached); } - long glyphId = gi.glyphID(); + long glyphId = gr_slot_gid(gi); long deltaOffset = 0; - int glyphWidth = round(nextOrigin * scaling) - round(gi.origin() * scaling); + int scaledGlyphPos = round(gr_slot_origin_X(gi) * scaling); + int glyphWidth = round(nextOrigin * scaling) - scaledGlyphPos; + if (glyphWidth < 0) + glyphWidth = 0; #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"c%d g%d gWidth%d x%f ", firstChar, (int)gi.logicalIndex(), glyphWidth, nextOrigin); + fprintf(grLog(),"c%d g%ld,X%d W%d nX%f ", firstChar, glyphId, + (int)(gr_slot_origin_X(gi) * scaling), glyphWidth, nextOrigin * scaling); #endif if (glyphId == 0) { - args.NeedFallback( - firstChar, - gr::RightToLeftDir(gr::DirCode(gi.directionality()))); - if( (SAL_LAYOUT_FOR_FALLBACK & args.mnFlags )) + rArgs.NeedFallback(firstChar, bRtl); + if( (SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags )) { glyphId = GF_DROPPED; deltaOffset -= glyphWidth; glyphWidth = 0; } } - else if(args.mnFlags & SAL_LAYOUT_FOR_FALLBACK) + else if(rArgs.mnFlags & SAL_LAYOUT_FOR_FALLBACK) { #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"fallback c%d %x in run %d\n", firstChar, args.mpStr[firstChar], - args.maRuns.PosIsInAnyRun(firstChar)); + fprintf(grLog(),"fallback c%d %x in run %d\n", firstChar, rArgs.mpStr[firstChar], + rArgs.maRuns.PosIsInAnyRun(firstChar)); #endif // glyphs that aren't requested for fallback will be taken from base // layout, so mark them as dropped (should this wait until Simplify(false) is called?) - if (!args.maRuns.PosIsInAnyRun(firstChar) && - in_range(firstChar, args.mnMinCharPos, args.mnEndCharPos)) + if (!rArgs.maRuns.PosIsInAnyRun(firstChar) && + in_range(firstChar, rArgs.mnMinCharPos, rArgs.mnEndCharPos)) { glyphId = GF_DROPPED; deltaOffset -= glyphWidth; glyphWidth = 0; } } - // append this glyph. + // append this glyph. Set the cluster flag if this glyph is attached to another long nGlyphFlags = bIsBase ? 0 : GlyphItem::IS_IN_CLUSTER; - // directionality seems to be unreliable - //nGlyphFlags |= gr::RightToLeftDir(gr::DirCode(gi.attachedClusterBase()->directionality())) ? GlyphItem::IS_RTL_GLYPH : 0; - nGlyphFlags |= (gi.directionLevel() & 0x1)? GlyphItem::IS_RTL_GLYPH : 0; - GlyphItem aGlyphItem(size(),//gi.logicalIndex(), + nGlyphFlags |= (bRtl)? GlyphItem::IS_RTL_GLYPH : 0; + GlyphItem aGlyphItem(mvGlyphs.size(), glyphId, - Point(round(gi.origin() * scaling + rDXOffset), - round((-gi.yOffset() * scaling) - segment.AscentOffset()* scaling)), + Point(scaledGlyphPos + rDXOffset, + round((-gr_slot_origin_Y(gi) * scaling))), nGlyphFlags, glyphWidth); - aGlyphItem.mnOrigWidth = round(gi.advanceWidth() * scaling); - push_back(aGlyphItem); + if (glyphId != static_cast<long>(GF_DROPPED)) + aGlyphItem.mnOrigWidth = round(gr_slot_advance_X(gi, mpFace, mpFont) * scaling); + mvGlyphs.push_back(aGlyphItem); // update the offset if this glyph was dropped rDXOffset += deltaOffset; - // Recursively apply append all the attached glyphs. - for (gr::GlyphSetIterator agi = iAttached.first; agi != iAttached.second; ++agi) + // Recursively append all the attached glyphs. + for (const gr_slot * agi = gr_slot_first_attachment(gi); agi != NULL; + agi = gr_slot_next_sibling_attachment(agi)) { - if (agi + 1 == iAttached.second) - append(segment, args, *agi, nextGlyphOrigin, scaling, rChar2Base, rGlyph2Char,rCharDxs, rDXOffset, false); + if (gr_slot_next_sibling_attachment(agi) == NULL) + append(pSeg, rArgs, agi, nextGlyphOrigin, scaling, rDXOffset, + false, baseChar); else - append(segment, args, *agi, (agi + 1)->origin(), scaling, rChar2Base, rGlyph2Char, rCharDxs, rDXOffset, false); + append(pSeg, rArgs, agi, gr_slot_origin_X(gr_slot_next_sibling_attachment(agi)), + scaling, rDXOffset, false, baseChar); } } // // An implementation of the SalLayout interface to enable Graphite enabled fonts to be used. // -GraphiteLayout::GraphiteLayout(const gr::Font & font, const grutils::GrFeatureParser * pFeatures) throw() - : mpTextSrc(0), - mrFont(font), +GraphiteLayout::GraphiteLayout(const gr_face * face, gr_font * font, + const grutils::GrFeatureParser * pFeatures) throw() + : mpFace(face), + mpFont(font), mnWidth(0), mfScaling(1.0), mpFeatures(pFeatures) { - // Line settings can have subtle affects on space handling - // since we don't really know whether it is the end of a line or just a run - // in the middle, it is hard to know what to set them to. - // If true, it can cause end of line spaces to be hidden e.g. Doulos SIL - maLayout.setStartOfLine(false); - maLayout.setEndOfLine(false); - maLayout.setDumbFallback(true); - // trailing ws doesn't seem to always take affect if end of line is true - maLayout.setTrailingWs(gr::ktwshAll); -#ifdef GRLAYOUT_DEBUG - gr::ScriptDirCode aDirCode = font.getSupportedScriptDirections(); - fprintf(grLog(),"GraphiteLayout scripts %x %lx\n", aDirCode, long(this)); -#endif -} +} GraphiteLayout::~GraphiteLayout() throw() { clear(); - // the features are owned by the platform layers + // the features and font are owned by the platform layers mpFeatures = NULL; + mpFont = NULL; } void GraphiteLayout::clear() @@ -577,12 +523,7 @@ void GraphiteLayout::clear() mvChar2BaseGlyph.clear(); mvGlyph2Char.clear(); -#ifndef GRCACHE - delete mpTextSrc; -#endif - // Reset the state to the empty state. - mpTextSrc=0; mnWidth = 0; // Don't reset the scaling, because it is set before LayoutText } @@ -590,28 +531,7 @@ void GraphiteLayout::clear() // This method shouldn't be called on windows, since it needs the dc reset bool GraphiteLayout::LayoutText(ImplLayoutArgs & rArgs) { -#ifdef GRCACHE - GrSegRecord * pSegRecord = NULL; - gr::Segment * pSegment = NULL; - // Graphite can in rare cases crash with a zero length - if (rArgs.mnMinCharPos < rArgs.mnEndCharPos) - { - pSegment = CreateSegment(rArgs, &pSegRecord); - if (!pSegment) - return false; - } - else - { - clear(); - return true; - } - // layout the glyphs as required by OpenOffice - bool success = LayoutGlyphs(rArgs, pSegment, pSegRecord); - - if (pSegRecord) pSegRecord->unlock(); - else delete pSegment; -#else - gr::Segment * pSegment = NULL; + gr_segment * pSegment = NULL; bool success = true; if (rArgs.mnMinCharPos < rArgs.mnEndCharPos) { @@ -619,88 +539,25 @@ bool GraphiteLayout::LayoutText(ImplLayoutArgs & rArgs) if (!pSegment) return false; success = LayoutGlyphs(rArgs, pSegment); - if (pSegment) delete pSegment; + if (pSegment) + { + gr_seg_destroy(pSegment); + pSegment = NULL; + } } else { clear(); } -#endif return success; } -#ifdef GRCACHE -class GrFontHasher : public gr::Font -{ -public: - GrFontHasher(const gr::Font & aFont) : gr::Font(aFont), mrRealFont(const_cast<gr::Font&>(aFont)) {}; - ~GrFontHasher(){}; - virtual bool bold() { return mrRealFont.bold(); }; - virtual bool italic() { return mrRealFont.italic(); }; - virtual float ascent() { return mrRealFont.ascent(); }; - virtual float descent() { return mrRealFont.descent(); }; - virtual float height() { return mrRealFont.height(); }; - virtual gr::Font* copyThis() { return mrRealFont.copyThis(); }; - virtual unsigned int getDPIx() { return mrRealFont.getDPIx(); }; - virtual unsigned int getDPIy() { return mrRealFont.getDPIy(); }; - virtual const void* getTable(gr::fontTableId32 nId, size_t* nSize) - { return mrRealFont.getTable(nId,nSize); } - virtual void getFontMetrics(float*pA, float*pB, float*pC) { mrRealFont.getFontMetrics(pA,pB,pC); }; - - sal_Int32 hashCode(const grutils::GrFeatureParser * mpFeatures) - { - // is this sufficient? - std::wstring aFace; - bool bBold; - bool bItalic; - UniqueCacheInfo(aFace, bBold, bItalic); - sal_Unicode uName[32]; // max length used in gr::Font - // Note: graphite stores font names as UTF-16 even if wchar_t is 32bit - // this conversion should be OK. - for (size_t i = 0; i < aFace.size() && i < 32; i++) - { - uName[i] = aFace[i]; - } - size_t iSize = aFace.size(); - if (0 == iSize) return 0; - sal_Int32 hash = rtl_ustr_hashCode_WithLength(uName, iSize); - hash ^= static_cast<sal_Int32>(height()); - hash |= (bBold)? 0x1000000 : 0; - hash |= (bItalic)? 0x2000000 : 0; - if (mpFeatures) - hash ^= mpFeatures->hashCode(); -#ifdef GRLAYOUT_DEBUG - fprintf(grLog(), "font hash %x size %f\n", (int)hash, height()); -#endif - return hash; - }; -protected: - virtual void UniqueCacheInfo( std::wstring& stuFace, bool& fBold, bool& fItalic ) - { -#ifdef WIN32 - dynamic_cast<GraphiteWinFont&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic); -#else -#ifdef UNX - dynamic_cast<GraphiteFontAdaptor&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic); -#else -#error Unknown base type for gr::Font::UniqueCacheInfo -#endif -#endif - } -private: - gr::Font & mrRealFont; -}; -#endif -#ifdef GRCACHE -gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs, GrSegRecord ** pSegRecord) -#else -gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) -#endif +gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) { assert(rArgs.mnLength >= 0); - gr::Segment * pSegment = NULL; + gr_segment * pSegment = NULL; // Set the SalLayouts values to be the inital ones. SalLayout::AdjustLayout(rArgs); @@ -715,89 +572,47 @@ gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) { // Don't set RTL if font doesn't support it otherwise it forces rtl on // everything - if (bRtl && (mrFont.getSupportedScriptDirections() & gr::kfsdcHorizRtl)) - maLayout.setRightToLeft(bRtl); + //if (bRtl && (mrFont.getSupportedScriptDirections() & gr::kfsdcHorizRtl)) + // maLayout.setRightToLeft(bRtl); // Context is often needed beyond the specified end, however, we don't // want it if there has been a direction change, since it is hard // to tell between reordering within one direction and multi-directional // text. Extra context, can also cause problems with ligatures stradling // a hyphenation point, so disable if CTL is disabled. - const int nSegCharLimit = min(rArgs.mnLength, mnEndCharPos + EXTRA_CONTEXT_LENGTH); + mnSegCharOffset = rArgs.mnMinCharPos; int limit = rArgs.mnEndCharPos; - if ((nSegCharLimit > limit) && !(SAL_LAYOUT_COMPLEX_DISABLED & rArgs.mnFlags)) - { - limit += findSameDirLimit(rArgs.mpStr + rArgs.mnEndCharPos, - nSegCharLimit - rArgs.mnEndCharPos, bRtl); - } - -#ifdef GRCACHE - GrFontHasher hasher(mrFont); - sal_Int32 aFontHash = hasher.hashCode(mpFeatures); - GraphiteSegmentCache * pCache = - (GraphiteCacheHandler::instance).getCache(aFontHash); - if (pCache) + if (!(SAL_LAYOUT_COMPLEX_DISABLED & rArgs.mnFlags)) { - *pSegRecord = pCache->getSegment(rArgs, bRtl, limit); - if (*pSegRecord) + const int nSegCharMin = maximum<int>(0, mnMinCharPos - EXTRA_CONTEXT_LENGTH); + const int nSegCharLimit = minimum(rArgs.mnLength, mnEndCharPos + EXTRA_CONTEXT_LENGTH); + if (nSegCharMin < mnSegCharOffset) { - pSegment = (*pSegRecord)->getSegment(); - mpTextSrc = (*pSegRecord)->getTextSrc(); - maLayout.setRightToLeft((*pSegRecord)->isRtl()); - if (rArgs.mpStr != mpTextSrc->getLayoutArgs().mpStr || - rArgs.mnMinCharPos != mpTextSrc->getLayoutArgs().mnMinCharPos || - rArgs.mnEndCharPos != mpTextSrc->getLayoutArgs().mnEndCharPos || - (SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags) ) - { - (*pSegRecord)->clearVectors(); - } - mpTextSrc->switchLayoutArgs(rArgs); - if (limit > rArgs.mnMinCharPos && limit == rArgs.mnEndCharPos - && pSegment->stopCharacter() != limit) - { - // check that the last character is not part of a ligature - glyph_set_range_t aGlyphSet = pSegment->charToGlyphs(limit - 1); - if (aGlyphSet.first == aGlyphSet.second) - { - // no glyphs associated with this glyph - occurs mid ligature - pSegment = NULL; - *pSegRecord = NULL; - } - else - { - while (aGlyphSet.first != aGlyphSet.second) - { - int lastChar = static_cast<int>((*aGlyphSet.first).lastChar()); - if (lastChar >= limit) - { - pSegment = NULL; - *pSegRecord = NULL; - break; - } - aGlyphSet.first++; - } - } - } - if (pSegment) - return pSegment; + int sameDirEnd = findSameDirLimit(rArgs.mpStr + nSegCharMin, + rArgs.mnEndCharPos - nSegCharMin, bRtl); + if (sameDirEnd == rArgs.mnEndCharPos) + mnSegCharOffset = nSegCharMin; + } + if (nSegCharLimit > limit) + { + limit += findSameDirLimit(rArgs.mpStr + rArgs.mnEndCharPos, + nSegCharLimit - rArgs.mnEndCharPos, bRtl); } } -#endif - // Create a new TextSource object for the engine. - mpTextSrc = new TextSourceAdaptor(rArgs, limit); - if (mpFeatures) mpTextSrc->setFeatures(mpFeatures); + if (mpFeatures) + pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16, + rArgs.mpStr + mnSegCharOffset, limit - mnSegCharOffset, bRtl); + else + pSegment = gr_make_seg(mpFont, mpFace, 0, NULL, gr_utf16, + rArgs.mpStr + mnSegCharOffset, limit - mnSegCharOffset, bRtl); - pSegment = new gr::RangeSegment((gr::Font *)&mrFont, mpTextSrc, &maLayout, mnMinCharPos, limit); + //pSegment = new gr::RangeSegment((gr::Font *)&mrFont, mpTextSrc, &maLayout, mnMinCharPos, limit); if (pSegment != NULL) { #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"Gr::LayoutText %d-%d, context %d,len%d rtl%d/%d scaling %f\n", rArgs.mnMinCharPos, - rArgs.mnEndCharPos, limit, rArgs.mnLength, maLayout.rightToLeft(), pSegment->rightToLeft(), mfScaling); -#endif -#ifdef GRCACHE - // on a new segment rightToLeft should be correct - *pSegRecord = pCache->cacheSegment(mpTextSrc, pSegment, pSegment->rightToLeft()); + fprintf(grLog(),"Gr::LayoutText %d-%d, context %d,len%d rtl%d scaling %f\n", rArgs.mnMinCharPos, + rArgs.mnEndCharPos, limit, rArgs.mnLength, bRtl, mfScaling); #endif } else @@ -822,47 +637,20 @@ gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) return pSegment; } -#ifdef GRCACHE -bool GraphiteLayout::LayoutGlyphs(ImplLayoutArgs& rArgs, gr::Segment * pSegment, GrSegRecord * pSegRecord) -#else -bool GraphiteLayout::LayoutGlyphs(ImplLayoutArgs& rArgs, gr::Segment * pSegment) -#endif +bool GraphiteLayout::LayoutGlyphs(ImplLayoutArgs& rArgs, gr_segment * pSegment) { -#ifdef GRCACHE -#ifdef GRCACHE_REUSE_VECTORS - // if we have an exact match, then we can reuse the glyph vectors from before - if (pSegRecord && (pSegRecord->glyphs().size() > 0) && - (pSegRecord->fontScale() == mfScaling) && - !(SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags) ) - { - mnWidth = pSegRecord->width(); - mvGlyphs = pSegRecord->glyphs(); - mvCharDxs = pSegRecord->charDxs(); - mvChar2BaseGlyph = pSegRecord->char2BaseGlyph(); - mvGlyph2Char = pSegRecord->glyph2Char(); - return true; - } -#endif -#endif // Calculate the initial character dxs. mvCharDxs.assign(mnEndCharPos - mnMinCharPos, -1); mvChar2BaseGlyph.assign(mnEndCharPos - mnMinCharPos, -1); + mvCharBreaks.assign(mnEndCharPos - mnMinCharPos, 0); mnWidth = 0; if (mvCharDxs.size() > 0) { // Discover all the clusters. try { - // Note: we use the layout rightToLeft() because in cached segments - // rightToLeft() may no longer be valid if the engine has been run - // ltr since the segment was created. -#ifdef GRCACHE - bool bRtl = pSegRecord? pSegRecord->isRtl() : pSegment->rightToLeft(); -#else - bool bRtl = pSegment->rightToLeft(); -#endif - mvGlyphs.fill_from(*pSegment, rArgs, bRtl, - mnWidth, mfScaling, mvChar2BaseGlyph, mvGlyph2Char, mvCharDxs); + bool bRtl = mnLayoutFlags & SAL_LAYOUT_BIDI_RTL; + fillFrom(pSegment, rArgs, mfScaling); if (bRtl) { @@ -872,17 +660,6 @@ bool GraphiteLayout::LayoutGlyphs(ImplLayoutArgs& rArgs, gr::Segment * pSegment) // fixup last dx to ensure it always equals the width mvCharDxs[mvCharDxs.size() - 1] = mnWidth; } -#ifdef GRCACHE -#ifdef GRCACHE_REUSE_VECTORS - if (pSegRecord && rArgs.maReruns.IsEmpty() && - !(SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags)) - { - pSegRecord->setGlyphVectors(mnWidth, mvGlyphs, mvCharDxs, - mvChar2BaseGlyph, mvGlyph2Char, - mfScaling); - } -#endif -#endif } catch (std::exception e) { @@ -918,24 +695,36 @@ int GraphiteLayout::GetTextBreak(long maxmnWidth, long char_extra, int factor) c return STRING_LEN; long nWidth = mvCharDxs[0] * factor; + long wLastBreak = 0; int nLastBreak = -1; + int nEmergency = -1; for (size_t i = 1; i < mvCharDxs.size(); i++) { nWidth += char_extra; if (nWidth > maxmnWidth) break; if (mvChar2BaseGlyph[i] != -1) { - if (mvChar2BaseGlyph[i] & (WORD_BREAK_BEFORE | HYPHEN_BREAK_BEFORE)) + if ( + (mvCharBreaks[i] > -25 || (mvCharBreaks[i-1] > 0 && mvCharBreaks[i-1] < 25)) && + (mvCharBreaks[i-1] < 25 || (mvCharBreaks[i] < 0 && mvCharBreaks[i] > -25)) + ) + { nLastBreak = static_cast<int>(i); + wLastBreak = nWidth; + } + nEmergency = static_cast<int>(i); } nWidth += (mvCharDxs[i] - mvCharDxs[i-1]) * factor; } int nBreak = mnMinCharPos; - if (nLastBreak > -1) + if (wLastBreak > 9 * maxmnWidth / 10) nBreak += nLastBreak; + else + if (nEmergency > -1) + nBreak += nEmergency; #ifdef GRLAYOUT_DEBUG - fprintf(grLog(), "Gr::GetTextBreak break after %d\n", nBreak - mnMinCharPos); + fprintf(grLog(), "Gr::GetTextBreak break after %d, weights(%d, %d)\n", nBreak - mnMinCharPos, mvCharBreaks[nBreak - mnMinCharPos], mvCharBreaks[nBreak - mnMinCharPos - 1]); #endif if (nBreak > mnEndCharPos) nBreak = STRING_LEN; @@ -943,7 +732,6 @@ int GraphiteLayout::GetTextBreak(long maxmnWidth, long char_extra, int factor) c return nBreak; } - long GraphiteLayout::FillDXArray( sal_Int32* pDXArray ) const { if (mnEndCharPos == mnMinCharPos) @@ -955,9 +743,9 @@ long GraphiteLayout::FillDXArray( sal_Int32* pDXArray ) const for (size_t i = 0; i < mvCharDxs.size(); i++) { assert( (mvChar2BaseGlyph[i] == -1) || - ((signed)(mvChar2BaseGlyph[i] & GLYPH_INDEX_MASK) < (signed)mvGlyphs.size())); + ((signed)(mvChar2BaseGlyph[i]) < (signed)mvGlyphs.size())); if (mvChar2BaseGlyph[i] != -1 && - mvGlyphs[mvChar2BaseGlyph[i] & GLYPH_INDEX_MASK].mnGlyphIndex == GF_DROPPED) + mvGlyphs[mvChar2BaseGlyph[i]].mnGlyphIndex == GF_DROPPED) { // when used in MultiSalLayout::GetTextBreak dropped glyphs // must have zero width @@ -978,12 +766,11 @@ long GraphiteLayout::FillDXArray( sal_Int32* pDXArray ) const //fprintf(grLog(),"FillDX %ld,%d\n", mnWidth, std::accumulate(pDXArray, pDXArray + mvCharDxs.size(), 0)); } #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"FillDXArray %d-%d,%d=%ld\n", mnMinCharPos, mnEndCharPos, (int)mpTextSrc->getLength(), mnWidth); + fprintf(grLog(),"FillDXArray %d-%d=%ld\n", mnMinCharPos, mnEndCharPos, mnWidth); #endif return mnWidth; } - void GraphiteLayout::AdjustLayout(ImplLayoutArgs& rArgs) { SalLayout::AdjustLayout(rArgs); @@ -1029,6 +816,9 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs &rArgs) int nDeltaWidth = rArgs.mnLayoutWidth - mnWidth; if (nDeltaWidth > 0) // expand, just expand between clusters { + // NOTE: for expansion we can use base glyphs (which have IsClusterStart set) + // even though they may have been reordered in which case they will have + // been placed in a bigger cluster for other purposes. int nClusterCount = 0; for (size_t j = 0; j < mvGlyphs.size(); j++) { @@ -1046,15 +836,18 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs &rArgs) { if (mvGlyphs[i].IsClusterStart()) { - nOffset = FRound( fExtraPerCluster * nCluster ); - size_t nCharIndex = mvGlyph2Char[i]; - mvCharDxs[nCharIndex] += nOffset; + nOffset = static_cast<int>(fExtraPerCluster * nCluster); + int nCharIndex = mvGlyph2Char[i]; + assert(nCharIndex > -1); + mvCharDxs[nCharIndex-mnMinCharPos] += nOffset; // adjust char dxs for rest of characters in cluster - while (++nCharIndex < mvGlyph2Char.size()) + while (++nCharIndex < static_cast<int>(mvGlyph2Char.size())) { - int nChar2Base = (mvChar2BaseGlyph[nCharIndex] == -1)? -1 : (int)(mvChar2BaseGlyph[nCharIndex] & GLYPH_INDEX_MASK); + int nChar2Base = mvChar2BaseGlyph[nCharIndex-mnMinCharPos]; if (nChar2Base == -1 || nChar2Base == static_cast<int>(i)) - mvCharDxs[nCharIndex] += nOffset; + mvCharDxs[nCharIndex-mnMinCharPos] += nOffset; + else + break; } ++nCluster; } @@ -1062,25 +855,27 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs &rArgs) } } } - else // condense - apply a factor to all glyph positions + else if (nDeltaWidth < 0)// condense - apply a factor to all glyph positions { if (mvGlyphs.size() == 0) return; Glyphs::iterator iLastGlyph = mvGlyphs.begin() + (mvGlyphs.size() - 1); // position last glyph using original width float fXFactor = static_cast<float>(rArgs.mnLayoutWidth - iLastGlyph->mnOrigWidth) / static_cast<float>(iLastGlyph->maLinearPos.X()); #ifdef GRLAYOUT_DEBUG - fprintf(grLog(), "Condense by factor %f\n", fXFactor); + fprintf(grLog(), "Condense by factor %f last x%ld\n", fXFactor, iLastGlyph->maLinearPos.X()); #endif + if (fXFactor < 0) + return; // probably a bad mnOrigWidth value iLastGlyph->maLinearPos.X() = rArgs.mnLayoutWidth - iLastGlyph->mnOrigWidth; Glyphs::iterator iGlyph = mvGlyphs.begin(); while (iGlyph != iLastGlyph) { - iGlyph->maLinearPos.X() = FRound( fXFactor * iGlyph->maLinearPos.X() ); + iGlyph->maLinearPos.X() = static_cast<int>(static_cast<float>(iGlyph->maLinearPos.X()) * fXFactor); ++iGlyph; } for (size_t i = 0; i < mvCharDxs.size(); i++) { - mvCharDxs[i] = FRound( fXFactor * mvCharDxs[i] ); + mvCharDxs[i] = static_cast<int>(fXFactor * static_cast<float>(mvCharDxs[i])); } } mnWidth = rArgs.mnLayoutWidth; @@ -1106,7 +901,7 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector<int> & rDelt int nPrevClusterLastChar = -1; for (size_t i = 0; i < nChars; i++) { - int nChar2Base = (mvChar2BaseGlyph[i] == -1)? -1 : (int)(mvChar2BaseGlyph[i] & GLYPH_INDEX_MASK); + int nChar2Base = mvChar2BaseGlyph[i]; if ((nChar2Base > -1) && (nChar2Base != nPrevClusterGlyph)) { assert((nChar2Base > -1) && (nChar2Base < (signed)mvGlyphs.size())); @@ -1118,11 +913,12 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector<int> & rDelt size_t j = i + 1; int nLastChar = i; int nLastGlyph = nChar2Base; + int nChar2BaseJ = -1; for (; j < nChars; j++) { - int nChar2BaseJ = (mvChar2BaseGlyph[j] == -1)? -1 : (int)(mvChar2BaseGlyph[j] & GLYPH_INDEX_MASK); + nChar2BaseJ = mvChar2BaseGlyph[j]; assert((nChar2BaseJ >= -1) && (nChar2BaseJ < (signed)mvGlyphs.size())); - if (nChar2BaseJ != -1 && mvGlyphs[nChar2BaseJ].IsClusterStart()) + if (nChar2BaseJ != -1 ) { nLastGlyph = nChar2BaseJ + ((bRtl)? +1 : -1); nLastChar = j - 1; @@ -1150,6 +946,12 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector<int> & rDelt nLastChar = nChars - 1; if (!bRtl) nLastGlyph = mvGlyphs.size() - 1; } + int nBaseCount = 0; + // count bases within cluster - may be more than 1 with reordering + for (int k = nChar2Base; k <= nLastGlyph; k++) + { + if (mvGlyphs[k].IsClusterStart()) ++nBaseCount; + } assert((nLastChar > -1) && (nLastChar < (signed)nChars)); long nNewClusterWidth = args.mpDXArray[nLastChar]; long nOrigClusterWidth = mvCharDxs[nLastChar]; @@ -1171,21 +973,25 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector<int> & rDelt mvGlyphs[nLastGlyph].mnNewWidth += nDWidth; else nDGlyphOrigin += nDWidth; + long nDOriginPerBase = (nBaseCount > 0)? nDWidth / nBaseCount : 0; + nBaseCount = -1; // update glyph positions if (bRtl) { for (int n = nChar2Base; n <= nLastGlyph; n++) { + if (mvGlyphs[n].IsClusterStart()) ++nBaseCount; assert((n > - 1) && (n < (signed)mvGlyphs.size())); - mvGlyphs[n].maLinearPos.X() += -nDGlyphOrigin + nXOffset; + mvGlyphs[n].maLinearPos.X() += -(nDGlyphOrigin + nDOriginPerBase * nBaseCount) + nXOffset; } } else { for (int n = nChar2Base; n <= nLastGlyph; n++) { + if (mvGlyphs[n].IsClusterStart()) ++nBaseCount; assert((n > - 1) && (n < (signed)mvGlyphs.size())); - mvGlyphs[n].maLinearPos.X() += nDGlyphOrigin + nXOffset; + mvGlyphs[n].maLinearPos.X() += nDGlyphOrigin + (nDOriginPerBase * nBaseCount) + nXOffset; } } rDeltaWidth[nChar2Base] = nDWidth; @@ -1288,15 +1094,15 @@ void GraphiteLayout::GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray std::fill(pCaretXArray, pCaretXArray + nArraySize, -1); // the layout method doesn't modify the layout even though it isn't // const in the interface - bool bRtl = const_cast<GraphiteLayout*>(this)->maLayout.rightToLeft(); + bool bRtl = (mnLayoutFlags & SAL_LAYOUT_BIDI_RTL);//const_cast<GraphiteLayout*>(this)->maLayout.rightToLeft(); int prevBase = -1; long prevClusterWidth = 0; for (int i = 0, nCharSlot = 0; i < nArraySize && nCharSlot < static_cast<int>(mvCharDxs.size()); ++nCharSlot, i+=2) { if (mvChar2BaseGlyph[nCharSlot] != -1) { - int nChar2Base = mvChar2BaseGlyph[nCharSlot] & GLYPH_INDEX_MASK; - assert((mvChar2BaseGlyph[nCharSlot] > -1) && (nChar2Base < (signed)mvGlyphs.size())); + int nChar2Base = mvChar2BaseGlyph[nCharSlot]; + assert((nChar2Base > -1) && (nChar2Base < (signed)mvGlyphs.size())); GlyphItem gi = mvGlyphs[nChar2Base]; if (gi.mnGlyphIndex == GF_DROPPED) { @@ -1313,8 +1119,8 @@ void GraphiteLayout::GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray origClusterWidth += mvGlyphs[nCluster].mnNewWidth; if (mvGlyph2Char[nCluster] == nCharSlot) { - nMin = std::min(nMin, mvGlyphs[nCluster].maLinearPos.X()); - nMax = std::min(nMax, mvGlyphs[nCluster].maLinearPos.X() + mvGlyphs[nCluster].mnNewWidth); + nMin = minimum(nMin, mvGlyphs[nCluster].maLinearPos.X()); + nMax = maximum(nMax, mvGlyphs[nCluster].maLinearPos.X() + mvGlyphs[nCluster].mnNewWidth); } } if (bRtl) @@ -1388,7 +1194,6 @@ void GraphiteLayout::GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray #endif } - // GetNextGlyphs returns a contiguous sequence of glyphs that can be // rendered together. It should never return a dropped glyph. // The glyph_slot returned should be the index of the next visible @@ -1416,7 +1221,7 @@ int GraphiteLayout::GetNextGlyphs( int length, sal_GlyphId * glyph_out, ++glyph_slot) {}; // Update the length - const int nGlyphSlotEnd = std::min(size_t(glyph_slot + length), mvGlyphs.size()); + const int nGlyphSlotEnd = minimum(size_t(glyph_slot + length), mvGlyphs.size()); // We're all out of glyphs here. if (glyph_slot == nGlyphSlotEnd) @@ -1434,17 +1239,23 @@ int GraphiteLayout::GetNextGlyphs( int length, sal_GlyphId * glyph_out, //aPosOut = glyph_itr->maLinearPos; aPosOut = GetDrawPosition(aStartPos); - for (;;) // Forever { // last index of the range from glyph_to_chars does not include this glyph if (char_index) { - assert((glyph_slot >= -1) && (glyph_slot < (signed)mvGlyph2Char.size())); - if (mvGlyph2Char[glyph_slot] == -1) - *char_index++ = mvCharDxs.size(); - else - *char_index++ = mvGlyph2Char[glyph_slot]; + if (glyph_slot >= (signed)mvGlyph2Char.size()) + { + *char_index++ = mnMinCharPos + mvCharDxs.size(); + } + else + { + assert(glyph_slot > -1); + if (mvGlyph2Char[glyph_slot] == -1) + *char_index++ = mnMinCharPos + mvCharDxs.size(); + else + *char_index++ = mvGlyph2Char[glyph_slot]; + } } // Copy out this glyphs data. ++glyph_slot; @@ -1457,8 +1268,9 @@ int GraphiteLayout::GetNextGlyphs( int length, sal_GlyphId * glyph_out, ((glyph_itr+1)->maLinearPos.X() - glyph_itr->maLinearPos.X()); #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"GetNextGlyphs g%d c%d x%ld,%ld adv%ld, pos %ld,%ld\n", glyph_slot - 1, - GLYPH_INDEX_MASK&mvGlyph2Char[glyph_slot-1], glyph_itr->maLinearPos.X(), glyph_itr->maLinearPos.Y(), nGlyphAdvance, + fprintf(grLog(),"GetNextGlyphs g%d gid%d c%d x%ld,%ld adv%ld, pos %ld,%ld\n", + glyph_slot - 1, glyph_itr->mnGlyphIndex, + mvGlyph2Char[glyph_slot-1], glyph_itr->maLinearPos.X(), glyph_itr->maLinearPos.Y(), nGlyphAdvance, aPosOut.X(), aPosOut.Y()); #endif @@ -1488,7 +1300,6 @@ int GraphiteLayout::GetNextGlyphs( int length, sal_GlyphId * glyph_out, return numGlyphs; } - void GraphiteLayout::MoveGlyph( int nGlyphIndex, long nNewPos ) { // TODO it might be better to actualy implement simplify properly, but this @@ -1515,7 +1326,6 @@ void GraphiteLayout::MoveGlyph( int nGlyphIndex, long nNewPos ) mnWidth += dx; } - void GraphiteLayout::DropGlyph( int nGlyphIndex ) { if(nGlyphIndex >= signed(mvGlyphs.size())) @@ -1547,7 +1357,6 @@ void GraphiteLayout::Simplify( bool isBaseLayout ) { deltaX = 0; } - //mvCharDxs[mvGlyph2Char[gi->mnCharPos]] -= deltaX; ++gi; } #ifdef GRLAYOUT_DEBUG diff --git a/vcl/source/glyphs/graphite_serverfont.cxx b/vcl/source/glyphs/graphite_serverfont.cxx index cda2cd434cba..ec1388d9bb29 100644 --- a/vcl/source/glyphs/graphite_serverfont.cxx +++ b/vcl/source/glyphs/graphite_serverfont.cxx @@ -36,44 +36,120 @@ // // Platform +#include <i18npool/mslangid.hxx> #include <vcl/sallayout.hxx> // Module #include "gcach_ftyp.hxx" +#include <vcl/glyphcache.hxx> #include <vcl/graphite_features.hxx> -#include "graphite_textsrc.hxx" +//#include "graphite_textsrc.hxx" #include <vcl/graphite_serverfont.hxx> #ifndef WNT +float freetypeServerFontAdvance(const void* appFontHandle, gr_uint16 glyphId) +{ + FreetypeServerFont * pServerFont = + const_cast<FreetypeServerFont*> + (reinterpret_cast<const FreetypeServerFont*>(appFontHandle)); + if (pServerFont) + { + return static_cast<float>(pServerFont->GetGlyphMetric(glyphId).GetCharWidth()); + } + return .0f; +} + // // An implementation of the GraphiteLayout interface to enable Graphite enabled fonts to be used. // -GraphiteServerFontLayout::GraphiteServerFontLayout(GraphiteFontAdaptor * pFont) throw() - : ServerFontLayout(pFont->font()), mpFont(pFont), - maImpl(*mpFont, mpFont->features(), pFont) +GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont & rServerFont) throw() + : ServerFontLayout(rServerFont), + maImpl(dynamic_cast<FreetypeServerFont&>(rServerFont).GetGraphiteFace()->face(), + rServerFont), + mpFeatures(NULL) { - // Nothing needed here + FreetypeServerFont& rFTServerFont = dynamic_cast<FreetypeServerFont&>(rServerFont); + gr_font * pFont = rFTServerFont.GetGraphiteFace()->font(rServerFont.GetFontSelData().mnHeight); + if (!pFont) + { + pFont = gr_make_font_with_advance_fn( + // need to use mnHeight here, mfExactHeight can give wrong values + static_cast<float>(rServerFont.GetFontSelData().mnHeight), + &rFTServerFont, + freetypeServerFontAdvance, + rFTServerFont.GetGraphiteFace()->face()); + rFTServerFont.GetGraphiteFace()->addFont(rServerFont.GetFontSelData().mnHeight, pFont); + } + maImpl.SetFont(pFont); + rtl::OString aLang(""); + if (rServerFont.GetFontSelData().meLanguage != LANGUAGE_DONTKNOW) + { + aLang = MsLangId::convertLanguageToIsoByteString( + rServerFont.GetFontSelData().meLanguage ); + } + rtl::OString name = rtl::OUStringToOString( + rServerFont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 ); +#ifdef DEBUG + printf("GraphiteServerFontLayout %lx %s size %d %f\n", (long unsigned int)this, name.getStr(), + rFTServerFont.GetMetricsFT().x_ppem, + rServerFont.GetFontSelData().mfExactHeight); +#endif + sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; + if (nFeat > 0) + { + rtl::OString aFeat = name.copy(nFeat, name.getLength() - nFeat); + mpFeatures = new grutils::GrFeatureParser( + rFTServerFont.GetGraphiteFace()->face(), aFeat, aLang); +#ifdef DEBUG + if (mpFeatures) + printf("GraphiteServerFontLayout %s/%s/%s %x language %d features %d errors\n", + rtl::OUStringToOString( rServerFont.GetFontSelData().maName, + RTL_TEXTENCODING_UTF8 ).getStr(), + rtl::OUStringToOString( rServerFont.GetFontSelData().maTargetName, + RTL_TEXTENCODING_UTF8 ).getStr(), + rtl::OUStringToOString( rServerFont.GetFontSelData().maSearchName, + RTL_TEXTENCODING_UTF8 ).getStr(), + rServerFont.GetFontSelData().meLanguage, + (int)mpFeatures->numFeatures(), mpFeatures->parseErrors()); +#endif + } + else + { + mpFeatures = new grutils::GrFeatureParser( + rFTServerFont.GetGraphiteFace()->face(), aLang); + } + maImpl.SetFeatures(mpFeatures); } GraphiteServerFontLayout::~GraphiteServerFontLayout() throw() { - delete mpFont; - mpFont = NULL; + delete mpFeatures; + mpFeatures = NULL; } -const sal_Unicode* GraphiteServerFontLayout::getTextPtr() const +bool GraphiteServerFontLayout::IsGraphiteEnabledFont(ServerFont * pServerFont) { - return maImpl.textSrc()->getLayoutArgs().mpStr + - maImpl.textSrc()->getLayoutArgs().mnMinCharPos; + FreetypeServerFont * pFtServerFont = dynamic_cast<FreetypeServerFont*>(pServerFont); + if (pFtServerFont) + { + if (pFtServerFont->GetGraphiteFace()) + { +#ifdef DEBUG + printf("IsGraphiteEnabledFont\n"); +#endif + return true; + } + } + return false; } sal_GlyphId GraphiteLayoutImpl::getKashidaGlyph(int & width) { - int nKashidaIndex = mpFont->font().GetGlyphIndex( 0x0640 ); + int nKashidaIndex = mrServerFont.GetGlyphIndex( 0x0640 ); if( nKashidaIndex != 0 ) { - const GlyphMetric& rGM = mpFont->font().GetGlyphMetric( nKashidaIndex ); + const GlyphMetric& rGM = mrServerFont.GetGlyphMetric( nKashidaIndex ); width = rGM.GetCharWidth(); } else diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk index fa9af02ca75f..cbc9a38b4f9e 100644 --- a/vcl/source/glyphs/makefile.mk +++ b/vcl/source/glyphs/makefile.mk @@ -52,12 +52,11 @@ SLOFILES=\ .IF "$(ENABLE_GRAPHITE)" != "" # Graphite support using the glyphcache infrastructure CFLAGS+=-DENABLE_GRAPHITE -SLOFILES+= $(SLO)$/graphite_adaptors.obj \ +SLOFILES+=\ $(SLO)$/graphite_features.obj \ - $(SLO)$/graphite_cache.obj \ - $(SLO)$/graphite_textsrc.obj \ $(SLO)$/graphite_serverfont.obj \ $(SLO)$/graphite_layout.obj + .ENDIF .ELSE @@ -65,10 +64,13 @@ SLOFILES+= $(SLO)$/graphite_adaptors.obj \ .IF "$(ENABLE_GRAPHITE)" == "TRUE" # Graphite support on non-UNX platforms SLOFILES=\ - $(SLO)$/graphite_textsrc.obj \ - $(SLO)$/graphite_cache.obj \ $(SLO)$/graphite_features.obj \ $(SLO)$/graphite_layout.obj + +.IF "$(SYSTEM_GRAPHITE)" != "YES" +CDEFS+=-DGR2_STATIC +.ENDIF + .ENDIF .ENDIF diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 0f0caecfe856..50d288b71686 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -268,7 +268,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, } else if ( !mpData->maKeyTable.Insert( nCode, pEntry ) ) { - DBG_ERROR1( "Accelerator::InsertItem(): KeyCode (Key: %lx) already exists", nCode ); + OSL_TRACE( "Accelerator::InsertItem(): KeyCode (Key: %lx) already exists", nCode ); delete pEntry; } else diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 4db82d23b0e5..7e2725e07023 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -622,7 +622,7 @@ sal_Bool Dialog::ImplStartExecuteModal() #ifdef DBG_UTIL ByteString aErrorStr( "Dialog::StartExecuteModal() is called in Dialog::StartExecuteModal(): " ); aErrorStr += ImplGetDialogText( this ); - DBG_ERROR( aErrorStr.GetBuffer() ); + OSL_FAIL( aErrorStr.GetBuffer() ); #endif return sal_False; } @@ -632,7 +632,7 @@ sal_Bool Dialog::ImplStartExecuteModal() #ifdef DBG_UTIL ByteString aErrorStr( "Dialog::StartExecuteModal() is called in a none UI application: " ); aErrorStr += ImplGetDialogText( this ); - DBG_ERROR( aErrorStr.GetBuffer() ); + OSL_FAIL( aErrorStr.GetBuffer() ); #endif return sal_False; } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index f8a182206bad..5a5379da2ffa 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -4396,7 +4396,7 @@ Window::~Window() aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 ); aTempStr += ") with living SystemWindow(s) destroyed: "; aTempStr += aErrorStr; - DBG_ERROR( aTempStr.GetBuffer() ); + OSL_FAIL( aTempStr.GetBuffer() ); GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed! } @@ -4417,7 +4417,7 @@ Window::~Window() aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 ); aTempStr += ") with living SystemWindow(s) destroyed: "; aTempStr += aErrorStr; - DBG_ERROR( aTempStr.GetBuffer() ); + OSL_FAIL( aTempStr.GetBuffer() ); GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed! } @@ -4432,7 +4432,7 @@ Window::~Window() lcl_appendWindowInfo( aTempStr, *pTempWin ); pTempWin = pTempWin->mpWindowImpl->mpNext; } - DBG_ERROR( aTempStr.GetBuffer() ); + OSL_FAIL( aTempStr.GetBuffer() ); GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed! } @@ -4447,7 +4447,7 @@ Window::~Window() lcl_appendWindowInfo( aTempStr, *pTempWin ); pTempWin = pTempWin->mpWindowImpl->mpNext; } - DBG_ERROR( aTempStr.GetBuffer() ); + OSL_FAIL( aTempStr.GetBuffer() ); GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed! } @@ -4465,7 +4465,7 @@ Window::~Window() ByteString aTempStr( "Window (" ); aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 ); aTempStr += ") still in TaskPanelList!"; - DBG_ERROR( aTempStr.GetBuffer() ); + OSL_FAIL( aTempStr.GetBuffer() ); GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed! } } @@ -4491,7 +4491,7 @@ Window::~Window() ByteString aTempStr( "Window (" ); aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 ); aTempStr += ") not found in TaskPanelList!"; - DBG_ERROR( aTempStr.GetBuffer() ); + OSL_FAIL( aTempStr.GetBuffer() ); } } @@ -4522,7 +4522,7 @@ Window::~Window() ByteString aTempStr( "Window (" ); aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 ); aTempStr += ") with focussed child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !"; - DBG_ERROR( aTempStr.GetBuffer() ); + OSL_FAIL( aTempStr.GetBuffer() ); GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed! #endif } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 3e4de2648c99..2892bcb00c38 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2604,7 +2604,7 @@ long ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, break; #ifdef DBG_UTIL default: - DBG_ERROR1( "ImplWindowFrameProc(): unknown event (%lu)", (sal_uLong)nEvent ); + OSL_TRACE( "ImplWindowFrameProc(): unknown event (%lu)", (sal_uLong)nEvent ); break; #endif } diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 1066917810c8..f4e0badab1f4 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -397,7 +397,7 @@ wrapper_get_n_children( AtkObject *atk_obj ) n = obj->mpContext->getAccessibleChildCount(); } catch(const uno::Exception& e) { - OSL_ENSURE(0, "Exception in getAccessibleChildCount()" ); + OSL_FAIL("Exception in getAccessibleChildCount()" ); } } @@ -429,7 +429,7 @@ wrapper_ref_child( AtkObject *atk_obj, child = atk_object_wrapper_ref( xAccessible ); } catch(const uno::Exception& e) { - OSL_ENSURE(0, "Exception in getAccessibleChild"); + OSL_FAIL("Exception in getAccessibleChild"); } } diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h index 9259c0972213..0025afce2ad6 100644 --- a/vcl/unx/inc/salframe.h +++ b/vcl/unx/inc/salframe.h @@ -140,6 +140,7 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame int m_nCurClipRect; int m_nMaxClipRect; + bool mPendingSizeEvent; void GetPosSize( Rectangle &rPosSize ); void SetSize ( const Size &rSize ); @@ -283,6 +284,9 @@ public: static void SaveYourselfDone( SalFrame* ); static Bool checkKeyReleaseForRepeat( Display*, XEvent*, XPointer pX11SalFrame ); + + /// @internal + void setPendingSizeEvent(); }; #ifdef _SV_SALDISP_HXX diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx index e21a44c05d7a..23584694cad2 100644 --- a/vcl/unx/source/dtrans/X11_selection.cxx +++ b/vcl/unx/source/dtrans/X11_selection.cxx @@ -2198,7 +2198,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) m_bDropWaitingForCompletion && m_aDropEnterEvent.data.l[0] ) { bHandled = true; - OSL_ENSURE( 0, "someone forgot to call dropComplete ?" ); + OSL_FAIL( "someone forgot to call dropComplete ?" ); // some listener forgot to call dropComplete in the last operation // let us end it now and accept the new enter event aGuard.clear(); @@ -3380,7 +3380,7 @@ void SelectionManager::startDrag( GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame ); #if OSL_DEBUG_LEVEL > 0 else - OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" ); + OSL_FAIL( "failed to acquire SolarMutex to reset capture frame" ); #endif } return; @@ -3469,7 +3469,7 @@ void SelectionManager::startDrag( GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame ); #if OSL_DEBUG_LEVEL > 0 else - OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" ); + OSL_FAIL( "failed to acquire SolarMutex to reset capture frame" ); #endif } diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx index fc7978570936..bcf0e14e9160 100644 --- a/vcl/unx/source/fontmanager/fontconfig.cxx +++ b/vcl/unx/source/fontmanager/fontconfig.cxx @@ -56,6 +56,9 @@ using namespace psp; #define FC_HINT_MEDIUM 2 #define FC_HINT_FULL 3 #endif + #ifndef FC_FT_FACE + #define FC_FT_FACE "ftface" + #endif #else typedef void FcConfig; typedef void FcObjectSet; @@ -145,6 +148,7 @@ class FontCfgWrapper FcBool (*m_pFcPatternDel)(FcPattern*,const char*); FT_UInt (*m_pFcFreeTypeCharIndex)(FT_Face,FcChar32); + FcBool (*m_pFcPatternAddFTFace)(FcPattern*,const char*,const FT_Face); oslGenericFunction loadSymbol( const char* ); void addFontSet( FcSetName ); @@ -166,7 +170,7 @@ public: void FcFini() { - //To-Do: get non-headless mode smoketest to pass + //To-Do: get gtk vclplug smoketest to pass //if (m_pFcFini) m_pFcFini(); } @@ -271,7 +275,12 @@ public: FT_UInt FcFreeTypeCharIndex( FT_Face face, FcChar32 ucs4 ) { return m_pFcFreeTypeCharIndex ? m_pFcFreeTypeCharIndex( face, ucs4 ) : 0; } - + FcBool FcPatternAddFTFace( FcPattern* pPattern, const char* pObject, const FT_Face nValue ) + { + return m_pFcPatternAddFTFace + ? m_pFcPatternAddFTFace( pPattern, pObject, nValue ) + : false; + } public: FcResult LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **family, const char *elementtype, const char *elementlangtype); @@ -391,6 +400,8 @@ FontCfgWrapper::FontCfgWrapper() m_pFcFreeTypeCharIndex = (FT_UInt(*)(FT_Face,FcChar32)) loadSymbol( "FcFreeTypeCharIndex" ); + m_pFcPatternAddFTFace = (FcBool(*)(FcPattern*,const char*,const FT_Face)) + loadSymbol( "FcPatternAddFTFace" ); m_nFcVersion = FcGetVersion(); #if (OSL_DEBUG_LEVEL > 1) @@ -1044,9 +1055,15 @@ rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName, const FcChar8* pTargetNameUtf8 = (FcChar8*)aTargetName.getStr(); rWrapper.FcPatternAddString( pPattern, FC_FAMILY, pTargetNameUtf8 ); - const FcChar8* pLangAttribUtf8 = (FcChar8*)rLangAttrib.getStr(); if( rLangAttrib.getLength() ) + { + const FcChar8* pLangAttribUtf8; + if (rLangAttrib.equalsIgnoreAsciiCase(OString(RTL_CONSTASCII_STRINGPARAM("pa-in")))) + pLangAttribUtf8 = (FcChar8*)"pa"; + else + pLangAttribUtf8 = (FcChar8*)rLangAttrib.getStr(); rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 ); + } // Add required Unicode characters, if any if ( rMissingCodes.getLength() ) @@ -1138,18 +1155,38 @@ rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName, return aName; } -bool PrintFontManager::getFontOptions( - const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*), - ImplFontOptions& rOptions) const +class FontConfigFontOptions : public ImplFontOptions +{ +public: + FontConfigFontOptions() : mpPattern(0) {} + ~FontConfigFontOptions() + { + FontCfgWrapper& rWrapper = FontCfgWrapper::get(); + if( rWrapper.isValid() ) + rWrapper.FcPatternDestroy( mpPattern ); + } + virtual void *GetPattern(void * face) const + { + FontCfgWrapper& rWrapper = FontCfgWrapper::get(); + if( rWrapper.isValid() ) + rWrapper.FcPatternAddFTFace(mpPattern, FC_FT_FACE, static_cast<FT_Face>(face)); + return mpPattern; + } + FcPattern* mpPattern; +}; + +ImplFontOptions* PrintFontManager::getFontOptions( + const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*)) const { #ifndef ENABLE_FONTCONFIG (void)rInfo;(void)nSize;(void)subcallback;(void)rOptions; - return false; + return NULL; #else // ENABLE_FONTCONFIG FontCfgWrapper& rWrapper = FontCfgWrapper::get(); if( ! rWrapper.isValid() ) - return false; + return NULL; + FontConfigFontOptions* pOptions = NULL; FcConfig* pConfig = rWrapper.FcConfigGetCurrent(); FcPattern* pPattern = rWrapper.FcPatternCreate(); @@ -1176,49 +1213,43 @@ bool PrintFontManager::getFontOptions( FcPattern* pResult = rWrapper.FcFontSetMatch( pConfig, &pFontSet, 1, pPattern, &eResult ); if( pResult ) { - FcFontSet* pSet = rWrapper.FcFontSetCreate(); - rWrapper.FcFontSetAdd( pSet, pResult ); - if( pSet->nfont > 0 ) + FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool(pResult, + FC_EMBEDDED_BITMAP, 0, &embitmap); + FcResult eAntialias = rWrapper.FcPatternGetBool(pResult, + FC_ANTIALIAS, 0, &antialias); + FcResult eAutoHint = rWrapper.FcPatternGetBool(pResult, + FC_AUTOHINT, 0, &autohint); + FcResult eHinting = rWrapper.FcPatternGetBool(pResult, + FC_HINTING, 0, &hinting); + /*FcResult eHintStyle =*/ rWrapper.FcPatternGetInteger(pResult, + FC_HINT_STYLE, 0, &hintstyle); + + pOptions = new FontConfigFontOptions; + + pOptions->mpPattern = pResult; + + if( eEmbeddedBitmap == FcResultMatch ) + pOptions->meEmbeddedBitmap = embitmap ? EMBEDDEDBITMAP_TRUE : EMBEDDEDBITMAP_FALSE; + if( eAntialias == FcResultMatch ) + pOptions->meAntiAlias = antialias ? ANTIALIAS_TRUE : ANTIALIAS_FALSE; + if( eAutoHint == FcResultMatch ) + pOptions->meAutoHint = autohint ? AUTOHINT_TRUE : AUTOHINT_FALSE; + if( eHinting == FcResultMatch ) + pOptions->meHinting = hinting ? HINTING_TRUE : HINTING_FALSE; + switch (hintstyle) { - FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool(pSet->fonts[0], - FC_EMBEDDED_BITMAP, 0, &embitmap); - FcResult eAntialias = rWrapper.FcPatternGetBool(pSet->fonts[0], - FC_ANTIALIAS, 0, &antialias); - FcResult eAutoHint = rWrapper.FcPatternGetBool(pSet->fonts[0], - FC_AUTOHINT, 0, &autohint); - FcResult eHinting = rWrapper.FcPatternGetBool(pSet->fonts[0], - FC_HINTING, 0, &hinting); - /*FcResult eHintStyle =*/ rWrapper.FcPatternGetInteger( pSet->fonts[0], - FC_HINT_STYLE, 0, &hintstyle); - - if( eEmbeddedBitmap == FcResultMatch ) - rOptions.meEmbeddedBitmap = embitmap ? EMBEDDEDBITMAP_TRUE : EMBEDDEDBITMAP_FALSE; - if( eAntialias == FcResultMatch ) - rOptions.meAntiAlias = antialias ? ANTIALIAS_TRUE : ANTIALIAS_FALSE; - if( eAutoHint == FcResultMatch ) - rOptions.meAutoHint = autohint ? AUTOHINT_TRUE : AUTOHINT_FALSE; - if( eHinting == FcResultMatch ) - rOptions.meHinting = hinting ? HINTING_TRUE : HINTING_FALSE; - switch (hintstyle) - { - case FC_HINT_NONE: rOptions.meHintStyle = HINT_NONE; break; - case FC_HINT_SLIGHT: rOptions.meHintStyle = HINT_SLIGHT; break; - case FC_HINT_MEDIUM: rOptions.meHintStyle = HINT_MEDIUM; break; - default: // fall through - case FC_HINT_FULL: rOptions.meHintStyle = HINT_FULL; break; - } + case FC_HINT_NONE: pOptions->meHintStyle = HINT_NONE; break; + case FC_HINT_SLIGHT: pOptions->meHintStyle = HINT_SLIGHT; break; + case FC_HINT_MEDIUM: pOptions->meHintStyle = HINT_MEDIUM; break; + default: // fall through + case FC_HINT_FULL: pOptions->meHintStyle = HINT_FULL; break; } - // info: destroying the pSet destroys pResult implicitly - // since pResult was "added" to pSet - rWrapper.FcFontSetDestroy( pSet ); } // cleanup rWrapper.FcPatternDestroy( pPattern ); - // TODO: return true only if non-default font options are set - const bool bOK = (pResult != NULL); - return bOK; + return pOptions; #endif } diff --git a/vcl/unx/source/gdi/cdeint.cxx b/vcl/unx/source/gdi/cdeint.cxx index d97aa46e0d76..fd81e05c0644 100644 --- a/vcl/unx/source/gdi/cdeint.cxx +++ b/vcl/unx/source/gdi/cdeint.cxx @@ -125,7 +125,7 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings ) ; int nNumber = aLine.Copy( ++nPos ).ToInt32(); - DBG_TRACE2( "found palette %d in resource \"%s\"", nNumber, aLine.GetBuffer() ); + OSL_TRACE( "found palette %d in resource \"%s\"", nNumber, aLine.GetBuffer() ); // found no documentation what this number actually means; // might be the screen number. 0 seems to be the right one @@ -133,7 +133,7 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings ) if( nNumber ) continue; - DBG_TRACE1( "Palette file is \"%s\".\n", aPaletteFile.GetBuffer() ); + OSL_TRACE( "Palette file is \"%s\".\n", aPaletteFile.GetBuffer() ); String aPath( aHomeDir ); aPath.AppendAscii( "/.dt/palettes/" ); @@ -155,7 +155,7 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings ) aStream.ReadLine( aBuffer ); // format is "#RRRRGGGGBBBB" - DBG_TRACE1( "\t\"%s\".\n", aBuffer.GetBuffer() ); + OSL_TRACE( "\t\"%s\".\n", aBuffer.GetBuffer() ); if( aBuffer.Len() ) { @@ -169,7 +169,7 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings ) | ( getHexDigit( pArr[8] ) << 4 ) ); - DBG_TRACE1( "\t\t%lx\n", aColors[nIndex].GetColor() ); + OSL_TRACE( "\t\t%lx\n", aColors[nIndex].GetColor() ); } } diff --git a/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk index 123fcbcf9131..ef5a8726fedc 100644 --- a/vcl/unx/source/gdi/makefile.mk +++ b/vcl/unx/source/gdi/makefile.mk @@ -78,6 +78,9 @@ CFLAGS+=-DXRENDER_LINK .IF "$(ENABLE_GRAPHITE)" == "TRUE" CFLAGS+=-DENABLE_GRAPHITE +.IF "$(SYSTEM_GRAPHITE)" != "YES" +CDEFS+=-DGR2_STATIC +.ENDIF .ENDIF .ENDIF # "$(GUIBASE)"!="unx" diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx index 7308827bdeb7..a4289496fa14 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/source/gdi/pspgraphics.cxx @@ -989,13 +989,9 @@ SalLayout* PspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel { #ifdef ENABLE_GRAPHITE // Is this a Graphite font? - if (GraphiteFontAdaptor::IsGraphiteEnabledFont(*m_pServerFont[nFallbackLevel])) + if (GraphiteServerFontLayout::IsGraphiteEnabledFont(m_pServerFont[nFallbackLevel])) { - sal_Int32 xdpi, ydpi; - GetResolution(xdpi, ydpi); - GraphiteFontAdaptor * pGrfont = new GraphiteFontAdaptor( *m_pServerFont[nFallbackLevel], xdpi, ydpi); - if (!pGrfont) return NULL; - pLayout = new GraphiteServerFontLayout(pGrfont); + pLayout = new GraphiteServerFontLayout(*m_pServerFont[nFallbackLevel]); } else #endif diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index a7152bc87484..342bd99de324 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -226,22 +226,21 @@ bool X11SalGraphics::setFont( const ImplFontSelectData *pEntry, int nFallbackLev return false; } +ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize); + void ImplServerFontEntry::HandleFontOptions( void ) { - bool GetFCFontOptions( const ImplFontAttributes&, int nSize, ImplFontOptions& ); - if( !mpServerFont ) return; if( !mbGotFontOptions ) { // get and cache the font options mbGotFontOptions = true; - mbValidFontOptions = GetFCFontOptions( *maFontSelData.mpFontData, - maFontSelData.mnHeight, maFontOptions ); + mpFontOptions = GetFCFontOptions( *maFontSelData.mpFontData, + maFontSelData.mnHeight ); } // apply the font options - if( mbValidFontOptions ) - mpServerFont->SetFontOptions( maFontOptions ); + mpServerFont->SetFontOptions( mpFontOptions ); } //-------------------------------------------------------------------------- @@ -260,6 +259,7 @@ private: void (*mp_clip)(cairo_t*); void (*mp_rectangle)(cairo_t*, double, double, double, double); cairo_font_face_t * (*mp_ft_font_face_create_for_ft_face)(FT_Face, int); + cairo_font_face_t * (*mp_ft_font_face_create_for_pattern)(void*); void (*mp_set_font_face)(cairo_t *, cairo_font_face_t *); void (*mp_font_face_destroy)(cairo_font_face_t *); void (*mp_matrix_init_identity)(cairo_matrix_t *); @@ -289,6 +289,12 @@ public: { (*mp_rectangle)(cr, x, y, width, height); } cairo_font_face_t* ft_font_face_create_for_ft_face(FT_Face face, int load_flags) { return (*mp_ft_font_face_create_for_ft_face)(face, load_flags); } + cairo_font_face_t* ft_font_face_create_for_pattern(void *pattern) + { + return mp_ft_font_face_create_for_pattern + ? (*mp_ft_font_face_create_for_pattern)(pattern) + : NULL; + } void set_font_face(cairo_t *cr, cairo_font_face_t *font_face) { (*mp_set_font_face)(cr, font_face); } void font_face_destroy(cairo_font_face_t *font_face) @@ -362,6 +368,8 @@ CairoWrapper::CairoWrapper() osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_rectangle" ); mp_ft_font_face_create_for_ft_face = (cairo_font_face_t * (*)(FT_Face, int)) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_ft_font_face_create_for_ft_face" ); + mp_ft_font_face_create_for_pattern = (cairo_font_face_t * (*)(void*)) + osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_ft_font_face_create_for_pattern" ); mp_set_font_face = (void (*)(cairo_t *, cairo_font_face_t *)) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_font_face" ); mp_font_face_destroy = (void (*)(cairo_font_face_t *)) @@ -529,7 +537,12 @@ void X11SalGraphics::DrawCairoAAFontString( const ServerFontLayout& rLayout ) font_face = (cairo_font_face_t*)m_aCairoFontsCache.FindCachedFont(pId); if (!font_face) { - font_face = rCairo.ft_font_face_create_for_ft_face(pId, rFont.GetLoadFlags()); + const ImplFontOptions *pOptions = rFont.GetFontOptions(); + void *pPattern = pOptions ? pOptions->GetPattern(pId) : NULL; + if (pPattern) + font_face = rCairo.ft_font_face_create_for_pattern(pPattern); + if (!font_face) + font_face = rCairo.ft_font_face_create_for_ft_face(pId, rFont.GetLoadFlags()); m_aCairoFontsCache.CacheFont(font_face, pId); } @@ -1081,8 +1094,7 @@ void cairosubcallback( void* pPattern ) rCairo.ft_font_options_substitute( pFontOptions, pPattern ); } -bool GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize, - ImplFontOptions& rFontOptions) +ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize) { // TODO: get rid of these insane enum-conversions // e.g. by using the classic vclenum values inside VCL @@ -1179,8 +1191,7 @@ bool GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize, } const psp::PrintFontManager& rPFM = psp::PrintFontManager::get(); - bool bOK = rPFM.getFontOptions( aInfo, nSize, cairosubcallback, rFontOptions); - return bOK; + return rPFM.getFontOptions(aInfo, nSize, cairosubcallback); } // ---------------------------------------------------------------------------- @@ -1268,16 +1279,9 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe #ifdef ENABLE_GRAPHITE // Is this a Graphite font? if (!bDisableGraphite_ && - GraphiteFontAdaptor::IsGraphiteEnabledFont(*mpServerFont[nFallbackLevel])) + GraphiteServerFontLayout::IsGraphiteEnabledFont(mpServerFont[nFallbackLevel])) { - sal_Int32 xdpi, ydpi; - - xdpi = GetDisplay()->GetResolution().A(); - ydpi = GetDisplay()->GetResolution().B(); - - GraphiteFontAdaptor * pGrfont = new GraphiteFontAdaptor( *mpServerFont[nFallbackLevel], xdpi, ydpi); - if (!pGrfont) return NULL; - pLayout = new GraphiteServerFontLayout(pGrfont); + pLayout = new GraphiteServerFontLayout(*mpServerFont[nFallbackLevel]); } else #endif diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx index cab367f1693a..7df531975c57 100644 --- a/vcl/unx/source/printergfx/printerjob.cxx +++ b/vcl/unx/source/printergfx/printerjob.cxx @@ -279,7 +279,7 @@ removeSpoolDir (const rtl::OUString& rSpoolDir) { // Conversion did not work, as this is quite a dangerous action, // we should abort here .... - OSL_ENSURE( 0, "psprint: couldn't remove spool directory" ); + OSL_FAIL( "psprint: couldn't remove spool directory" ); return; } rtl::OString aSysPathByte = @@ -291,7 +291,7 @@ removeSpoolDir (const rtl::OUString& rSpoolDir) nChar += psp::appendStr (aSysPathByte.getStr(), pSystem + nChar); if (system (pSystem) == -1) - OSL_ENSURE( 0, "psprint: couldn't remove spool directory" ); + OSL_FAIL( "psprint: couldn't remove spool directory" ); } /* creates a spool directory with a "pidgin random" value based on diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index dd4ea89c35f5..9a5d149f14fd 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -3731,9 +3731,37 @@ void X11SalFrame::RestackChildren() } } +static Bool size_event_predicate( Display*, XEvent* event, XPointer arg ) +{ + if( event->type != ConfigureNotify ) + return False; + X11SalFrame* frame = reinterpret_cast< X11SalFrame* >( arg ); + XConfigureEvent* pEvent = &event->xconfigure; + if( pEvent->window != frame->GetShellWindow() + && pEvent->window != frame->GetWindow() + && pEvent->window != frame->GetForeignParent() + && pEvent->window != frame->GetStackingWindow()) + { // ignored at top of HandleSizeEvent() + return False; + } + if( pEvent->window == frame->GetStackingWindow()) + return False; // filtered later in HandleSizeEvent() + // at this point we know that there is another similar event in the queue + frame->setPendingSizeEvent(); + return False; // but do not process the new event out of order +} + +void X11SalFrame::setPendingSizeEvent() +{ + mPendingSizeEvent = true; +} + // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) { + // NOTE: if you add more tests in this function, make sure to update size_event_predicate() + // so that it finds exactly the same events + if ( pEvent->window != GetShellWindow() && pEvent->window != GetWindow() && pEvent->window != GetForeignParent() @@ -3781,6 +3809,16 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) if( SHOWSTATE_UNKNOWN == nShowState_ && bMapped_ ) nShowState_ = SHOWSTATE_NORMAL; + // Avoid a race condition where resizing this window to one size and shortly after that + // to another size generates first size event with the old size and only after that + // with the new size, temporarily making us think the old size is valid (bnc#674806). + // So if there is another size event for this window pending, ignore this one. + mPendingSizeEvent = false; + XEvent dummy; + XCheckIfEvent( GetXDisplay(), &dummy, size_event_predicate, reinterpret_cast< XPointer >( this )); + if( mPendingSizeEvent ) + return 1; + nWidth_ = pEvent->width; nHeight_ = pEvent->height; diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 9be30100265d..713d28a43846 100755 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -186,7 +186,7 @@ SHL1STDLIBS+=\ .IF "$(SYSTEM_GRAPHITE)" == "YES" SHL1STDLIBS+= $(GRAPHITE_LIBS) .ELSE -SHL1STDLIBS+= $(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)/libgraphite.a +SHL1STDLIBS+= -lgraphite2_off .ENDIF .ENDIF .ENDIF @@ -231,9 +231,10 @@ DEFLIB1NAME =vcl .IF "$(ENABLE_GRAPHITE)" == "TRUE" .IF "$(COM)" == "GCC" -SHL1STDLIBS += -lgraphite +SHL1STDLIBS += -Wl,-Bstatic -lgraphite2_off -Wl,-Bdynamic +#SHL1STDLIBS += -lgraphite2_off .ELSE -SHL1STDLIBS += graphite_dll.lib +SHL1STDLIBS += graphite2_off.lib .ENDIF .ENDIF diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h index 4e4e49d277fd..a23963f81e7b 100644 --- a/vcl/win/inc/salgdi.h +++ b/vcl/win/inc/salgdi.h @@ -39,6 +39,10 @@ #include "boost/scoped_ptr.hpp" #include <boost/unordered_set.hpp> +#ifdef ENABLE_GRAPHITE +#include <graphite2/Font.h> +#endif + class ImplFontSelectData; class ImplWinFontEntry; class ImplFontAttrCache; @@ -55,6 +59,26 @@ class ImplFontAttrCache; #define GCP_KERN_HACK #define GNG_VERT_HACK +#ifdef ENABLE_GRAPHITE +class RawFontData; +class GrFontData +{ +public: + GrFontData(HDC hDC); + ~GrFontData(); + const void * getTable(unsigned int name, size_t *len) const; + const gr_face * getFace() const { return mpFace; } + void AddReference() { ++mnRefCount; } + void DeReference() { if (--mnRefCount == 0) delete this; } +private: + GrFontData(GrFontData &) {}; + HDC mhDC; + mutable std::vector<RawFontData*> mvData; + gr_face * mpFace; + unsigned int mnRefCount; +}; +#endif + // win32 specific physically available font face class ImplWinFontData : public ImplFontData { @@ -82,6 +106,7 @@ public: bool AliasSymbolsLow() const { return mbAliasSymbolsLow; } #ifdef ENABLE_GRAPHITE bool SupportsGraphite() const { return mbHasGraphiteSupport; } + const gr_face* GraphiteFace() const; #endif const ImplFontCharMap* GetImplFontCharMap() const; @@ -101,6 +126,7 @@ private: mutable bool mbHasKoreanRange; mutable bool mbHasCJKSupport; #ifdef ENABLE_GRAPHITE + mutable GrFontData* mpGraphiteData; mutable bool mbHasGraphiteSupport; #endif mutable bool mbHasArabicSupport; @@ -119,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; @@ -145,7 +170,8 @@ public: HFONT mhFonts[ MAX_FALLBACK ]; // Font + Fallbacks const ImplWinFontData* mpWinFontData[ MAX_FALLBACK ]; // pointer to the most recent font face ImplWinFontEntry* mpWinFontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance - float mfFontScale; // allows metrics emulation of huge font sizes + float mfFontScale[ MAX_FALLBACK ]; // allows metrics emulation of huge font sizes + float mfCurrentFontScale; HPEN mhPen; // Pen HBRUSH mhBrush; // Brush HRGN mhRegion; // Region Handle diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 45588fbaab10..e0935a6d956a 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -804,7 +804,7 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar //in the structure (GetWindowPtr()). if (DestroyWindow((HWND)lParam) == 0) { - OSL_ENSURE(0, "DestroyWindow failed!"); + OSL_FAIL("DestroyWindow failed!"); //Failure: We remove the SalFrame from the window structure. So we avoid that // the window structure may contain an invalid pointer, once the SalFrame is deleted. SetWindowPtr((HWND)lParam, 0); diff --git a/vcl/win/source/gdi/MAKEFILE.MK b/vcl/win/source/gdi/makefile.mk index 7489be633f2b..18633648cb23 100644 --- a/vcl/win/source/gdi/MAKEFILE.MK +++ b/vcl/win/source/gdi/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -56,12 +56,15 @@ SLOFILES= $(SLO)$/salgdi.obj \ $(SLO)$/winlayout.obj \ $(SLO)$/wntgdi.obj \ $(SLO)$/salnativewidgets-luna.obj - + EXCEPTIONSFILES= $(SLO)$/salprn.obj .IF "$(ENABLE_GRAPHITE)" == "TRUE" CFLAGS+=-DENABLE_GRAPHITE +.IF "$(SYSTEM_GRAPHITE)" != "YES" +CDEFS+=-DGR2_STATIC +.ENDIF .ENDIF # --- Targets ------------------------------------------------------ diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index be5ad915c84a..1e5a4c49eba2 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -725,9 +725,10 @@ WinSalGraphics::WinSalGraphics() mhFonts[ i ] = 0; mpWinFontData[ i ] = NULL; mpWinFontEntry[ i ] = NULL; + mfFontScale[ i ] = 1.0; } - mfFontScale = 1.0; + mfCurrentFontScale = 1.0; mhDC = 0; mhPen = 0; diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index d1cfff879219..355cae79377b 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -78,8 +78,7 @@ #endif #ifdef ENABLE_GRAPHITE -#include <graphite/GrClient.h> -#include <graphite/WinFont.h> +#include <graphite2/Font.h> #endif #include <vector> @@ -1093,6 +1092,106 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) } // ======================================================================= +#ifdef ENABLE_GRAPHITE + +#ifdef DEBUG +static FILE * grLogFile = NULL; +static FILE * grLog() +{ +#ifdef WNT + std::string logFileName(getenv("TEMP")); + logFileName.append("\\grface.log"); + if (grLogFile == NULL) grLogFile = fopen(logFileName.c_str(),"w"); + else fflush(grLogFile); + return grLogFile; +#else + fflush(stdout); + return stdout; +#endif +} +#undef NDEBUG +#endif + +const void * getGrTable(const void* appFaceHandle, unsigned int name, size_t *len) +{ + const GrFontData * fontTables = reinterpret_cast<const GrFontData*>(appFaceHandle); + return fontTables->getTable(name, len); +} + +GrFontData::GrFontData(HDC hDC) : + mhDC(hDC), mpFace(NULL), mnRefCount(1) +{ + // The face options ensure that the tables are all read at construction + // time so there is no need to keep the hDC uptodate + static const char* pGraphiteCacheStr = getenv( "SAL_GRAPHITE_CACHE_SIZE" ); + unsigned long graphiteSegCacheSize = pGraphiteCacheStr ? (atoi(pGraphiteCacheStr)) : 0; + if (graphiteSegCacheSize > 500) + mpFace = gr_make_face_with_seg_cache(this, getGrTable, + graphiteSegCacheSize, gr_face_preloadGlyphs | gr_face_cacheCmap); + else + mpFace = gr_make_face(this, getGrTable, + gr_face_preloadGlyphs | gr_face_cacheCmap); +#ifdef DEBUG + fprintf(grLog(), "gr_make_face %lx for WinFontData %lx\n", (unsigned long)mpFace, + (unsigned long)this); +#endif + mhDC = NULL; +} + +GrFontData::~GrFontData() +{ + if (mpFace) + { +#ifdef DEBUG + fprintf(grLog(), "gr_face_destroy %lx for WinFontData %lx\n", (unsigned long)mpFace, + (unsigned long)this); +#endif + gr_face_destroy(mpFace); + mpFace = NULL; + } + std::vector<RawFontData*>::iterator i = mvData.begin(); + while (i != mvData.end()) + { + delete *i; + ++i; + } + mvData.clear(); +} + +const void * GrFontData::getTable(unsigned int name, size_t *len) const +{ +#ifdef DEBUG +#undef NDEBUG +#endif + assert(mhDC); + // swap the bytes + union TtfTag { + unsigned int i; + unsigned char c[4]; + }; + TtfTag littleEndianTag; + littleEndianTag.i = name; + TtfTag bigEndianTag; + bigEndianTag.c[0] = littleEndianTag.c[3]; + bigEndianTag.c[1] = littleEndianTag.c[2]; + bigEndianTag.c[2] = littleEndianTag.c[1]; + bigEndianTag.c[3] = littleEndianTag.c[0]; + mvData.push_back(new RawFontData(mhDC, bigEndianTag.i)); + const RawFontData * data = mvData[mvData.size()-1]; + if (data && (data->size() > 0)) + { + if (len) + *len = data->size(); + return reinterpret_cast<const void *>(data->get()); + } + else + { + if (len) + *len = 0; + return NULL; + } +} +#endif ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS, int nHeight, BYTE eWinCharSet, BYTE nPitchAndFamily ) @@ -1114,6 +1213,9 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS, mbAliasSymbolsHigh( false ), mnId( 0 ), mpEncodingVector( NULL ) +#ifdef ENABLE_GRAPHITE + ,mpGraphiteData(NULL) +#endif { SetBitmapSize( 0, nHeight ); @@ -1137,6 +1239,9 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS, mbAliasSymbolsHigh = true; } } +#ifdef DEBUG + fprintf(grLog(), "ImplWinFontData::ImplWinFontData() %lx\n", (unsigned long)this); +#endif } // ----------------------------------------------------------------------- @@ -1147,6 +1252,13 @@ ImplWinFontData::~ImplWinFontData() if( mpUnicodeMap ) mpUnicodeMap->DeReference(); +#ifdef ENABLE_GRAPHITE + if (mpGraphiteData) + mpGraphiteData->DeReference(); +#ifdef DEBUG + fprintf(grLog(), "ImplWinFontData::~ImplWinFontData %lx\n", (unsigned long)this); +#endif +#endif // ENABLE_GRAPHITE delete mpEncodingVector; } @@ -1159,6 +1271,13 @@ sal_IntPtr ImplWinFontData::GetFontId() const // ----------------------------------------------------------------------- +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::UpdateFromHDC( HDC hDC ) const { // short circuit if already initialized @@ -1166,12 +1285,31 @@ 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') ) { - mbHasGraphiteSupport = gr::WinFont::FontHasGraphiteTables(hDC); + const DWORD nSilfTag = CalcTag("Silf"); + const RawFontData aRawFontData( hDC, nSilfTag ); + mbHasGraphiteSupport = (aRawFontData.size() > 0); + if (mbHasGraphiteSupport) + { +#ifdef DEBUG + fprintf(grLog(), "ImplWinFontData::UpdateFromHDC %lx\n", + (unsigned long)this); +#endif + if (mpGraphiteData == NULL) + { + mpGraphiteData = new GrFontData(hDC); + if (!mpGraphiteData->getFace()) + { + mbHasGraphiteSupport = false; + delete mpGraphiteData; + mpGraphiteData = NULL; + } + } + } } #endif @@ -1185,6 +1323,17 @@ void ImplWinFontData::UpdateFromHDC( HDC hDC ) const } +#ifdef ENABLE_GRAPHITE +const gr_face* ImplWinFontData::GraphiteFace() const +{ +#ifdef DEBUG + fprintf(grLog(), "ImplWinFontData::GraphiteFace %lx has face %lx\n", + (unsigned long)this, mpGraphiteData? mpGraphiteData->getFace(): 0); +#endif + assert((mpGraphiteData == NULL) || (mpGraphiteData->getFontData() == this)); + return (mpGraphiteData)? mpGraphiteData->getFace() : NULL; +} +#endif // ----------------------------------------------------------------------- bool ImplWinFontData::HasGSUBstitutions( HDC hDC ) const @@ -1218,38 +1367,6 @@ 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" ); - DWORD nLength = ::GetFontData( hDC, Os2Tag, 0, NULL, 0 ); - if( (nLength == GDI_ERROR) || !nLength ) - return; - std::vector<unsigned char> aOS2map( nLength ); - unsigned char* pOS2map = &aOS2map[0]; - ::GetFontData( hDC, Os2Tag, 0, pOS2map, nLength ); - sal_uInt32 nVersion = GetUShort( pOS2map ); - if ( nVersion >= 0x0001 && nLength >= 58 ) - { - // We need at least version 0x0001 (TrueType rev 1.66) - // to have access to the needed struct members. - sal_uInt32 ulUnicodeRange1 = GetUInt( pOS2map + 42 ); - sal_uInt32 ulUnicodeRange2 = GetUInt( pOS2map + 46 ); - - // Check for CJK capabilities of the current font - mbHasCJKSupport = (ulUnicodeRange2 & 0x2DF00000); - mbHasKoreanRange= (ulUnicodeRange1 & 0x10000000) - | (ulUnicodeRange2 & 0x01100000); - mbHasArabicSupport = (ulUnicodeRange1 & 0x00002000); - } -} - -// ----------------------------------------------------------------------- - void ImplWinFontData::ReadGsubTable( HDC hDC ) const { mbGsubRead = true; @@ -1333,7 +1450,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]; @@ -1344,12 +1461,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); + } } } @@ -1559,6 +1688,7 @@ sal_uInt16 WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLeve // deselect still active font if( mhDefFont ) ::SelectFont( mhDC, mhDefFont ); + mfCurrentFontScale = mfFontScale[nFallbackLevel]; // release no longer referenced font handles for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i ) { @@ -1575,7 +1705,8 @@ sal_uInt16 WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLeve mpWinFontData[ nFallbackLevel ] = static_cast<const ImplWinFontData*>( pFont->mpFontData ); HFONT hOldFont = 0; - HFONT hNewFont = ImplDoSetFont( pFont, mfFontScale, hOldFont ); + HFONT hNewFont = ImplDoSetFont( pFont, mfFontScale[ nFallbackLevel ], hOldFont ); + mfCurrentFontScale = mfFontScale[nFallbackLevel]; if( !mhDefFont ) { @@ -1669,11 +1800,11 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe } // transformation dependend font metrics - pMetric->mnWidth = static_cast<int>( mfFontScale * aWinMetric.tmAveCharWidth ); - pMetric->mnIntLeading = static_cast<int>( mfFontScale * aWinMetric.tmInternalLeading ); - pMetric->mnExtLeading = static_cast<int>( mfFontScale * aWinMetric.tmExternalLeading ); - pMetric->mnAscent = static_cast<int>( mfFontScale * aWinMetric.tmAscent ); - pMetric->mnDescent = static_cast<int>( mfFontScale * aWinMetric.tmDescent ); + pMetric->mnWidth = static_cast<int>( mfFontScale[nFallbackLevel] * aWinMetric.tmAveCharWidth ); + pMetric->mnIntLeading = static_cast<int>( mfFontScale[nFallbackLevel] * aWinMetric.tmInternalLeading ); + pMetric->mnExtLeading = static_cast<int>( mfFontScale[nFallbackLevel] * aWinMetric.tmExternalLeading ); + pMetric->mnAscent = static_cast<int>( mfFontScale[nFallbackLevel] * aWinMetric.tmAscent ); + pMetric->mnDescent = static_cast<int>( mfFontScale[nFallbackLevel] * aWinMetric.tmDescent ); // #107888# improved metric compatibility for Asian fonts... // TODO: assess workaround below for CWS >= extleading @@ -2398,10 +2529,10 @@ sal_Bool WinSalGraphics::GetGlyphBoundRect( long nIndex, Rectangle& rRect ) rRect = Rectangle( Point( +aGM.gmptGlyphOrigin.x, -aGM.gmptGlyphOrigin.y ), Size( aGM.gmBlackBoxX, aGM.gmBlackBoxY ) ); - rRect.Left() = static_cast<int>( mfFontScale * rRect.Left() ); - rRect.Right() = static_cast<int>( mfFontScale * rRect.Right() ); - rRect.Top() = static_cast<int>( mfFontScale * rRect.Top() ); - rRect.Bottom() = static_cast<int>( mfFontScale * rRect.Bottom() ); + rRect.Left() = static_cast<int>( mfCurrentFontScale * rRect.Left() ); + rRect.Right() = static_cast<int>( mfCurrentFontScale * rRect.Right() ); + rRect.Top() = static_cast<int>( mfCurrentFontScale * rRect.Top() ); + rRect.Bottom() = static_cast<int>( mfCurrentFontScale * rRect.Bottom() ); return true; } @@ -2582,7 +2713,7 @@ sal_Bool WinSalGraphics::GetGlyphOutline( long nIndex, // rescaling needed for the PolyPolygon conversion if( rB2DPolyPoly.count() ) { - const double fFactor(mfFontScale/256); + const double fFactor(mfCurrentFontScale/256); rB2DPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix(fFactor, fFactor)); } diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index 7f4bc62ca87b..b233f97a15ee 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -82,14 +82,14 @@ } \ __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation()))\ { \ - DBG_ERROR( mes ); \ + OSL_FAIL( mes ); \ p->markInvalid(); \ } #define CATCH_DRIVER_EX_END_2(mes) \ } \ __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation()))\ { \ - DBG_ERROR( mes ); \ + OSL_FAIL( mes ); \ } #endif diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 5d694faeeb90..1c47b21d550d 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -72,11 +72,7 @@ typedef std::set<int> IntSet; // Graphite headers #ifdef ENABLE_GRAPHITE #include <i18npool/mslangid.hxx> -#include <graphite/GrClient.h> -#include <graphite/WinFont.h> -#include <graphite/Segment.h> #include <vcl/graphite_layout.hxx> -#include <vcl/graphite_cache.hxx> #include <vcl/graphite_features.hxx> #endif @@ -1921,11 +1917,11 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, } else { - nExtraOfs += nToFillWidth; // at right of cell - nSubIter = 0; // done with glyph injection + nExtraOfs += nToFillWidth; // at right of cell + nSubIter = 0; // done with glyph injection } if( !bManualCellAlign ) - nExtraOfs -= nExtraWidth; // adjust for right-aligned cells + nExtraOfs -= nExtraWidth; // adjust for right-aligned cells // adjust the draw position for the injected-glyphs case if( nExtraOfs ) @@ -2546,8 +2542,8 @@ void UniscribeLayout::KashidaItemFix( int nMinGlyphPos, int nEndGlyphPos ) { // check for vowels if( (i > nMinGlyphPos && !mpGlyphAdvances[ i-1 ]) - && (1U << mpVisualAttrs[i].uJustification) & 0xFF83 ) // all Arabic justifiction types - { // including SCRIPT_JUSTIFY_NONE + && (1U << mpVisualAttrs[i].uJustification) & 0xFF83 ) // all Arabic justifiction types + { // including SCRIPT_JUSTIFY_NONE // vowel, we do it like ScriptJustify does // the vowel gets the extra width long nSpaceAdded = mpJustifications[ i ] - mpGlyphAdvances[ i ]; @@ -2680,7 +2676,7 @@ void UniscribeLayout::Justify( long nNewWidth ) if( nOldWidth <= 0 ) return; - nNewWidth *= mnUnitsPerPixel; // convert into font units + nNewWidth *= mnUnitsPerPixel; // convert into font units if( nNewWidth == nOldWidth ) return; // prepare to distribute the extra width evenly among the visual items @@ -2742,8 +2738,8 @@ bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const if ( nMinGlyphIndex == -1 || !mpLogClusters[ nCharPos ] ) return false; -// This test didn't give the expected results -/* if( mpLogClusters[ nCharPos+1 ] == mpLogClusters[ nCharPos ]) +// This test didn't give the expected results +/* if( mpLogClusters[ nCharPos+1 ] == mpLogClusters[ nCharPos ]) // two chars, one glyph return false;*/ @@ -2767,9 +2763,9 @@ bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const class GraphiteLayoutWinImpl : public GraphiteLayout { public: - GraphiteLayoutWinImpl(const gr::Font & font, ImplWinFontEntry & rFont) + GraphiteLayoutWinImpl(const gr_face * pFace, ImplWinFontEntry & rFont) throw() - : GraphiteLayout(font), mrFont(rFont) {}; + : GraphiteLayout(pFace), mrFont(rFont) {}; virtual ~GraphiteLayoutWinImpl() throw() {}; virtual sal_GlyphId getKashidaGlyph(int & rWidth); private: @@ -2788,18 +2784,15 @@ sal_GlyphId GraphiteLayoutWinImpl::getKashidaGlyph(int & rWidth) class GraphiteWinLayout : public WinLayout { private: - mutable GraphiteWinFont mpFont; + gr_font * mpFont; grutils::GrFeatureParser * mpFeatures; mutable GraphiteLayoutWinImpl maImpl; public: GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE); - static bool IsGraphiteEnabledFont(HDC hDC) throw(); - // used by upper layers virtual bool LayoutText( ImplLayoutArgs& ); // first step of layout virtual void AdjustLayout( ImplLayoutArgs& ); // adjusting after fallback etc. - // virtual void InitFont() const; virtual void DrawText( SalGraphics& ) const; // methods using string indexing @@ -2816,21 +2809,36 @@ public: virtual void MoveGlyph( int nStart, long nNewXPos ); virtual void DropGlyph( int nStart ); virtual void Simplify( bool bIsBase ); - ~GraphiteWinLayout() { delete mpFeatures; mpFeatures = NULL; }; -protected: - virtual void ReplaceDC(gr::Segment & segment) const; - virtual void RestoreDC(gr::Segment & segment) const; + ~GraphiteWinLayout() + { + delete mpFeatures; + gr_font_destroy(maImpl.GetFont()); + } }; -bool GraphiteWinLayout::IsGraphiteEnabledFont(HDC hDC) throw() +float gr_fontAdvance(const void* appFontHandle, gr_uint16 glyphId) { - return gr::WinFont::FontHasGraphiteTables(hDC); + HDC hDC = reinterpret_cast<HDC>(const_cast<void*>(appFontHandle)); + GLYPHMETRICS gm; + const MAT2 mat2 = {{0,1}, {0,0}, {0,0}, {0,1}}; + if (GDI_ERROR == ::GetGlyphOutlineW(hDC, glyphId, GGO_GLYPH_INDEX | GGO_METRICS, + &gm, 0, NULL, &mat2)) + { + return .0f; + } + return gm.gmCellIncX; } GraphiteWinLayout::GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE) throw() - : WinLayout(hDC, rWFD, rWFE), mpFont(hDC), - maImpl(mpFont, rWFE) + : WinLayout(hDC, rWFD, rWFE), mpFont(NULL), + maImpl(rWFD.GraphiteFace(), rWFE) { + // the log font size may differ from the font entry size if scaling is used for large fonts + LOGFONTW aLogFont; + ::GetObjectW( mhFont, sizeof(LOGFONTW), &aLogFont); + mpFont = gr_make_font_with_advance_fn(static_cast<float>(-aLogFont.lfHeight), + hDC, gr_fontAdvance, rWFD.GraphiteFace()); + maImpl.SetFont(mpFont); const rtl::OString aLang = MsLangId::convertLanguageToIsoByteString( rWFE.maFontSelData.meLanguage ); rtl::OString name = rtl::OUStringToOString( rWFE.maFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); @@ -2838,27 +2846,15 @@ GraphiteWinLayout::GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplW if (nFeat > 0) { rtl::OString aFeat = name.copy(nFeat, name.getLength() - nFeat); - mpFeatures = new grutils::GrFeatureParser(mpFont, aFeat.getStr(), aLang.getStr()); + mpFeatures = new grutils::GrFeatureParser(rWFD.GraphiteFace(), aFeat.getStr(), aLang.getStr()); } else { - mpFeatures = new grutils::GrFeatureParser(mpFont, aLang.getStr()); + mpFeatures = new grutils::GrFeatureParser(rWFD.GraphiteFace(), aLang.getStr()); } maImpl.SetFeatures(mpFeatures); } -void GraphiteWinLayout::ReplaceDC(gr::Segment & segment) const -{ - COLORREF color = GetTextColor(mhDC); - dynamic_cast<gr::WinFont&>(segment.getFont()).replaceDC(mhDC); - SetTextColor(mhDC, color); -} - -void GraphiteWinLayout::RestoreDC(gr::Segment & segment) const -{ - dynamic_cast<gr::WinFont&>(segment.getFont()).restoreDC(); -} - bool GraphiteWinLayout::LayoutText( ImplLayoutArgs & args) { if (args.mnMinCharPos >= args.mnEndCharPos) @@ -2866,7 +2862,7 @@ bool GraphiteWinLayout::LayoutText( ImplLayoutArgs & args) maImpl.clear(); return true; } - HFONT hUnRotatedFont; + HFONT hUnRotatedFont = 0; if (args.mnOrientation) { // Graphite gets very confused if the font is rotated @@ -2878,36 +2874,16 @@ bool GraphiteWinLayout::LayoutText( ImplLayoutArgs & args) ::SelectFont(mhDC, hUnRotatedFont); } WinLayout::AdjustLayout(args); - mpFont.replaceDC(mhDC); maImpl.SetFontScale(WinLayout::mfFontScale); - //bool succeeded = maImpl.LayoutText(args); -#ifdef GRCACHE - GrSegRecord * pSegRecord = NULL; - gr::Segment * pSegment = maImpl.CreateSegment(args, &pSegRecord); -#else - gr::Segment * pSegment = maImpl.CreateSegment(args); -#endif + gr_segment * pSegment = maImpl.CreateSegment(args); bool bSucceeded = false; if (pSegment) { // replace the DC on the font within the segment - ReplaceDC(*pSegment); // create glyph vectors -#ifdef GRCACHE - bSucceeded = maImpl.LayoutGlyphs(args, pSegment, pSegRecord); -#else bSucceeded = maImpl.LayoutGlyphs(args, pSegment); -#endif - // restore original DC - RestoreDC(*pSegment); -#ifdef GRCACHE - if (pSegRecord) pSegRecord->unlock(); - else delete pSegment; -#else - delete pSegment; -#endif + gr_seg_destroy(pSegment); } - mpFont.restoreDC(); if (args.mnOrientation) { // restore the rotated font @@ -2956,9 +2932,7 @@ void GraphiteWinLayout::DrawText(SalGraphics &sal_graphics) const int GraphiteWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { - mpFont.replaceDC(mhDC); int nBreak = maImpl.GetTextBreak(nMaxWidth, nCharExtra, nFactor); - mpFont.restoreDC(); return nBreak; } @@ -3012,7 +2986,9 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe { #ifdef ENABLE_GRAPHITE if (rFontFace.SupportsGraphite()) + { pWinLayout = new GraphiteWinLayout(mhDC, rFontFace, rFontInstance); + } else #endif // ENABLE_GRAPHITE // script complexity is determined in upper layers @@ -3045,20 +3021,20 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe pWinLayout = new SimpleWinLayout( mhDC, eCharSet, rFontFace, rFontInstance ); } - if( mfFontScale != 1.0 ) - pWinLayout->SetFontScale( mfFontScale ); + if( mfFontScale[nFallbackLevel] != 1.0 ) + pWinLayout->SetFontScale( mfFontScale[nFallbackLevel] ); return pWinLayout; } // ----------------------------------------------------------------------- -int WinSalGraphics::GetMinKashidaWidth() +int WinSalGraphics::GetMinKashidaWidth() { if( !mpWinFontEntry[0] ) return 0; mpWinFontEntry[0]->InitKashidaHandling( mhDC ); - int nMinKashida = static_cast<int>(mfFontScale * mpWinFontEntry[0]->GetMinKashidaWidth()); + int nMinKashida = static_cast<int>(mfFontScale[0] * mpWinFontEntry[0]->GetMinKashidaWidth()); return nMinKashida; } @@ -3069,8 +3045,8 @@ ImplWinFontEntry::ImplWinFontEntry( ImplFontSelectData& rFSD ) , maWidthMap( 512 ) , mpKerningPairs( NULL ) , mnKerningPairs( -1 ) -, mnMinKashidaWidth( -1 ) -, mnMinKashidaGlyph( -1 ) +, mnMinKashidaWidth( -1 ) +, mnMinKashidaGlyph( -1 ) { #ifdef USE_UNISCRIBE maScriptCache = NULL; @@ -3160,6 +3136,10 @@ ImplFontData* ImplWinFontData::Clone() const { if( mpUnicodeMap ) mpUnicodeMap->AddReference(); +#ifdef ENABLE_GRAPHITE + if ( mpGraphiteData ) + mpGraphiteData->AddReference(); +#endif ImplFontData* pClone = new ImplWinFontData( *this ); return pClone; } |