[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - filter/source i18npool/source sdext/source svtools/source
Ariel Constenla-Haile
arielch at apache.org
Thu Apr 10 09:08:10 PDT 2014
filter/source/svg/svgexport.cxx | 84 ++++
filter/source/svg/svgfilter.cxx | 17
filter/source/svg/svgfilter.hxx | 1
i18npool/source/localedata/data/localedata_euro.map | 17
i18npool/source/localedata/data/makefile.mk | 1
i18npool/source/localedata/data/tt_RU.xml | 354 ++++++++++++++++++++
i18npool/source/localedata/localedata.cxx | 1
sdext/source/minimizer/optimizerdialog.cxx | 2
svtools/source/uno/wizard/unowizard.cxx | 2
svtools/source/uno/wizard/wizardshell.cxx | 5
svtools/source/uno/wizard/wizardshell.hxx | 6
11 files changed, 470 insertions(+), 20 deletions(-)
New commits:
commit 6a820f13a5cadc3d6d8c7bac1e4042adcee379ac
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu Apr 10 15:33:21 2014 +0000
i124629 - UNO Wizard - avoid crash by removing unneeded reference
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 845adfc..b1da984 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -228,7 +228,7 @@ namespace svt { namespace uno
//--------------------------------------------------------------------
Dialog* Wizard::createDialog( Window* i_pParent )
{
- WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) );
+ WizardShell* pDialog( new WizardShell( i_pParent, m_xController, m_aWizardSteps ) );
pDialog->SetHelpId( lcl_getHelpId( m_sHelpURL ) );
pDialog->setTitleBase( m_sTitle );
return pDialog;
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 51d85e6..a78503e 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -72,14 +72,13 @@ namespace svt { namespace uno
//= WizardShell
//==================================================================================================================
//------------------------------------------------------------------------------------------------------------------
- WizardShell::WizardShell( Window* i_pParent, const Reference< XWizard >& i_rWizard, const Reference< XWizardController >& i_rController,
+ WizardShell::WizardShell( Window* i_pParent, const Reference< XWizardController >& i_rController,
const Sequence< Sequence< sal_Int16 > >& i_rPaths )
:WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE )
- ,m_xWizard( i_rWizard )
,m_xController( i_rController )
,m_nFirstPageID( lcl_determineFirstPageID( i_rPaths ) )
{
- ENSURE_OR_THROW( m_xWizard.is() && m_xController.is(), "invalid wizard/controller" );
+ ENSURE_OR_THROW( m_xController.is(), "invalid controller" );
// declare the paths
for ( sal_Int32 i=0; i<i_rPaths.getLength(); ++i )
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index 0587f0d..6f218bc 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -51,7 +51,6 @@ namespace svt { namespace uno
public:
WizardShell(
Window* _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizard >& i_rWizard,
const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > >& i_rPaths
);
@@ -70,10 +69,6 @@ namespace svt { namespace uno
virtual IWizardPageController*
getPageController( TabPage* _pCurrentPage ) const;
- // attribute access
- const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizard >&
- getWizard() const { return m_xWizard; }
-
static sal_Int16 convertCommitReasonToTravelType( const CommitPageReason i_eReason );
// operations
@@ -131,7 +126,6 @@ namespace svt { namespace uno
private:
typedef ::std::map< TabPage*, PWizardPageController > Page2ControllerMap;
- const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizard > m_xWizard;
const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController > m_xController;
const sal_Int16 m_nFirstPageID;
Page2ControllerMap m_aPageControllers;
commit 87a8aa9a79874c759631548545c63fe13d695f68
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu Apr 10 15:33:10 2014 +0000
Use high-contrast image
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 5228513..3c9b4e3 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -42,7 +42,7 @@
#define URL_GRAPHIC_REPO "private:graphicrepository"
#define IMAGE_ROADMAP URL_GRAPHIC_REPO "/minimizer/minimizepresi_80.png"
-#define IMAGE_ROADMAP_HC URL_GRAPHIC_REPO "/minimizer/minimizepresi_80.png"
+#define IMAGE_ROADMAP_HC URL_GRAPHIC_REPO "/minimizer/minimizepresi_80_h.png"
// -------------------
// - OPTIMIZERDIALOG -
commit bfc1aa46b9ee9ad37728389eb636fc9fb5b9827f
Author: Armin Le Grand <alg at apache.org>
Date: Thu Apr 10 15:02:30 2014 +0000
i124608 when exporting selection, use selection boundrect as svg canvas
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 0a05141..a5746b3 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -31,6 +31,8 @@
#include "svgfilter.hxx"
#include "impsvgdialog.hxx"
+#include <com/sun/star/graphic/XPrimitiveFactory2D.hpp>
+
#include <svx/unopage.hxx>
#include <svx/unoshape.hxx>
#include <svx/svdpage.hxx>
@@ -39,6 +41,8 @@
#include <editeng/flditem.hxx>
#include <editeng/numitem.hxx>
+using namespace ::com::sun::star::graphic;
+using namespace ::com::sun::star::geometry;
using ::rtl::OUString;
// -------------
@@ -398,6 +402,7 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP
"SVGFilter::implExportDocument: invalid parameter" );
OUString aAttr;
+ sal_Int32 nDocX = 0, nDocY = 0; // #124608#
sal_Int32 nDocWidth = 0, nDocHeight = 0;
sal_Int32 nVisible = -1, nVisibleMaster = -1;
sal_Bool bRet = sal_False;
@@ -408,10 +413,61 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP
const Reference< XPropertySet > xDefaultPagePropertySet( mxDefaultPage, UNO_QUERY );
const Reference< XExtendedDocumentHandler > xExtDocHandler( mpSVGExport->GetDocHandler(), UNO_QUERY );
- if( xDefaultPagePropertySet.is() )
+ // #124608#
+ mbExportSelection = maShapeSelection.is() && maShapeSelection->getCount();
+
+ if(xDefaultPagePropertySet.is())
{
- xDefaultPagePropertySet->getPropertyValue( B2UCONST( "Width" ) ) >>= nDocWidth;
- xDefaultPagePropertySet->getPropertyValue( B2UCONST( "Height" ) ) >>= nDocHeight;
+ xDefaultPagePropertySet->getPropertyValue(B2UCONST("Width")) >>= nDocWidth;
+ xDefaultPagePropertySet->getPropertyValue(B2UCONST("Height")) >>= nDocHeight;
+ }
+
+ if(mbExportSelection)
+ {
+ // #124608# create BoundRange and set nDocX, nDocY, nDocWidth and nDocHeight
+ basegfx::B2DRange aShapeRange;
+
+ Reference< XPrimitiveFactory2D > xPrimitiveFactory(
+ mxMSF->createInstance(
+ String(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.graphic.PrimitiveFactory2D"))),
+ UNO_QUERY);
+
+ // use XPrimitiveFactory2D and go the way over getting the primitives; this
+ // will give better precision (doubles) and be based on the true object
+ // geometry. If needed aViewInformation may be expanded to carry a view
+ // resolution for which to prepare the geometry.
+ if(xPrimitiveFactory.is())
+ {
+ Reference< XShape > xShapeCandidate;
+ const Sequence< PropertyValue > aViewInformation;
+ const Sequence< PropertyValue > aParams;
+
+ for(sal_Int32 a(0); a < maShapeSelection->getCount(); a++)
+ {
+ if((maShapeSelection->getByIndex(a) >>= xShapeCandidate) && xShapeCandidate.is())
+ {
+ const Sequence< Reference< XPrimitive2D > > aPrimitiveSequence(
+ xPrimitiveFactory->createPrimitivesFromXShape( xShapeCandidate, aParams ));
+ const sal_Int32 nCount(aPrimitiveSequence.getLength());
+
+ for(sal_Int32 nIndex = 0; nIndex < nCount; nIndex++)
+ {
+ const RealRectangle2D aRect(aPrimitiveSequence[nIndex]->getRange(aViewInformation));
+
+ aShapeRange.expand(basegfx::B2DTuple(aRect.X1, aRect.Y1));
+ aShapeRange.expand(basegfx::B2DTuple(aRect.X2, aRect.Y2));
+ }
+ }
+ }
+ }
+
+ if(!aShapeRange.isEmpty())
+ {
+ nDocX = basegfx::fround(aShapeRange.getMinX());
+ nDocY = basegfx::fround(aShapeRange.getMinY());
+ nDocWidth = basegfx::fround(aShapeRange.getWidth());
+ nDocHeight = basegfx::fround(aShapeRange.getHeight());
+ }
}
if( xExtDocHandler.is() && !mpSVGExport->IsUseTinyProfile() )
@@ -434,11 +490,23 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", aAttr );
#endif
- aAttr = B2UCONST( "0 0 " );
+ // #124608# set viewBox explicitely to the exported content
+ if(mbExportSelection)
+ {
+ aAttr = OUString::valueOf( nDocX );
+ aAttr += B2UCONST( " " );
+ aAttr += OUString::valueOf( nDocY );
+ aAttr += B2UCONST( " " );
+ }
+ else
+ {
+ aAttr = B2UCONST( "0 0 " );
+ }
+
aAttr += OUString::valueOf( nDocWidth );
aAttr += B2UCONST( " " );
aAttr += OUString::valueOf( nDocHeight );
- mpSVGExport->SetViewBox( Rectangle( Point(), Size( nDocWidth, nDocHeight ) ) );
+ mpSVGExport->SetViewBox( Rectangle( Point(nDocX, nDocY), Size( nDocWidth, nDocHeight ) ) );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "preserveAspectRatio", B2UCONST( "xMidYMid" ) );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill-rule", B2UCONST( "evenodd" ) );
@@ -514,7 +582,7 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP
{
if(bSinglePage)
{
- if(maShapeSelection.is() && maShapeSelection->getCount())
+ if(mbExportSelection)
{
// #124608# export a given object selection, so no MasterPage export at all
}
@@ -639,7 +707,7 @@ sal_Bool SVGFilter::implExportPages( const Reference< XDrawPages >& rxPages,
{
Reference< XShapes > xShapes;
- if(maShapeSelection.is() && maShapeSelection->getCount())
+ if(mbExportSelection)
{
// #124608# export a given object selection
xShapes = maShapeSelection;
@@ -924,7 +992,7 @@ sal_Bool SVGFilter::implCreateObjects( const Reference< XDrawPages >& rxMasterPa
DBG_ASSERT( nPageToExport >= 0 && nPageToExport < rxDrawPages->getCount(),
"SVGFilter::implCreateObjects: invalid page number to export" );
- if(maShapeSelection.is() && maShapeSelection->getCount())
+ if(mbExportSelection)
{
// #124608# export a given object selection
implCreateObjectsFromShapes(maShapeSelection);
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 4b7bedd..4e4c5ab 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -52,7 +52,22 @@ SVGFilter::SVGFilter( const Reference< XMultiServiceFactory > &rxMSF ) :
mpSVGWriter( NULL ),
mpDefaultSdrPage( NULL ),
mpSdrModel( NULL ),
- mbPresentation( sal_False )
+ mbPresentation( sal_False ),
+ mpObjects( NULL ),
+ mxSrcDoc(),
+#ifdef SOLAR_JAVA
+ mxDstDoc(),
+#endif
+ mxDefaultPage(),
+ maFilterData(),
+ maShapeSelection(),
+ mbExportSelection(false),
+ maUniqueIdVector(),
+ mnMasterSlideId(0),
+ mnSlideId(0),
+ mnDrawingGroupId(0),
+ mnDrawingId(0),
+ maOldFieldHdl()
{
}
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index e11e28f..b482207 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -249,6 +249,7 @@ private:
// #124608# explicit ShapeSelection for export when export of the selection is wanted
Reference< XShapes > maShapeSelection;
+ bool mbExportSelection;
UniqueIdVector maUniqueIdVector;
sal_Int32 mnMasterSlideId;
commit 793c53c25399b810d70697cba4af9169a042bb08
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu Apr 10 14:18:02 2014 +0000
i124631 - Add locale data for Tatar (tt-RU)
diff --git a/i18npool/source/localedata/data/localedata_euro.map b/i18npool/source/localedata/data/localedata_euro.map
index 1dbbe31..4147a28 100644
--- a/i18npool/source/localedata/data/localedata_euro.map
+++ b/i18npool/source/localedata/data/localedata_euro.map
@@ -92,6 +92,7 @@ getAllCalendars_sr_YU;
getAllCalendars_sv_FI;
getAllCalendars_sv_SE;
getAllCalendars_tr_TR;
+getAllCalendars_tt_RU;
getAllCalendars_uk_UA;
getAllCalendars_wa_BE;
getAllCurrencies_ast_ES;
@@ -165,6 +166,7 @@ getAllCurrencies_sr_YU;
getAllCurrencies_sv_FI;
getAllCurrencies_sv_SE;
getAllCurrencies_tr_TR;
+getAllCurrencies_tt_RU;
getAllCurrencies_uk_UA;
getAllCurrencies_wa_BE;
getAllFormats0_ast_ES;
@@ -238,6 +240,7 @@ getAllFormats0_sr_YU;
getAllFormats0_sv_FI;
getAllFormats0_sv_SE;
getAllFormats0_tr_TR;
+getAllFormats0_tt_RU;
getAllFormats0_uk_UA;
getAllFormats0_wa_BE;
getBreakIteratorRules_ast_ES;
@@ -311,6 +314,7 @@ getBreakIteratorRules_sr_YU;
getBreakIteratorRules_sv_FI;
getBreakIteratorRules_sv_SE;
getBreakIteratorRules_tr_TR;
+getBreakIteratorRules_tt_RU;
getBreakIteratorRules_uk_UA;
getBreakIteratorRules_wa_BE;
getCollationOptions_ast_ES;
@@ -384,6 +388,7 @@ getCollationOptions_sr_YU;
getCollationOptions_sv_FI;
getCollationOptions_sv_SE;
getCollationOptions_tr_TR;
+getCollationOptions_tt_RU;
getCollationOptions_uk_UA;
getCollationOptions_wa_BE;
getCollatorImplementation_ast_ES;
@@ -457,6 +462,7 @@ getCollatorImplementation_sr_YU;
getCollatorImplementation_sv_FI;
getCollatorImplementation_sv_SE;
getCollatorImplementation_tr_TR;
+getCollatorImplementation_tt_RU;
getCollatorImplementation_uk_UA;
getCollatorImplementation_wa_BE;
getContinuousNumberingLevels_ast_ES;
@@ -530,6 +536,7 @@ getContinuousNumberingLevels_sr_YU;
getContinuousNumberingLevels_sv_FI;
getContinuousNumberingLevels_sv_SE;
getContinuousNumberingLevels_tr_TR;
+getContinuousNumberingLevels_tt_RU;
getContinuousNumberingLevels_uk_UA;
getContinuousNumberingLevels_wa_BE;
getFollowPageWords_ast_ES;
@@ -603,6 +610,7 @@ getFollowPageWords_sr_YU;
getFollowPageWords_sv_FI;
getFollowPageWords_sv_SE;
getFollowPageWords_tr_TR;
+getFollowPageWords_tt_RU;
getFollowPageWords_uk_UA;
getFollowPageWords_wa_BE;
getForbiddenCharacters_ast_ES;
@@ -676,6 +684,7 @@ getForbiddenCharacters_sr_YU;
getForbiddenCharacters_sv_FI;
getForbiddenCharacters_sv_SE;
getForbiddenCharacters_tr_TR;
+getForbiddenCharacters_tt_RU;
getForbiddenCharacters_uk_UA;
getForbiddenCharacters_wa_BE;
getIndexAlgorithm_ast_ES;
@@ -749,6 +758,7 @@ getIndexAlgorithm_sr_YU;
getIndexAlgorithm_sv_FI;
getIndexAlgorithm_sv_SE;
getIndexAlgorithm_tr_TR;
+getIndexAlgorithm_tt_RU;
getIndexAlgorithm_uk_UA;
getIndexAlgorithm_wa_BE;
getLCInfo_ast_ES;
@@ -822,6 +832,7 @@ getLCInfo_sr_YU;
getLCInfo_sv_FI;
getLCInfo_sv_SE;
getLCInfo_tr_TR;
+getLCInfo_tt_RU;
getLCInfo_uk_UA;
getLCInfo_wa_BE;
getLocaleItem_ast_ES;
@@ -895,6 +906,7 @@ getLocaleItem_sr_YU;
getLocaleItem_sv_FI;
getLocaleItem_sv_SE;
getLocaleItem_tr_TR;
+getLocaleItem_tt_RU;
getLocaleItem_uk_UA;
getLocaleItem_wa_BE;
getOutlineNumberingLevels_ast_ES;
@@ -968,6 +980,7 @@ getOutlineNumberingLevels_sr_YU;
getOutlineNumberingLevels_sv_FI;
getOutlineNumberingLevels_sv_SE;
getOutlineNumberingLevels_tr_TR;
+getOutlineNumberingLevels_tt_RU;
getOutlineNumberingLevels_uk_UA;
getOutlineNumberingLevels_wa_BE;
getReservedWords_ast_ES;
@@ -1041,6 +1054,7 @@ getReservedWords_sr_YU;
getReservedWords_sv_FI;
getReservedWords_sv_SE;
getReservedWords_tr_TR;
+getReservedWords_tt_RU;
getReservedWords_uk_UA;
getReservedWords_wa_BE;
getSearchOptions_ast_ES;
@@ -1114,6 +1128,7 @@ getSearchOptions_sr_YU;
getSearchOptions_sv_FI;
getSearchOptions_sv_SE;
getSearchOptions_tr_TR;
+getSearchOptions_tt_RU;
getSearchOptions_uk_UA;
getSearchOptions_wa_BE;
getTransliterations_ast_ES;
@@ -1187,6 +1202,7 @@ getTransliterations_sr_YU;
getTransliterations_sv_FI;
getTransliterations_sv_SE;
getTransliterations_tr_TR;
+getTransliterations_tt_RU;
getTransliterations_uk_UA;
getTransliterations_wa_BE;
getUnicodeScripts_ast_ES;
@@ -1260,6 +1276,7 @@ getUnicodeScripts_sr_YU;
getUnicodeScripts_sv_FI;
getUnicodeScripts_sv_SE;
getUnicodeScripts_tr_TR;
+getUnicodeScripts_tt_RU;
getUnicodeScripts_uk_UA;
getUnicodeScripts_wa_BE;
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index d59b0d8..e157747 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/makefile.mk
@@ -213,6 +213,7 @@ SHL3OBJS= \
$(SLO)$/localedata_sv_FI.obj \
$(SLO)$/localedata_sv_SE.obj \
$(SLO)$/localedata_tr_TR.obj \
+ $(SLO)$/localedata_tt_RU.obj \
$(SLO)$/localedata_uk_UA.obj \
$(SLO)$/localedata_wa_BE.obj
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 627ad9d..7443742 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -130,6 +130,7 @@ static const struct {
{ "pt_PT", lcl_DATA_EURO },
{ "ru_RU", lcl_DATA_EURO },
{ "tr_TR", lcl_DATA_EURO },
+ { "tt_RU", lcl_DATA_EURO },
{ "et_EE", lcl_DATA_EURO },
{ "lb_LU", lcl_DATA_EURO },
{ "lt_LT", lcl_DATA_EURO },
commit f5d13ffd92a71451be33f96a56a3bd75156a5901
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu Apr 10 14:17:55 2014 +0000
i124631 - Add locale data for Tatar (tt-RU)
Locale data contributed by Irek Khaziev <khazirek at mail.ru>
diff --git a/i18npool/source/localedata/data/tt_RU.xml b/i18npool/source/localedata/data/tt_RU.xml
new file mode 100644
index 0000000..9f4fce1
--- /dev/null
+++ b/i18npool/source/localedata/data/tt_RU.xml
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
+ <LC_INFO>
+ <Language>
+ <LangID>tt</LangID>
+ <DefaultName>Tatar</DefaultName>
+ </Language>
+ <Country>
+ <CountryID>RU</CountryID>
+ <DefaultName>Russia</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE>
+ <Separators>
+ <DateSeparator>.</DateSeparator>
+ <ThousandSeparator>Â </ThousandSeparator>
+ <DecimalSeparator>,</DecimalSeparator>
+ <TimeSeparator>:</TimeSeparator>
+ <Time100SecSeparator>,</Time100SecSeparator>
+ <ListSeparator>;</ListSeparator>
+ <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
+ <LongDateDaySeparator> </LongDateDaySeparator>
+ <LongDateMonthSeparator> </LongDateMonthSeparator>
+ <LongDateYearSeparator> е.</LongDateYearSeparator>
+ </Separators>
+ <Markers>
+ <QuotationStart>„</QuotationStart>
+ <QuotationEnd>“</QuotationEnd>
+ <DoubleQuotationStart>«</DoubleQuotationStart>
+ <DoubleQuotationEnd>»</DoubleQuotationEnd>
+ </Markers>
+ <TimeAM>көндез</TimeAM>
+ <TimePM>кич</TimePM>
+ <MeasurementSystem>metric</MeasurementSystem>
+ </LC_CTYPE>
+ <LC_FORMAT>
+ <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+ <FormatCode>Standard</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+ <FormatCode>0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+ <FormatCode>0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+ <FormatCode>#Â ##0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+ <FormatCode>#Â ##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="6">
+ <FormatCode>0,00E+000</FormatCode>
+ </FormatElement>
+ <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="8">
+ <FormatCode>0%</FormatCode>
+ </FormatElement>
+ <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">
+ <FormatCode>#Â ##0 [$Ñ€.-444];-#Â ##0 [$Ñ€.-444]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+ <FormatCode>#Â ##0,00 [$Ñ€.-444];-#Â ##0,00 [$Ñ€.-444]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+ <FormatCode>#Â ##0 [$Ñ€.-444];[RED]-#Â ##0 [$Ñ€.-444]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+ <FormatCode>#Â ##0,00 [$Ñ€.-444];[RED]-#Â ##0,00 [$Ñ€.-444]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+ <FormatCode>#Â ##0,00 CCC</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+ <FormatCode>#Â ##0,-- [$Ñ€.-444];[RED]-#Â ##0,-- [$Ñ€.-444]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
+ <FormatCode>D.M.YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
+ <FormatCode>NNNNDD MMMM, YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
+ <FormatCode>DD.MM.YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
+ <FormatCode>DD.MM.YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
+ <FormatCode>D MMM, YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
+ <FormatCode>D MMM, YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
+ <FormatCode>D. MMM. YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
+ <FormatCode>D MMMM, YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
+ <FormatCode>D. MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
+ <FormatCode>NN, D MMM, YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
+ <FormatCode>NN DD.MMM YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
+ <FormatCode>NN, D MMMM, YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
+ <FormatCode>NNNND MMMM, YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
+ <FormatCode>MM-DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
+ <FormatCode>YY-MM-DD</FormatCode>
+ <DefaultName>ISO 8601</DefaultName>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
+ <FormatCode>YYYY-MM-DD</FormatCode>
+ <DefaultName>ISO 8601</DefaultName>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
+ <FormatCode>MM.YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
+ <FormatCode>DD.MMM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
+ <FormatCode>MMMM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
+ <FormatCode>QQ YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
+ <FormatCode>WW</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39">
+ <FormatCode>HH:MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40">
+ <FormatCode>HH:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41">
+ <FormatCode>HH:MM AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME" formatindex="42">
+ <FormatCode>HH:MM:SS AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+ <FormatCode>[HH]:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+ <FormatCode>MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+ <FormatCode>[HH]:MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+ <FormatCode>DD.MM.YY HH:MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+ <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode>
+ </FormatElement>
+ </LC_FORMAT>
+ <LC_COLLATION ref="en_US" />
+ <LC_SEARCH ref="en_US"/>
+ <LC_INDEX>
+ <IndexKey phonetic="false" default="true" unoid="alphanumeric">Ð-Я Ó˜ Ò¢ Ò® Ó¨ Òº Ò–</IndexKey>
+ <UnicodeScript>8</UnicodeScript>
+ <FollowPageWord>p.</FollowPageWord>
+ <FollowPageWord>pp.</FollowPageWord>
+ </LC_INDEX>
+ <LC_CALENDAR>
+ <Calendar unoid="gregorian" default="true">
+ <DaysOfWeek>
+ <Day>
+ <DayID>sun</DayID>
+ <DefaultAbbrvName>Як</DefaultAbbrvName>
+ <DefaultFullName>Ñкшәмбе</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>mon</DayID>
+ <DefaultAbbrvName>Дү</DefaultAbbrvName>
+ <DefaultFullName>дүшәмбе</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>tue</DayID>
+ <DefaultAbbrvName>Сш</DefaultAbbrvName>
+ <DefaultFullName>Сишәмбе</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>wed</DayID>
+ <DefaultAbbrvName>Чр</DefaultAbbrvName>
+ <DefaultFullName>Чәршәмбе</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>thu</DayID>
+ <DefaultAbbrvName>Пн</DefaultAbbrvName>
+ <DefaultFullName>пәнҗешәмбе</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>fri</DayID>
+ <DefaultAbbrvName>Җм</DefaultAbbrvName>
+ <DefaultFullName>җомга</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>sat</DayID>
+ <DefaultAbbrvName>Шм</DefaultAbbrvName>
+ <DefaultFullName>шимбә</DefaultFullName>
+ </Day>
+ </DaysOfWeek>
+ <MonthsOfYear>
+ <Month>
+ <MonthID>jan</MonthID>
+ <DefaultAbbrvName>гыйн</DefaultAbbrvName>
+ <DefaultFullName>Гыйнвар</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>feb</MonthID>
+ <DefaultAbbrvName>фев</DefaultAbbrvName>
+ <DefaultFullName>Февраль</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>mar</MonthID>
+ <DefaultAbbrvName>мар</DefaultAbbrvName>
+ <DefaultFullName>Март</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>apr</MonthID>
+ <DefaultAbbrvName>апр</DefaultAbbrvName>
+ <DefaultFullName>Ðпрель</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>may</MonthID>
+ <DefaultAbbrvName>май</DefaultAbbrvName>
+ <DefaultFullName>Май</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jun</MonthID>
+ <DefaultAbbrvName>июн</DefaultAbbrvName>
+ <DefaultFullName>Июнь</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jul</MonthID>
+ <DefaultAbbrvName>июл</DefaultAbbrvName>
+ <DefaultFullName>Июль</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>aug</MonthID>
+ <DefaultAbbrvName>авг</DefaultAbbrvName>
+ <DefaultFullName>ÐвгуÑÑ‚</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>sep</MonthID>
+ <DefaultAbbrvName>Ñен</DefaultAbbrvName>
+ <DefaultFullName>СентÑбрь</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>oct</MonthID>
+ <DefaultAbbrvName>окт</DefaultAbbrvName>
+ <DefaultFullName>ОктÑбрь</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>nov</MonthID>
+ <DefaultAbbrvName>ноÑ</DefaultAbbrvName>
+ <DefaultFullName>ÐоÑбрь</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>dec</MonthID>
+ <DefaultAbbrvName>дек</DefaultAbbrvName>
+ <DefaultFullName>Декабрь</DefaultFullName>
+ </Month>
+ </MonthsOfYear>
+ <Eras>
+ <Era>
+ <EraID>bc</EraID>
+ <DefaultAbbrvName>б.ч. кадәр</DefaultAbbrvName>
+ <DefaultFullName>б.ч. кадәр</DefaultFullName>
+ </Era>
+ <Era>
+ <EraID>ad</EraID>
+ <DefaultAbbrvName>б.ч.</DefaultAbbrvName>
+ <DefaultFullName>б.ч.</DefaultFullName>
+ </Era>
+ </Eras>
+ <StartDayOfWeek>
+ <DayID>mon</DayID>
+ </StartDayOfWeek>
+ <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+ </Calendar>
+ </LC_CALENDAR>
+ <LC_CURRENCY>
+ <Currency default="true" usedInCompatibleFormatCodes="true">
+ <CurrencyID>RUB</CurrencyID>
+ <CurrencySymbol>руб.</CurrencySymbol>
+ <BankSymbol>RUB</BankSymbol>
+ <CurrencyName>Ð Ó™Ñәй Ñумы</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ </LC_CURRENCY>
+ <LC_TRANSLITERATION ref="en_US"/>
+ <LC_MISC>
+ <ReservedWords>
+ <trueWord>чын</trueWord>
+ <falseWord>Ñлган</falseWord>
+ <quarter1Word>1 нче чирек</quarter1Word>
+ <quarter2Word>2 нче чирек</quarter2Word>
+ <quarter3Word>3 нче чирек</quarter3Word>
+ <quarter4Word>4 нче чирек</quarter4Word>
+ <aboveWord>Ó©Ñкә</aboveWord>
+ <belowWord>аÑка</belowWord>
+ <quarter1Abbreviation>1 чр.</quarter1Abbreviation>
+ <quarter2Abbreviation>2 чр.</quarter2Abbreviation>
+ <quarter3Abbreviation>3 чр.</quarter3Abbreviation>
+ <quarter4Abbreviation>4 чр.</quarter4Abbreviation>
+ </ReservedWords>
+ </LC_MISC>
+ <LC_NumberingLevel ref="en_US"/>
+ <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
More information about the Libreoffice-commits
mailing list