[Libreoffice-commits] core.git: Branch 'private/kohei/chart-controller-study' - 122 commits - accessibility/source animations/source avmedia/source basebmp/test basegfx/test basic/inc basic/source bin/findunusedcode bridges/source chart2/Library_chartcore.mk chart2/source configmgr/source configure.ac cppcanvas/CppunitTest_cppcanvas_emfplus.mk cppcanvas/Module_cppcanvas.mk cppcanvas/qa cppcanvas/source cppu/CppunitTest_cppu_qa_reference.mk cppu/qa desktop/inc desktop/source dictionaries drawinglayer/source editeng/source extensions/source extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk extras/source filter/source forms/source framework/source helpcontent2 i18npool/source include/editeng include/sfx2 include/svtools include/svx include/vcl jvmfwk/plugins linguistic/source odk/examples oox/source sax/source sc/AllLangResTarget_sc.mk sc/inc sc/qa sc/source sc/uiconfig sc/UIConfig_scalc.mk sdext/source sd/source sfx2/source soltools/cpp stoc/source svl/source svtools/source svx/source sw/i nc sw/qa sw/source test/source testtools/Library_constructors.mk testtools/source toolkit/source ucbhelper/source unotools/source unusedcode.easy vcl/inc vcl/ios vcl/Library_vcl.mk vcl/osx vcl/qa vcl/quartz vcl/source vcl/unx writerfilter/inc writerfilter/source xmloff/inc xmloff/source
Kohei Yoshida
kohei.yoshida at collabora.com
Thu Apr 10 07:23:55 PDT 2014
Rebased ref, commits from common ancestor:
commit d650fef0403ef1d2429218f8de8cc50109ab21b0
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Thu Apr 10 10:23:56 2014 -0400
Remove the old GL3DBarChart code.
Change-Id: Id7039021f252fb45464b5e42248cf3c68edc7be4
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index dae64e9..7851bd5 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -93,7 +93,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/view/charttypes/BubbleChart \
chart2/source/view/charttypes/CandleStickChart \
chart2/source/view/charttypes/CategoryPositionHelper \
- chart2/source/view/charttypes/GL3DBarChart \
chart2/source/view/charttypes/NetChart \
chart2/source/view/charttypes/PieChart \
chart2/source/view/charttypes/Splines \
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
deleted file mode 100644
index 0249a65..0000000
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "GL3DBarChart.hxx"
-#include <unonames.hxx>
-
-#include <com/sun/star/chart2/data/XDataSequence.hpp>
-#include <com/sun/star/chart2/data/LabelOrigin.hpp>
-
-#include <stdio.h>
-
-using namespace com::sun::star;
-
-namespace chart {
-
-GL3DBarChart::GL3DBarChart( const css::uno::Reference<css::chart2::XChartType>& xChartTypeModel ) :
- VSeriesPlotter(xChartTypeModel, 3, false)
-{
-}
-
-GL3DBarChart::~GL3DBarChart()
-{
-}
-
-void GL3DBarChart::createShapes()
-{
- fprintf(stdout, "GL3DBarChart::createShapes: type = '%s'\n",
- rtl::OUStringToOString(m_xChartTypeModel->getChartType(), RTL_TEXTENCODING_UTF8).getStr());
-
- uno::Reference<beans::XPropertySet> xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
- if (xPropSet.is())
- {
- bool bRoundedEdge = false;
- if (xPropSet->getPropertyValue(CHART_UNONAME_ROUNDED_EDGE) >>= bRoundedEdge)
- fprintf(stdout, "GL3DBarChart::createShapes: rounded edge = %d (%p)\n", bRoundedEdge, m_xChartTypeModel.get());
- }
-
-#if 0
- if (m_pExplicitCategoriesProvider)
- {
- uno::Reference<chart2::data::XDataSequence> xCats = m_pExplicitCategoriesProvider->getOriginalCategories();
-
- OUString aSrcRange = xCats->getSourceRangeRepresentation();
-
- fprintf(stdout, "GL3DBarChart::createShapes: source range = '%s'\n", rtl::OUStringToOString(aSrcRange, RTL_TEXTENCODING_UTF8).getStr());
-
- uno::Sequence<OUString> aCats = m_pExplicitCategoriesProvider->getSimpleCategories();
- for (sal_Int32 i = 0; i < aCats.getLength(); ++i)
- fprintf(stdout, "GL3DBarChart::createShapes: category = '%s'\n", rtl::OUStringToOString(aCats[i], RTL_TEXTENCODING_UTF8).getStr());
- }
-
- uno::Sequence<OUString> aSeriesNames = getSeriesNames();
- fprintf(stdout, "GL3DBarChart::createShapes: series name count = %d\n", aSeriesNames.getLength());
- for (sal_Int32 i = 0; i < aSeriesNames.getLength(); ++i)
- fprintf(stdout, "GL3DBarChart::createShapes: name = '%s'\n", rtl::OUStringToOString(aSeriesNames[i], RTL_TEXTENCODING_UTF8).getStr());
-
- std::vector<VDataSeries*> aAllSeries = getAllSeries();
- fprintf(stdout, "GL3DBarChart::createShapes: series count = %d\n", aAllSeries.size());
- for (size_t i = 0, n = aAllSeries.size(); i < n; ++i)
- {
- const VDataSeries* pSeries = aAllSeries[i];
- fprintf(stdout, "GL3DBarChart::createShapes: series %d: cid = '%s' particle = '%s'\n",
- i,
- rtl::OUStringToOString(pSeries->getCID(), RTL_TEXTENCODING_UTF8).getStr(),
- rtl::OUStringToOString(pSeries->getSeriesParticle(), RTL_TEXTENCODING_UTF8).getStr());
-
- uno::Sequence<double> aXValues = pSeries->getAllX();
- uno::Sequence<double> aYValues = pSeries->getAllY();
- for (size_t j = 0; j < aXValues.getLength(); ++j)
- fprintf(stdout, "GL3DBarChart::createShapes: (x=%g,y=%g)\n", aXValues[j], aYValues[j]);
- }
-#endif
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/GL3DBarChart.hxx b/chart2/source/view/charttypes/GL3DBarChart.hxx
deleted file mode 100644
index 87128a8..0000000
--- a/chart2/source/view/charttypes/GL3DBarChart.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef CHART2_GL3DBARCHART_HXX
-#define CHART2_GL3DBARCHART_HXX
-
-#include <VSeriesPlotter.hxx>
-
-namespace chart {
-
-class GL3DBarChart : public VSeriesPlotter
-{
-public:
- GL3DBarChart( const css::uno::Reference<css::chart2::XChartType>& xChartTypeModel );
- virtual ~GL3DBarChart();
-
- virtual void createShapes() SAL_OVERRIDE;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 1027192..7433eb8 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -51,7 +51,6 @@
#include "CandleStickChart.hxx"
#include "BubbleChart.hxx"
#include "NetChart.hxx"
-#include "GL3DBarChart.hxx"
#include <com/sun/star/chart/ErrorBarStyle.hpp>
#include <com/sun/star/chart/TimeUnit.hpp>
@@ -2443,8 +2442,6 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter(
pRet = new AreaChart(xChartTypeModel,nDimensionCount,false,true);
else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
pRet = new BubbleChart(xChartTypeModel,nDimensionCount);
- else if (aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR))
- pRet = new GL3DBarChart(xChartTypeModel);
else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
pRet = new PieChart(xChartTypeModel,nDimensionCount, bExcludingPositioning );
else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
commit 6f97be903beee9f6ad5f1e859ec1b402501a4d47
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Wed Apr 9 15:31:00 2014 -0400
Reduce indentation by early bailout.
Change-Id: I64c88b007564d3ca7b4f4bd95a458fee6bda7854
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index d141d01..7cd99f2 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1848,165 +1848,165 @@ bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditio
void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
{
SolarMutexGuard aGuard;
- if( m_pDrawViewWrapper && m_pChartWindow )
- {
- Point aMousePos( m_pChartWindow->PixelToLogic( rEvent.GetPosPixel()));
- sal_uInt16 nModifier = rEvent.GetModifier();
- sal_Bool bLeftDown = rEvent.IsLeft();
- if ( m_pDrawViewWrapper->IsTextEdit() )
- {
- if( m_pDrawViewWrapper->IsTextEditHit( aMousePos, HITPIX) )
- {
- m_pChartWindow->SetPointer( m_pDrawViewWrapper->GetPreferredPointer(
- aMousePos, m_pChartWindow, nModifier, bLeftDown ) );
- return;
- }
- }
- else if( m_pDrawViewWrapper->IsAction() )
- {
- return;//don't change pointer during running action
- }
+ if (!m_pDrawViewWrapper || !m_pChartWindow)
+ return;
- SdrHdl* pHitSelectionHdl = 0;
- if( m_aSelection.isResizeableObjectSelected() )
- pHitSelectionHdl = m_pDrawViewWrapper->PickHandle( aMousePos );
+ Point aMousePos( m_pChartWindow->PixelToLogic( rEvent.GetPosPixel()));
+ sal_uInt16 nModifier = rEvent.GetModifier();
+ sal_Bool bLeftDown = rEvent.IsLeft();
- if( pHitSelectionHdl )
+ if ( m_pDrawViewWrapper->IsTextEdit() )
+ {
+ if( m_pDrawViewWrapper->IsTextEditHit( aMousePos, HITPIX) )
{
+ m_pChartWindow->SetPointer( m_pDrawViewWrapper->GetPreferredPointer(
+ aMousePos, m_pChartWindow, nModifier, bLeftDown ) );
+ return;
+ }
+ }
+ else if( m_pDrawViewWrapper->IsAction() )
+ {
+ return;//don't change pointer during running action
+ }
- Pointer aPointer = m_pDrawViewWrapper->GetPreferredPointer(
- aMousePos, m_pChartWindow, nModifier, bLeftDown );
- bool bForceArrowPointer = false;
+ SdrHdl* pHitSelectionHdl = 0;
+ if( m_aSelection.isResizeableObjectSelected() )
+ pHitSelectionHdl = m_pDrawViewWrapper->PickHandle( aMousePos );
- ObjectIdentifier aOID( m_aSelection.getSelectedOID() );
+ if( pHitSelectionHdl )
+ {
+ Pointer aPointer = m_pDrawViewWrapper->GetPreferredPointer(
+ aMousePos, m_pChartWindow, nModifier, bLeftDown );
+ bool bForceArrowPointer = false;
- switch( aPointer.GetStyle())
- {
- case POINTER_NSIZE:
- case POINTER_SSIZE:
- case POINTER_WSIZE:
- case POINTER_ESIZE:
- case POINTER_NWSIZE:
- case POINTER_NESIZE:
- case POINTER_SWSIZE:
- case POINTER_SESIZE:
- if( ! m_aSelection.isResizeableObjectSelected() )
- bForceArrowPointer = true;
- break;
- case POINTER_MOVE:
- if ( !aOID.isDragableObject() )
- bForceArrowPointer = true;
- break;
- case POINTER_MOVEPOINT:
- case POINTER_MOVEBEZIERWEIGHT:
- // there is no point-editing in a chart
- // the POINTER_MOVEBEZIERWEIGHT appears in 3d data points
- bForceArrowPointer = true;
- break;
- default:
- break;
- }
+ ObjectIdentifier aOID( m_aSelection.getSelectedOID() );
- if( bForceArrowPointer )
- m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
- else
- m_pChartWindow->SetPointer( aPointer );
+ switch( aPointer.GetStyle())
+ {
+ case POINTER_NSIZE:
+ case POINTER_SSIZE:
+ case POINTER_WSIZE:
+ case POINTER_ESIZE:
+ case POINTER_NWSIZE:
+ case POINTER_NESIZE:
+ case POINTER_SWSIZE:
+ case POINTER_SESIZE:
+ if( ! m_aSelection.isResizeableObjectSelected() )
+ bForceArrowPointer = true;
+ break;
+ case POINTER_MOVE:
+ if ( !aOID.isDragableObject() )
+ bForceArrowPointer = true;
+ break;
+ case POINTER_MOVEPOINT:
+ case POINTER_MOVEBEZIERWEIGHT:
+ // there is no point-editing in a chart
+ // the POINTER_MOVEBEZIERWEIGHT appears in 3d data points
+ bForceArrowPointer = true;
+ break;
+ default:
+ break;
}
+
+ if( bForceArrowPointer )
+ m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
else
+ m_pChartWindow->SetPointer( aPointer );
+
+ return;
+ }
+
+ // #i12587# support for shapes in chart
+ if ( m_eDrawMode == CHARTDRAW_INSERT &&
+ ( !m_pDrawViewWrapper->IsMarkedHit( aMousePos ) || !m_aSelection.isDragableObjectSelected() ) )
+ {
+ PointerStyle ePointerStyle = POINTER_DRAW_RECT;
+ SdrObjKind eKind = static_cast< SdrObjKind >( m_pDrawViewWrapper->GetCurrentObjIdentifier() );
+ switch ( eKind )
{
- // #i12587# support for shapes in chart
- if ( m_eDrawMode == CHARTDRAW_INSERT &&
- ( !m_pDrawViewWrapper->IsMarkedHit( aMousePos ) || !m_aSelection.isDragableObjectSelected() ) )
- {
- PointerStyle ePointerStyle = POINTER_DRAW_RECT;
- SdrObjKind eKind = static_cast< SdrObjKind >( m_pDrawViewWrapper->GetCurrentObjIdentifier() );
- switch ( eKind )
+ case OBJ_LINE:
{
- case OBJ_LINE:
- {
- ePointerStyle = POINTER_DRAW_LINE;
- }
- break;
- case OBJ_RECT:
- case OBJ_CUSTOMSHAPE:
- {
- ePointerStyle = POINTER_DRAW_RECT;
- }
- break;
- case OBJ_CIRC:
- {
- ePointerStyle = POINTER_DRAW_ELLIPSE;
- }
- break;
- case OBJ_FREELINE:
- {
- ePointerStyle = POINTER_DRAW_POLYGON;
- }
- break;
- case OBJ_TEXT:
- {
- ePointerStyle = POINTER_DRAW_TEXT;
- }
- break;
- case OBJ_CAPTION:
- {
- ePointerStyle = POINTER_DRAW_CAPTION;
- }
- break;
- default:
- {
- ePointerStyle = POINTER_DRAW_RECT;
- }
- break;
+ ePointerStyle = POINTER_DRAW_LINE;
}
- m_pChartWindow->SetPointer( Pointer( ePointerStyle ) );
- return;
- }
+ break;
+ case OBJ_RECT:
+ case OBJ_CUSTOMSHAPE:
+ {
+ ePointerStyle = POINTER_DRAW_RECT;
+ }
+ break;
+ case OBJ_CIRC:
+ {
+ ePointerStyle = POINTER_DRAW_ELLIPSE;
+ }
+ break;
+ case OBJ_FREELINE:
+ {
+ ePointerStyle = POINTER_DRAW_POLYGON;
+ }
+ break;
+ case OBJ_TEXT:
+ {
+ ePointerStyle = POINTER_DRAW_TEXT;
+ }
+ break;
+ case OBJ_CAPTION:
+ {
+ ePointerStyle = POINTER_DRAW_CAPTION;
+ }
+ break;
+ default:
+ {
+ ePointerStyle = POINTER_DRAW_RECT;
+ }
+ break;
+ }
+ m_pChartWindow->SetPointer( Pointer( ePointerStyle ) );
+ return;
+ }
- OUString aHitObjectCID(
- SelectionHelper::getHitObjectCID(
- aMousePos, *m_pDrawViewWrapper, true /*bGetDiagramInsteadOf_Wall*/ ));
+ OUString aHitObjectCID(
+ SelectionHelper::getHitObjectCID(
+ aMousePos, *m_pDrawViewWrapper, true /*bGetDiagramInsteadOf_Wall*/ ));
- if( m_pDrawViewWrapper->IsTextEdit() )
+ if( m_pDrawViewWrapper->IsTextEdit() )
+ {
+ if( aHitObjectCID.equals(m_aSelection.getSelectedCID()) )
+ {
+ m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
+ return;
+ }
+ }
+
+ if( aHitObjectCID.isEmpty() )
+ {
+ //additional shape was hit
+ m_pChartWindow->SetPointer( POINTER_MOVE );
+ }
+ else if( ObjectIdentifier::isDragableObject( aHitObjectCID ) )
+ {
+ if( (m_eDragMode == SDRDRAG_ROTATE)
+ && SelectionHelper::isRotateableObject( aHitObjectCID
+ , getModel() ) )
+ m_pChartWindow->SetPointer( Pointer( POINTER_ROTATE ) );
+ else
+ {
+ ObjectType eHitObjectType = ObjectIdentifier::getObjectType( aHitObjectCID );
+ if( eHitObjectType == OBJECTTYPE_DATA_POINT )
{
- if( aHitObjectCID.equals(m_aSelection.getSelectedCID()) )
+ if( !ObjectIdentifier::areSiblings(aHitObjectCID,m_aSelection.getSelectedCID())
+ && !ObjectIdentifier::areIdenticalObjects(aHitObjectCID,m_aSelection.getSelectedCID()) )
{
m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
return;
}
}
-
- if( aHitObjectCID.isEmpty() )
- {
- //additional shape was hit
- m_pChartWindow->SetPointer( POINTER_MOVE );
- }
- else if( ObjectIdentifier::isDragableObject( aHitObjectCID ) )
- {
- if( (m_eDragMode == SDRDRAG_ROTATE)
- && SelectionHelper::isRotateableObject( aHitObjectCID
- , getModel() ) )
- m_pChartWindow->SetPointer( Pointer( POINTER_ROTATE ) );
- else
- {
- ObjectType eHitObjectType = ObjectIdentifier::getObjectType( aHitObjectCID );
- if( eHitObjectType == OBJECTTYPE_DATA_POINT )
- {
- if( !ObjectIdentifier::areSiblings(aHitObjectCID,m_aSelection.getSelectedCID())
- && !ObjectIdentifier::areIdenticalObjects(aHitObjectCID,m_aSelection.getSelectedCID()) )
- {
- m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
- return;
- }
- }
- m_pChartWindow->SetPointer( POINTER_MOVE );
- }
- }
- else
- m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
+ m_pChartWindow->SetPointer( POINTER_MOVE );
}
}
+ else
+ m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
}
} //namespace chart
commit ae4060cae9d26aca23d8f1e9d6782ca66c4ce6d3
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Wed Apr 9 12:34:38 2014 -0400
Let's remove these...
Change-Id: Ie4f15c894c13fd52e1ee175381a1e62b33864d39
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index 5333789..d73d151 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -24,11 +24,8 @@
#include "CommandDispatchContainer.hxx"
#include "SelectionHelper.hxx"
-// header for enum SdrDragMode
#include <svx/svdtypes.hxx>
-// header for class Timer
#include <vcl/timer.hxx>
-// header for class MouseEvent
#include <vcl/event.hxx>
#include <cppuhelper/implbase12.hxx>
@@ -135,9 +132,6 @@ class ChartController : public ::cppu::WeakImplHelper12 <
,::com::sun::star::ui::XContextMenuInterception //(optional interface)
,::com::sun::star::util::XCloseListener //(needed for communication with XModel)
,::com::sun::star::lang::XServiceInfo
- // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface)
- // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface)
- // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper
,::com::sun::star::frame::XDispatch
,::com::sun::star::awt::XWindow //this is the Window Controller part of this Controller, that will be given to a Frame via setComponent
,::com::sun::star::lang::XMultiServiceFactory
commit f86e844a1d45fda789040cda47b32ae1b927f55b
Author: Eike Rathke <erack at redhat.com>
Date: Thu Apr 10 16:08:25 2014 +0200
added one abbreviated DateAcceptancePattern for locales that didn't have any
Change-Id: I0ee3f1553b4efa67701385de5c7fe32e5992b537
diff --git a/i18npool/source/localedata/data/az_AZ.xml b/i18npool/source/localedata/data/az_AZ.xml
index ae4d684..5e1f6a6 100644
--- a/i18npool/source/localedata/data/az_AZ.xml
+++ b/i18npool/source/localedata/data/az_AZ.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/bm_ML.xml b/i18npool/source/localedata/data/bm_ML.xml
index 041f015..bb8dd1a 100644
--- a/i18npool/source/localedata/data/bm_ML.xml
+++ b/i18npool/source/localedata/data/bm_ML.xml
@@ -43,6 +43,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$CFA-62E]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/bn_IN.xml b/i18npool/source/localedata/data/bn_IN.xml
index 2b83117..e642ab1 100644
--- a/i18npool/source/localedata/data/bn_IN.xml
+++ b/i18npool/source/localedata/data/bn_IN.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₹-445]">
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/bo_CN.xml b/i18npool/source/localedata/data/bo_CN.xml
index 22b0fe8..14abfd0 100644
--- a/i18npool/source/localedata/data/bo_CN.xml
+++ b/i18npool/source/localedata/data/bo_CN.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$ï¿¥-451]">
+ <DateAcceptancePattern>M-D</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>[NatNum1]YY-MM-DD</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/bo_IN.xml b/i18npool/source/localedata/data/bo_IN.xml
index 06524a6..3ae0687 100644
--- a/i18npool/source/localedata/data/bo_IN.xml
+++ b/i18npool/source/localedata/data/bo_IN.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>UK</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₹-8051]">
+ <DateAcceptancePattern>M-D</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>[NatNum1]YY-MM-DD</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/bs_BA.xml b/i18npool/source/localedata/data/bs_BA.xml
index a06b1c3..c1d99ed 100644
--- a/i18npool/source/localedata/data/bs_BA.xml
+++ b/i18npool/source/localedata/data/bs_BA.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$KM-141A]">
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>D.M.YYYY</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/cv_RU.xml b/i18npool/source/localedata/data/cv_RU.xml
index c14edc3..f7fc534 100644
--- a/i18npool/source/localedata/data/cv_RU.xml
+++ b/i18npool/source/localedata/data/cv_RU.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/da_DK.xml b/i18npool/source/localedata/data/da_DK.xml
index eb23a64..16b9fcd 100644
--- a/i18npool/source/localedata/data/da_DK.xml
+++ b/i18npool/source/localedata/data/da_DK.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/dsb_DE.xml b/i18npool/source/localedata/data/dsb_DE.xml
index c82efd7..d0ce8ee 100644
--- a/i18npool/source/localedata/data/dsb_DE.xml
+++ b/i18npool/source/localedata/data/dsb_DE.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-82E]">
+ <DateAcceptancePattern>D.M.</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/dz_BT.xml b/i18npool/source/localedata/data/dz_BT.xml
index 4cbe838..d485d34 100644
--- a/i18npool/source/localedata/data/dz_BT.xml
+++ b/i18npool/source/localedata/data/dz_BT.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>UK</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Nu-851]">
+ <DateAcceptancePattern>M-D</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>[NatNum1]YY-MM-DD</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/eo.xml b/i18npool/source/localedata/data/eo.xml
index 088187a..2f75ef3 100644
--- a/i18npool/source/localedata/data/eo.xml
+++ b/i18npool/source/localedata/data/eo.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-611]">
+ <DateAcceptancePattern>M-D</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>YYYY-MM-DD</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/es_CL.xml b/i18npool/source/localedata/data/es_CL.xml
index fd48b5b..ccbca46 100644
--- a/i18npool/source/localedata/data/es_CL.xml
+++ b/i18npool/source/localedata/data/es_CL.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Estandar</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/fo_FO.xml b/i18npool/source/localedata/data/fo_FO.xml
index be298a1..de6452f 100644
--- a/i18npool/source/localedata/data/fo_FO.xml
+++ b/i18npool/source/localedata/data/fo_FO.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>DD-MM-YY</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/fy_NL.xml b/i18npool/source/localedata/data/fy_NL.xml
index bf0ac21..c5d7116 100644
--- a/i18npool/source/localedata/data/fy_NL.xml
+++ b/i18npool/source/localedata/data/fy_NL.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-462]">
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/hi_IN.xml b/i18npool/source/localedata/data/hi_IN.xml
index 05b5eac..d90bc66 100644
--- a/i18npool/source/localedata/data/hi_IN.xml
+++ b/i18npool/source/localedata/data/hi_IN.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₹-439]">
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>D-M-YY</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/hsb_DE.xml b/i18npool/source/localedata/data/hsb_DE.xml
index d36122f..af08eb4 100644
--- a/i18npool/source/localedata/data/hsb_DE.xml
+++ b/i18npool/source/localedata/data/hsb_DE.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-42E]">
+ <DateAcceptancePattern>D.M.</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/it_CH.xml b/i18npool/source/localedata/data/it_CH.xml
index 484944f..9979408 100644
--- a/i18npool/source/localedata/data/it_CH.xml
+++ b/i18npool/source/localedata/data/it_CH.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M.</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/kk_KZ.xml b/i18npool/source/localedata/data/kk_KZ.xml
index f79d98c..bd3255f 100644
--- a/i18npool/source/localedata/data/kk_KZ.xml
+++ b/i18npool/source/localedata/data/kk_KZ.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$тңг-43F]">
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/kl_GL.xml b/i18npool/source/localedata/data/kl_GL.xml
index ff906c3..f5f3c94 100644
--- a/i18npool/source/localedata/data/kl_GL.xml
+++ b/i18npool/source/localedata/data/kl_GL.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$kr-46F]">
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ky_KG.xml b/i18npool/source/localedata/data/ky_KG.xml
index 79bedec..7cbf074 100644
--- a/i18npool/source/localedata/data/ky_KG.xml
+++ b/i18npool/source/localedata/data/ky_KG.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/lb_LU.xml b/i18npool/source/localedata/data/lb_LU.xml
index fa8bc0f..98eb3fd 100644
--- a/i18npool/source/localedata/data/lb_LU.xml
+++ b/i18npool/source/localedata/data/lb_LU.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-46E]">
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ln_CD.xml b/i18npool/source/localedata/data/ln_CD.xml
index 76d8c05..ca4c85b 100644
--- a/i18npool/source/localedata/data/ln_CD.xml
+++ b/i18npool/source/localedata/data/ln_CD.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$FC-639]">
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ltg_LV.xml b/i18npool/source/localedata/data/ltg_LV.xml
index 6765077..ab7f00e 100644
--- a/i18npool/source/localedata/data/ltg_LV.xml
+++ b/i18npool/source/localedata/data/ltg_LV.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/lv_LV.xml b/i18npool/source/localedata/data/lv_LV.xml
index 68483e5..6f3749c 100644
--- a/i18npool/source/localedata/data/lv_LV.xml
+++ b/i18npool/source/localedata/data/lv_LV.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/mai_IN.xml b/i18npool/source/localedata/data/mai_IN.xml
index 602516f..fb17e30 100644
--- a/i18npool/source/localedata/data/mai_IN.xml
+++ b/i18npool/source/localedata/data/mai_IN.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₹-645]">
+ <DateAcceptancePattern>D.M.</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/mk_MK.xml b/i18npool/source/localedata/data/mk_MK.xml
index eb4b93f..0c54039 100644
--- a/i18npool/source/localedata/data/mk_MK.xml
+++ b/i18npool/source/localedata/data/mk_MK.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$МДен-42F]">
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Општо</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ml_IN.xml b/i18npool/source/localedata/data/ml_IN.xml
index 31b971a..77f8d29 100644
--- a/i18npool/source/localedata/data/ml_IN.xml
+++ b/i18npool/source/localedata/data/ml_IN.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₹-44C]">
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/mn_Cyrl_MN.xml b/i18npool/source/localedata/data/mn_Cyrl_MN.xml
index 89f7384..0afa636 100644
--- a/i18npool/source/localedata/data/mn_Cyrl_MN.xml
+++ b/i18npool/source/localedata/data/mn_Cyrl_MN.xml
@@ -53,6 +53,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$â‚®-450]">
+ <DateAcceptancePattern>M.D</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>YY.M.D</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/pap_CW.xml b/i18npool/source/localedata/data/pap_CW.xml
index b8884f9..9e2a988 100644
--- a/i18npool/source/localedata/data/pap_CW.xml
+++ b/i18npool/source/localedata/data/pap_CW.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$NAf-8479]">
+ <DateAcceptancePattern>M-D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/pl_PL.xml b/i18npool/source/localedata/data/pl_PL.xml
index 80f4f92..23b5197 100644
--- a/i18npool/source/localedata/data/pl_PL.xml
+++ b/i18npool/source/localedata/data/pl_PL.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/plt_MG.xml b/i18npool/source/localedata/data/plt_MG.xml
index 1f9a18e..7326539 100644
--- a/i18npool/source/localedata/data/plt_MG.xml
+++ b/i18npool/source/localedata/data/plt_MG.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Ar.-64F]">
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ro_RO.xml b/i18npool/source/localedata/data/ro_RO.xml
index db03643..1f76edd 100644
--- a/i18npool/source/localedata/data/ro_RO.xml
+++ b/i18npool/source/localedata/data/ro_RO.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>DD.MM.YYYY</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/sr_RS.xml b/i18npool/source/localedata/data/sr_RS.xml
index dce44ae..76b85b0 100644
--- a/i18npool/source/localedata/data/sr_RS.xml
+++ b/i18npool/source/localedata/data/sr_RS.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$РСД-8C1A]">
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/sv_FI.xml b/i18npool/source/localedata/data/sv_FI.xml
index 1a3da5f..f8c5736 100644
--- a/i18npool/source/localedata/data/sv_FI.xml
+++ b/i18npool/source/localedata/data/sv_FI.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Yleinen</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/tg_TJ.xml b/i18npool/source/localedata/data/tg_TJ.xml
index c2e9335..cbffd36 100644
--- a/i18npool/source/localedata/data/tg_TJ.xml
+++ b/i18npool/source/localedata/data/tg_TJ.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/tk_TM.xml b/i18npool/source/localedata/data/tk_TM.xml
index 25f9590..f7d0d23 100644
--- a/i18npool/source/localedata/data/tk_TM.xml
+++ b/i18npool/source/localedata/data/tk_TM.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$m-442]">
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ug_CN.xml b/i18npool/source/localedata/data/ug_CN.xml
index 23dd242..60fb2303 100644
--- a/i18npool/source/localedata/data/ug_CN.xml
+++ b/i18npool/source/localedata/data/ug_CN.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$ï¿¥-0480]">
+ <DateAcceptancePattern>M-D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/uz_UZ.xml b/i18npool/source/localedata/data/uz_UZ.xml
index 8a35916..b4af18c 100644
--- a/i18npool/source/localedata/data/uz_UZ.xml
+++ b/i18npool/source/localedata/data/uz_UZ.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$soʻm.-443]">
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/zh_MO.xml b/i18npool/source/localedata/data/zh_MO.xml
index 4923ba0..86c9416 100644
--- a/i18npool/source/localedata/data/zh_MO.xml
+++ b/i18npool/source/localedata/data/zh_MO.xml
@@ -30,6 +30,7 @@
</LC_INFO>
<LC_CTYPE ref="zh_TW"/>
<LC_FORMAT>
+ <DateAcceptancePattern>D-M</DateAcceptancePattern>
<!-- Fixed number formats. Index range is 0-5. -->
<FormatElement msgid="NumberFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
commit abc1c428e028e081a94527b7cb5dc5199147fcfb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 10 15:45:58 2014 +0200
Clean up function declarations
Change-Id: I1f4a18e7aa6288e147c7f4c3f17bb99f1f0df5c5
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx
index 96834da..16f5e78 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx
@@ -18,8 +18,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-extern "C" void
-privateSnippetExecutor()
+#include <sal/config.h>
+
+#include <call.hxx>
+
+void privateSnippetExecutor()
{
asm volatile
(
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx
new file mode 100644
index 0000000..6738970
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed 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 .
+ */
+
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALL_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALL_HXX
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+#include <typelib/typeclass.h>
+
+extern "C" typelib_TypeClass cpp_vtable_call(
+ sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
+ void ** gpreg, void ** fpreg, void ** ovrflw,
+ sal_uInt64 * pRegisterReturn /* space for register return */ );
+
+extern "C" void privateSnippetExecutor();
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index 67d2f88..86089c3 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -36,6 +36,7 @@
#include "bridges/cpp_uno/shared/vtablefactory.hxx"
#include "abi.hxx"
+#include "call.hxx"
#include "share.hxx"
using namespace ::osl;
@@ -250,8 +251,7 @@ static typelib_TypeClass cpp2uno_call(
}
}
-
-extern "C" typelib_TypeClass cpp_vtable_call(
+typelib_TypeClass cpp_vtable_call(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
void ** gpreg, void ** fpreg, void ** ovrflw,
sal_uInt64 * pRegisterReturn /* space for register return */ )
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 6988dcb..664a5c0 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -55,11 +55,13 @@ namespace CPPU_CURRENT_NAMESPACE {
namespace {
struct Fake_type_info {
- virtual ~Fake_type_info() {}
+ virtual ~Fake_type_info() SAL_DELETED_FUNCTION;
char const * name;
};
-struct Fake_class_type_info: Fake_type_info {};
+struct Fake_class_type_info: Fake_type_info {
+ virtual ~Fake_class_type_info() SAL_DELETED_FUNCTION;
+};
#if MACOSX_SDK_VERSION < 1070
BOOST_STATIC_ASSERT(
@@ -67,6 +69,7 @@ BOOST_STATIC_ASSERT(
#endif
struct Fake_si_class_type_info: Fake_class_type_info {
+ virtual ~Fake_si_class_type_info() SAL_DELETED_FUNCTION;
void const * base;
};
@@ -117,9 +120,16 @@ std::type_info * createFake_si_class_type_info(
}
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
void dummy_can_throw_anything( char const * )
{
}
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
static OUString toUNOname( char const * p ) SAL_THROW(())
{
commit 691a54ccdf89489b64ea9dfffd07b824b2f1a964
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 10 15:31:22 2014 +0200
Clean up function declaration
Change-Id: I92c54f61fe8608d788cc236956f4a5a58e20a7df
diff --git a/soltools/cpp/_getopt.c b/soltools/cpp/_getopt.c
index cbbfc82..82506fa 100644
--- a/soltools/cpp/_getopt.c
+++ b/soltools/cpp/_getopt.c
@@ -20,6 +20,8 @@
#include <stdio.h>
#include <string.h>
+#include <_getopt.h>
+
#define EPR fprintf(stderr,
#define ERR(str, chr) if(opterr) { EPR "%s%c\n", str, chr); }
diff --git a/soltools/cpp/_getopt.h b/soltools/cpp/_getopt.h
new file mode 100644
index 0000000..8a8fccd
--- /dev/null
+++ b/soltools/cpp/_getopt.h
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed 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 .
+ */
+
+#ifndef INCLUDED_SOLTOOLS_CPP_GETOPT_H
+#define INCLUDED_SOLTOOLS_CPP_GETOPT_H
+
+int stgetopt(int, char *const *, const char *);
+extern char *optarg;
+extern int optind;
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c
index e5f9eab..d1cd208 100644
--- a/soltools/cpp/_unix.c
+++ b/soltools/cpp/_unix.c
@@ -32,9 +32,7 @@
#include "cpp.h"
#if defined MACOSX || defined AIX || defined WNT
-extern int stgetopt(int, char *const *, const char *);
-extern char *optarg;
-extern int optind;
+#include <_getopt.h>
#else
#include <getopt.h>
#endif
commit 60cc9896c8d4f48c5e3225d09210be4bcc23e44e
Author: Eike Rathke <erack at redhat.com>
Date: Thu Apr 10 15:12:31 2014 +0200
Updated core
Project: help c78bb98ac5b6e8c434678c063fa1762a828833d5
diff --git a/helpcontent2 b/helpcontent2
index 9ab507d..c78bb98 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9ab507d3f5fd419d7b1c88d6d43758e8361ae71d
+Subproject commit c78bb98ac5b6e8c434678c063fa1762a828833d5
commit 31911865e5bda29ff2394ddf80244fbf15517657
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Apr 10 14:49:52 2014 +0200
DownLoad -> Download.
Change-Id: Ia1729f570cc80a0375532da6478de9d58518556e
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index e30ba66..e94b6e1 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -799,7 +799,7 @@ namespace frm
m_bProdStarted = sal_False;
// Download anstossen (Achtung: Kann auch synchron sein).
- m_pMedium->DownLoad(STATIC_LINK(this, OClickableImageBaseModel, DownloadDoneLink));
+ m_pMedium->Download(STATIC_LINK(this, OClickableImageBaseModel, DownloadDoneLink));
}
else
{
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index ab85627..132e2ac 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -134,7 +134,7 @@ public:
const OUString& GetPhysicalName() const;
bool IsRemote();
bool IsOpen() const; // { return aStorage.Is() || pInStream; }
- void DownLoad( const Link& aLink = Link());
+ void Download( const Link& aLink = Link());
void SetDoneLink( const Link& rLink );
sal_uInt32 GetErrorCode() const;
diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index ad8cf41..89fdb26 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -159,7 +159,7 @@ BlipContext::BlipContext( ContextHandler2Helper& rParent,
OUString aRelId = rAttribs.getString( R_TOKEN( link ), OUString() );
OUString aTargetLink = getFilter().getAbsoluteUrl( getRelations().getExternalTargetFromRelId( aRelId ) );
SfxMedium xMed( aTargetLink, STREAM_STD_READ );
- xMed.DownLoad();
+ xMed.Download();
Reference< io::XInputStream > xInStrm = xMed.GetInputStream();
if ( xInStrm.is() )
mrBlipProps.mxGraphic = getFilter().getGraphicHelper().importGraphic( xInStrm );
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index e9670ae..e123285 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -58,7 +58,7 @@ SvFileObject::SvFileObject()
, bNativFormat(false)
, bClearMedium(false)
, bStateChangeCalled(false)
- , bInCallDownLoad(false)
+ , bInCallDownload(false)
{
}
@@ -111,7 +111,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
if( !xMed.Is() )
LoadFile_Impl();
- if( !bInCallDownLoad )
+ if( !bInCallDownload )
{
xTmpMed = xMed;
while( bWaitForData )
@@ -263,19 +263,19 @@ bool SvFileObject::LoadFile_Impl()
bWaitForData = true;
SfxMediumRef xTmpMed = xMed;
- bInCallDownLoad = true;
- xMed->DownLoad( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
- bInCallDownLoad = false;
+ bInCallDownload = true;
+ xMed->Download( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
+ bInCallDownload = false;
bClearMedium = !xMed.Is();
if( bClearMedium )
- xMed = xTmpMed; // If already finished in DownLoad
+ xMed = xTmpMed; // If already finished in Download
return bDataReady;
}
bWaitForData = true;
bDataReady = bInNewData = false;
- xMed->DownLoad();
+ xMed->Download();
bLoadAgain = !xMed->IsRemote();
bWaitForData = false;
@@ -464,7 +464,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
// When we come form here there it can not be an error no more.
pThis->bLoadError = false;
pThis->bWaitForData = false;
- pThis->bInCallDownLoad = false;
+ pThis->bInCallDownload = false;
if( !pThis->bInNewData && !pThis->bDataReady )
{
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 16824f4..d43e1eb 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -46,7 +46,7 @@ class SvFileObject : public sfx2::SvLinkSource
bool bNativFormat : 1;
bool bClearMedium : 1;
bool bStateChangeCalled : 1;
- bool bInCallDownLoad : 1;
+ bool bInCallDownload : 1;
bool GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
bool LoadFile_Impl();
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 143dcd9..21b66fb 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -130,7 +130,7 @@ short SvxOpenGraphicDialog::Execute()
if ( INET_PROT_FILE != aObj.GetProtocol() )
{
SfxMedium aMed( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
- aMed.DownLoad();
+ aMed.Download();
SvStream* pStream = aMed.GetInStream();
if( pStream )
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 6f1c825..0e036c9 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -235,7 +235,7 @@ void SfxHTMLParser::StartFileDownload(const OUString& rURL)
return;
pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY );
- pDLMedium->DownLoad();
+ pDLMedium->Download();
}
bool SfxHTMLParser::FinishFileDownload( OUString& rStr )
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a4c0c72..40f7182 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2391,7 +2391,7 @@ void SfxMedium::SetDoneLink( const Link& rLink )
pImp->aDoneLink = rLink;
}
-void SfxMedium::DownLoad( const Link& aLink )
+void SfxMedium::Download( const Link& aLink )
{
SetDoneLink( aLink );
GetInStream();
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 05a7003..57b3c2a 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -88,7 +88,7 @@ sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
sal_uInt16 nRet = SGA_IMPORT_NONE;
SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
- aMedium.DownLoad();
+ aMedium.Download();
SvStream* pIStm = aMedium.GetInStream();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 7da704e..46b819d 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -71,7 +71,7 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a
Graphic aGraphic;
SfxMedium xMed( aFileName, aReferer, STREAM_STD_READ );
- xMed.DownLoad();
+ xMed.Download();
SvStream* pInStrm = xMed.GetInStream();
if ( pInStrm )
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index 9ae3e47..8c0cfbd 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -1542,7 +1542,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh,
SfxMedium* pMed = new SfxMedium( aTmpObj.GetMainURL(
INetURLObject::NO_DECODE ), STREAM_READ );
if( INET_PROT_FILE == aTmpObj.GetProtocol() )
- pMed->DownLoad(); // Touch the medium (download it)
+ pMed->Download(); // Touch the medium (download it)
const SfxFilter* pSfxFlt = 0;
if( !pMed->GetError() )
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx
index 2534400..bda06cf 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -299,7 +299,7 @@ inline bool IsMinMove(const Point &rStartPos, const Point &rLPt)
* For MouseButtonDown - determine whether a DrawObject
* an NO SwgFrame was hit! Shift/Ctrl should only result
* in selecting, with DrawObjects; at SwgFlys to trigger
- * hyperlinks if applicable (DownLoad/NewWindow!)
+ * hyperlinks if applicable (Download/NewWindow!)
*/
inline bool IsDrawObjSelectable( const SwWrtShell& rSh, const Point& rPt )
{
diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx
index ccfd4f7..5964f8e 100644
--- a/sw/source/core/uibase/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
@@ -2161,7 +2161,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
return -1;
}
- pMedium->DownLoad(); // start download if needed
+ pMedium->Download(); // start download if needed
if( aRef.Is() && 1 < aRef->GetRefCount() ) // still a valid ref?
{
SwReader* pRdr;
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 71ccd9b..c74bc9f 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1061,7 +1061,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, const OUString& rURL,
// this sourcecode is not responsible for the lifetime of the shell, SfxObjectShellLock should not be used
SfxObjectShellRef aRef( pDocSh );
- pMed->DownLoad(); // if necessary: start the download
+ pMed->Download(); // if necessary: start the download
if( aRef.Is() && 1 < aRef->GetRefCount() ) // Ref still valid?
{
SwReader* pRdr;
commit 148d5192fc5d57c10045b837cc245fc018f13f64
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 10 14:25:55 2014 +0200
Make implicit assignment etc. work for these iterator classes
...so they fulfil all the relevant iterator requirements out of the box.
Change-Id: I2a47fa18ba31e9680a2b18285a1640baaf0da40b
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index bc4e110..e3f9384 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -151,7 +151,7 @@ struct lcl_DataSeriesContainerAppend : public
{
typedef ::std::vector< ::chart::DialogModel::tSeriesWithChartTypeByName > tContainerType;
- explicit lcl_DataSeriesContainerAppend( tContainerType & rCnt )
+ explicit lcl_DataSeriesContainerAppend( tContainerType * rCnt )
: m_rDestCnt( rCnt )
{}
@@ -168,7 +168,7 @@ struct lcl_DataSeriesContainerAppend : public
aRole = xCT->getRoleOfSequenceForSeriesLabel();
for( sal_Int32 nI = 0; nI < aSeq.getLength(); ++ nI )
{
- m_rDestCnt.push_back(
+ m_rDestCnt->push_back(
::chart::DialogModel::tSeriesWithChartTypeByName(
::chart::DataSeriesHelper::getDataSeriesLabel( aSeq[nI], aRole ),
::std::make_pair( aSeq[nI], xCT )));
@@ -189,10 +189,9 @@ struct lcl_DataSeriesContainerAppend : public
lcl_DataSeriesContainerAppend & operator* () { return *this; }
lcl_DataSeriesContainerAppend & operator++ () { return operator++(0); }
lcl_DataSeriesContainerAppend & operator++ (int) { return *this; }
- lcl_DataSeriesContainerAppend & operator= ( lcl_DataSeriesContainerAppend& ) { return *this; }
private:
- tContainerType & m_rDestCnt;
+ tContainerType * m_rDestCnt;
};
struct lcl_RolesWithRangeAppend : public
@@ -200,7 +199,7 @@ struct lcl_RolesWithRangeAppend : public
{
typedef ::chart::DialogModel::tRolesWithRanges tContainerType;
- explicit lcl_RolesWithRangeAppend( tContainerType & rCnt,
+ explicit lcl_RolesWithRangeAppend( tContainerType * rCnt,
const OUString & aLabelRole )
: m_rDestCnt( rCnt ),
m_aRoleForLabelSeq( aLabelRole )
@@ -220,7 +219,7 @@ struct lcl_RolesWithRangeAppend : public
Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
if( xProp->getPropertyValue( "Role" ) >>= aRole )
{
- m_rDestCnt.insert(
+ m_rDestCnt->insert(
tContainerType::value_type(
aRole, xSeq->getSourceRangeRepresentation()));
// label
@@ -229,7 +228,7 @@ struct lcl_RolesWithRangeAppend : public
Reference< data::XDataSequence > xLabelSeq( xVal->getLabel());
if( xLabelSeq.is())
{
- m_rDestCnt.insert(
+ m_rDestCnt->insert(
tContainerType::value_type(
lcl_aLabelRole, xLabelSeq->getSourceRangeRepresentation()));
}
@@ -252,10 +251,9 @@ struct lcl_RolesWithRangeAppend : public
lcl_RolesWithRangeAppend & operator* () { return *this; }
lcl_RolesWithRangeAppend & operator++ () { return operator++(0); }
lcl_RolesWithRangeAppend & operator++ (int) { return *this; }
- lcl_RolesWithRangeAppend & operator= ( lcl_RolesWithRangeAppend& ) { return *this; }
private:
- tContainerType & m_rDestCnt;
+ tContainerType * m_rDestCnt;
OUString m_aRoleForLabelSeq;
};
@@ -466,7 +464,7 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const
getAllDataSeriesContainers());
::std::copy( aContainers.begin(), aContainers.end(),
- lcl_DataSeriesContainerAppend( aResult ));
+ lcl_DataSeriesContainerAppend( &aResult ));
return aResult;
}
@@ -481,7 +479,7 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
Reference< data::XDataSource > xSource( xSeries, uno::UNO_QUERY_THROW );
const Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSource->getDataSequences());
::std::copy( aSeq.getConstArray(), aSeq.getConstArray() + aSeq.getLength(),
- lcl_RolesWithRangeAppend( aResult, aRoleOfSequenceForLabel ));
+ lcl_RolesWithRangeAppend( &aResult, aRoleOfSequenceForLabel ));
if( xChartType.is())
{
// add missing mandatory roles
commit a7d3f57da50a21dbe27516948435255ad54249c7
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 10 14:12:13 2014 +0200
warning C4101: 'e': unreferenced local variable
Change-Id: I3fb8a4f2854fb034d6b184ee46c04e8a8d03ca6a
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index a071786..4cb7628 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -298,6 +298,7 @@ static Reference< XContent > getContentNoThrow(
}
catch ( IllegalIdentifierException const & e )
{
+ SAL_WARN("ucbhelper", "getContentNoThrow: exception: " << e.Message);
}
return xContent;
commit bcd243793ee4174d71b5e61c88d2bc79fd0d7f1d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Apr 10 14:01:03 2014 +0200
CppunitTest_cppcanvas_emfplus: disable this in case there is no display to use
This test is already disabled on non-Linux, but it fails in case there
is no display to use. For now just disable it in that case.
Change-Id: I29c52e803a1fca5f2bdeeb655c573ad8fef622e8
diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index 62ba638..b341bc0 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -30,9 +30,11 @@ $(eval $(call gb_Module_add_check_targets,cppcanvas,\
CppunitTest_cppcanvas_test \
))
+ifneq ($(DISPLAY),)
$(eval $(call gb_Module_add_slowcheck_targets,cppcanvas,\
CppunitTest_cppcanvas_emfplus \
))
endif
+endif
# vim: set noet sw=4 ts=4:
commit cb10a184b96b0f52ac8aa2b10b3dc218e76e752d
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 9 10:01:34 2014 +0300
Kill the ImplSVGDIData::mbNoXORClipping flag
Instead, act as if it was true on all platforms. Don't do XOR clipping on any
platform. Simpler code is better code, and XOR tricks are generally very much
out of fashion these days, I have been told. Didn't seem to have any visible
ill effects on Linux at least.
Change-Id: I6192006c77a4a81363ec7b3292f72d512d5e9b53
Reviewed-on: https://gerrit.libreoffice.org/8901
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 3c10cbd..be31840 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -843,7 +843,6 @@ protected:
virtual void ClipAndDrawGradientToBounds( Gradient &rGradient, const PolyPolygon &rPolyPoly );
void ClipAndDrawGradient( Gradient &rGradient, const PolyPolygon &rPolyPoly );
- void XORClipAndDrawGradient( Gradient &rGradient, const PolyPolygon &rPolyPoly );
virtual void ClipAndDrawGradientMetafile ( const Gradient &rGradient, const PolyPolygon &rPolyPoly );
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 706271f..0ba6ee6 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -175,7 +175,6 @@ struct ImplSVGDIData
long mnAppFontY; // AppFont Y-Numenator for 80/tel Height
bool mbFontSubChanged; // true: FontSubstitution was changed between Begin/End
bool mbNativeFontConfig; // true: do not override UI font
- bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects
};
struct ImplSVWinData
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index fca7062..91735bb 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -265,7 +265,6 @@ SalInstance *CreateSalInstance()
IosSalInstance* pInstance = new IosSalInstance( new SalYieldMutex() );
new IosSalData( pInstance );
pInstance->AcquireYieldMutex(1);
- ImplGetSVData()->maGDIData.mbNoXORClipping = true;
ImplGetSVData()->maWinData.mbNoSaveBackground = true;
return pInstance;
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 4414bef..7b10141 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -336,7 +336,6 @@ SalInstance* CreateSalInstance()
ImplGetSVData()->maNWFData.mbProgressNeedsErase = true;
ImplGetSVData()->maNWFData.mbCheckBoxNeedsErase = true;
ImplGetSVData()->maNWFData.mnStatusBarLowerRightOffset = 10;
- ImplGetSVData()->maGDIData.mbNoXORClipping = true;
ImplGetSVData()->maWinData.mbNoSaveBackground = true;
return pInst;
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index f5ae9a7..a371384 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -722,10 +722,7 @@ void OutputDevice::ClipAndDrawGradientMetafile ( const Gradient &rGradient, cons
void OutputDevice::ClipAndDrawGradientToBounds ( Gradient &rGradient, const PolyPolygon &rPolyPoly )
{
- if( ImplGetSVData()->maGDIData.mbNoXORClipping )
- ClipAndDrawGradient ( rGradient, rPolyPoly );
- else
- XORClipAndDrawGradient ( rGradient, rPolyPoly );
+ ClipAndDrawGradient ( rGradient, rPolyPoly );
}
void OutputDevice::ClipAndDrawGradient ( Gradient &rGradient, const PolyPolygon &rPolyPoly )
@@ -773,60 +770,6 @@ void OutputDevice::ClipAndDrawGradient ( Gradient &rGradient, const PolyPolygon
}
}
-void OutputDevice::XORClipAndDrawGradient ( Gradient &rGradient, const PolyPolygon &rPolyPoly )
-{
- const PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) );
- const Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
- Point aPoint;
- Rectangle aDstRect( aPoint, GetOutputSizePixel() );
-
- aDstRect.Intersection( aBoundRect );
-
- ClipToPaintRegion( aDstRect );
-
- if( !aDstRect.IsEmpty() )
- {
- boost::scoped_ptr<VirtualDevice> pVDev;
- const Size aDstSize( aDstRect.GetSize() );
-
- if( HasAlpha() )
- {
- // #110958# Pay attention to alpha VDevs here, otherwise,
- // background will be wrong: Temp VDev has to have alpha, too.
- pVDev.reset(new VirtualDevice( *this, 0, GetAlphaBitCount() > 1 ? 0 : 1 ));
- }
- else
- {
- // nothing special here. Plain VDev
- pVDev.reset(new VirtualDevice());
- }
-
- if( pVDev->SetOutputSizePixel( aDstSize) )
- {
- MapMode aVDevMap;
- const bool bOldMap = mbMap;
-
- EnableMapMode( false );
-
- pVDev->DrawOutDev( Point(), aDstSize, aDstRect.TopLeft(), aDstSize, *this );
- pVDev->SetRasterOp( ROP_XOR );
- aVDevMap.SetOrigin( Point( -aDstRect.Left(), -aDstRect.Top() ) );
- pVDev->SetMapMode( aVDevMap );
- pVDev->DrawGradient( aBoundRect, rGradient );
- pVDev->SetFillColor( COL_BLACK );
- pVDev->SetRasterOp( ROP_0 );
- pVDev->DrawPolyPolygon( aPolyPoly );
- pVDev->SetRasterOp( ROP_XOR );
- pVDev->DrawGradient( aBoundRect, rGradient );
- aVDevMap.SetOrigin( Point() );
- pVDev->SetMapMode( aVDevMap );
- DrawOutDev( aDstRect.TopLeft(), aDstSize, Point(), aDstSize, *pVDev );
-
- EnableMapMode( bOldMap );
- }
- }
-}
-
void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
const Gradient& rGradient )
{
commit 0d8e3a145901ab0124d40d33a50e2de28dc0c8ab
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 10 12:48:41 2014 +0200
fdo#75376: configure: disable LTO by default for MSVC too
MSVC 2010 LTO triggers some bug in painting Writer documents;
unfortunately it's not possible to put a VCVER check in there to enable
LTO by default only for MSVC2012 because the compiler detection actually
uses the ENABLE_LTO value.
Change-Id: I29ecdd552d8a8bbd673a844e6bf0c938a98825c2
diff --git a/configure.ac b/configure.ac
index be8f22b..cbc7199 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2535,12 +2535,6 @@ COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`
# Set the ENABLE_LTO variable
# ===================================================================
AC_MSG_CHECKING([whether to use link-time optimization])
-if test $_os = WINNT -a "$WITH_MINGW" != yes -a -z "$enable_lto" -a \
- \( -z "$enable_dbgutil" -o "$enable_dbgutil" = no \) -a \
- \( -z "$enable_debug" -o "$enable_debug" = no \); then
- # Turn on LTO for MSVC when optimising unless told not to
- enable_lto=yes
-fi
if test -n "$enable_lto" -a "$enable_lto" != "no"; then
ENABLE_LTO="TRUE"
AC_MSG_RESULT([yes])
@@ -3684,6 +3678,11 @@ if test "$_os" = "WINNT"; then
100)
COMEX=13
WINDOWS_SDK_ACCEPTABLE_VERSIONS="7.1A 7.1 7.0A 6.0A"
+ if test "$ENABLE_LTO" = TRUE; then
+
+ AC_MSG_WARN([LTO is known to cause problems with MSVC 2010])
+ add_warning "LTO is known to cause problems with MSVC 2010"
+ fi
;;
110)
COMEX=14
commit 5cfbf353db6f5c62c100f80072ccb83d3c062a35
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 10 12:53:22 2014 +0200
loplugin:bodynotinblock
Change-Id: I7262f0114f3bde17d81e14e0813cc7906e73fceb
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6892665..539eb51 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3007,7 +3007,7 @@ void DomainMapper_Impl::handleIndex
if( lcl_FindInCommand( pContext->GetCommand(), 'f', sValue ))
{
if(!sValue.isEmpty())
- sIndexEntryType = sValue ;
+ sIndexEntryType = sValue ;
xTOC->setPropertyValue(rPropNameSupplier.GetName( PROP_INDEX_ENTRY_TYPE ), uno::makeAny(sIndexEntryType));
}
}
commit c3d90aa384d82cbd0dd9f60d5576dbdca9ec1e53
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Apr 10 11:56:47 2014 +0200
fdo#77229 testcase
We didn't have EMF+ rendering testcases so far, let's see if it works
out to render into a bitmap and then just assert pixel position colors
there. It's better than nothing for missing shapes at least.
Change-Id: I2d1c63fef1127f69af7156ed6c99553845f77c9f
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
new file mode 100644
index 0000000..d6a73b5
--- /dev/null
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppcanvas_emfplus, \
+ cppcanvas/qa/extras/emfplus/emfplus \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \
+ comphelper \
+ cppu \
+ sal \
+ sfx \
+ test \
+ tl \
+ unotest \
+ vcl \
+))
+
+$(eval $(call gb_CppunitTest_unset_headless,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
+ canvas/source/cairo/cairocanvas \
+ canvas/source/factory/canvasfactory \
+ cppcanvas/source/uno/mtfrenderer \
+ configmgr/source/configmgr \
+ extensions/source/scanner/scn \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sfx2/util/sfx \
+ sd/util/sd \
+ sd/util/sdd \
+ svl/source/fsstor/fsstorage \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,cppcanvas_emfplus))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index 9894f9c..62ba638 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -29,6 +29,10 @@ ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
$(eval $(call gb_Module_add_check_targets,cppcanvas,\
CppunitTest_cppcanvas_test \
))
+
+$(eval $(call gb_Module_add_slowcheck_targets,cppcanvas,\
+ CppunitTest_cppcanvas_emfplus \
+))
endif
# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/qa/extras/emfplus/data/fdo77229.emf b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
new file mode 100755
index 0000000..1f12717
Binary files /dev/null and b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf differ
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
new file mode 100644
index 0000000..adfb11c
--- /dev/null
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+
+#include <comphelper/processfactory.hxx>
+#include <sfx2/objsh.hxx>
+#include <sfx2/sfxbasemodel.hxx>
+#include <test/bootstrapfixture.hxx>
+#include <unotest/macros_test.hxx>
+#include <vcl/bmpacc.hxx>
+#include <vcl/pngwrite.hxx>
+
+using namespace com::sun::star;
+
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+public:
+ Test()
+ : mpTestDocumentPath("/cppcanvas/qa/extras/emfplus/data/")
+ {
+ }
+
+ virtual ~Test()
+ {
+ }
+
+ virtual void setUp() SAL_OVERRIDE
+ {
+ test::BootstrapFixture::setUp();
+ mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
+ };
+
+ virtual void tearDown() SAL_OVERRIDE
+ {
+ if (mxComponent.is())
+ mxComponent->dispose();
+ test::BootstrapFixture::tearDown();
+ };
+
+ Bitmap load(const char* pName)
+ {
+ mxComponent = loadFromDesktop(getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(pName), "com.sun.star.drawing.DrawingDocument");
+ SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
+ SfxObjectShell* pShell = pModel->GetObjectShell();
+ boost::shared_ptr<GDIMetaFile> pMetaFile = pShell->GetPreviewMetaFile();
+ BitmapEx aResultBitmap;
+ CPPUNIT_ASSERT(pMetaFile->CreateThumbnail(aResultBitmap));
+ // If this is set, the metafile will be dumped as a PNG one for debug purposes.
+ char* pEnv = getenv("CPPCANVAS_DEBUG_EMFPLUS_DUMP_TO");
+ if (pEnv)
+ {
+ SvFileStream aStream(OStringToOUString(pEnv, RTL_TEXTENCODING_UTF8), STREAM_WRITE);
+ vcl::PNGWriter aWriter(aResultBitmap);
+ CPPUNIT_ASSERT(aWriter.Write(aStream));
+ }
+
+ return aResultBitmap.GetBitmap();
+ }
+
+ void testFdo77229();
+
+ CPPUNIT_TEST_SUITE(Test);
+ CPPUNIT_TEST(testFdo77229);
+ CPPUNIT_TEST_SUITE_END();
+
+ uno::Reference<lang::XComponent> mxComponent;
+ const char* mpTestDocumentPath;
+};
+
+void Test::testFdo77229()
+{
+ Bitmap aBitmap = load("fdo77229.emf");
+ Bitmap::ScopedReadAccess pAccess(aBitmap);
+ // The green star was missing.
+ CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x00fe00), Color(pAccess->GetPixel(140, 140)).GetColor());
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8f703221a0dcc772a6d5f6087c77747c7759d16d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 10 11:24:39 2014 +0200
Clean up function declarations and some unused functions
Change-Id: Ic720aa7b30bbe56d67e0b65f3e047ad3ae521a97
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 0ffe6c2..1550bc4 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -170,6 +170,8 @@ private:
sal_uLong mnUpdateEvent;
};
+rtl::Reference< sdr::SelectionController > CreateTableController( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController );
+
} }
#endif // INCLUDED_SVX_SDR_TABLE_TABLECONTROLLER_HXX
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index a8b03dc..776e964 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -84,9 +84,6 @@ namespace accessibility
AccessibleEmptyEditSource_Impl() {}
virtual ~AccessibleEmptyEditSource_Impl() {}
- // from the SfxListener interface
- void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
// SvxEditSource
SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE { return this; }
SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE { return this; }
@@ -136,7 +133,6 @@ namespace accessibility
bool IsValid() const SAL_OVERRIDE { return true; }
- void SetNotifyHdl( const Link& ) {}
LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE { return LANGUAGE_DONTKNOW; }
sal_Int32 GetFieldCount( sal_Int32 ) const SAL_OVERRIDE { return 0; }
EFieldInfo GetFieldInfo( sal_Int32, sal_uInt16 ) const SAL_OVERRIDE { return EFieldInfo(); }
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index bd8231c..5ad3284 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -34,6 +34,8 @@
#include "rtl/ustring.hxx"
#include "vcl/svapp.hxx"
+#include <lookupcolorname.hxx>
+
namespace {
class ColorNameMap: private boost::noncopyable {
diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx
index 4258864..998a2eb 100644
--- a/svx/source/core/coreservices.cxx
+++ b/svx/source/core/coreservices.cxx
@@ -24,37 +24,12 @@
#include "osl/diagnose.h"
#include "cppuhelper/factory.hxx"
+#include <coreservices.hxx>
+
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
-namespace svx
-{
-extern OUString SAL_CALL ExtrusionDepthController_getImplementationName();
-extern Reference< XInterface > SAL_CALL ExtrusionDepthController_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException );
-extern Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException );
-
-extern OUString SAL_CALL ExtrusionDirectionControl_getImplementationName();
-extern Reference< XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException );
-extern Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException );
-
-extern OUString SAL_CALL ExtrusionLightingControl_getImplementationName();
-extern Reference< XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException );
-extern Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException );
-
-extern OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName();
-extern Reference< XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException );
-extern Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException );
-
-extern OUString SAL_CALL FontworkAlignmentControl_getImplementationName();
-extern Reference< XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException );
-extern Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException );
-
-extern OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName();
-extern Reference< XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException );
-extern Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException );
-}
-
extern "C"
{
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 07d28be..f876e2a 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -68,11 +68,6 @@ class ColorWindow : public Control
public:
-
- ColorWindow( Window* pParent, WinBits nWinStyle ) :
- Control( pParent, nWinStyle ),
- aColor( COL_WHITE ) {};
-
ColorWindow( Window* pParent, const ResId& rId ) :
Control( pParent, rId ),
aColor( COL_WHITE ) {};
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 73bf306..9a9a012 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -46,7 +46,6 @@ struct Cell
explicit Cell();
inline bool IsMerged() const { return mbMergeOrig || mbOverlapX || mbOverlapY; }
- inline bool IsOverlapped() const { return mbOverlapX || mbOverlapY; }
void MirrorSelfX( bool bMirrorStyles, bool bSwapDiag );
};
@@ -163,7 +162,6 @@ struct ArrayImpl
bool IsRowInClipRange( size_t nRow ) const;
inline size_t GetMirrorCol( size_t nCol ) const { return mnWidth - nCol - 1; }
- inline size_t GetMirrorRow( size_t nRow ) const { return mnHeight - nRow - 1; }
long GetColPosition( size_t nCol ) const;
long GetRowPosition( size_t nRow ) const;
diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx
index 7c6ea1f..d38445d 100644
--- a/svx/source/engine3d/helperhittest3d.cxx
+++ b/svx/source/engine3d/helperhittest3d.cxx
@@ -54,7 +54,6 @@ public:
// data read access
const E3dCompoundObject* getObject() const { return mpObject; }
- double getDepth() const { return mfDepth; }
};
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 3071408..53237ea 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -350,6 +350,7 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even
Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory)
+ throw (css::uno::Exception)
{
return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) ));
}
@@ -1034,16 +1035,6 @@ void FmXGridPeer::GridListenerDelegator::columnChanged()
m_pPeer->columnChanged();
}
-
-
-Reference< XInterface > FmXGridPeer_CreateInstance(const Reference< XMultiServiceFactory>& _rxFactory)
-{
- FmXGridPeer* pNewObject = new FmXGridPeer( comphelper::getComponentContext(_rxFactory) );
- pNewObject->Create(NULL, WB_TABSTOP);
- return *pNewObject;
-}
-
-
Sequence< Type> SAL_CALL FmXGridPeer::getTypes( ) throw(RuntimeException, std::exception)
{
return comphelper::concatSequences( VCLXWindow::getTypes(), FmXGridPeer_BASE::getTypes() );
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 3b46a57..35eb806 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -4609,13 +4609,6 @@ void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window&
/*************************************************************************/
TYPEINIT1(FmXFilterCell, FmXGridCell);
-
-Reference< XInterface > FmXFilterCell_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& /*_rxFactory*/)
-{
- return *new FmXFilterCell();
-}
-
-
FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl )
:FmXGridCell( pColumn, pControl )
,m_aTextListeners(m_aMutex)
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index baf0c66..a1ea29f 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -121,8 +121,6 @@ namespace svxform
m_xNode( _rxNode ) {}
ItemNode( const Reference< XPropertySet >& _rxSet ) :
m_xPropSet( _rxSet ) {}
-
- DataGroupType GetDataGroupType() const;
};
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index bb87ef3..624a4d1 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -38,6 +38,7 @@
#include <sfx2/app.hxx>
#include <basic/basmgr.hxx>
+#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/assign/list_of.hpp>
#include <utility>
@@ -140,7 +141,8 @@ namespace svxform
//= FormScriptingEnvironment
- class FormScriptingEnvironment : public IFormScriptingEnvironment
+ class FormScriptingEnvironment:
+ public IFormScriptingEnvironment, private boost::noncopyable
{
private:
typedef ::comphelper::ImplementationReference< FormScriptListener, XScriptListener > ListenerImplementation;
@@ -170,11 +172,6 @@ namespace svxform
private:
void impl_registerOrRevoke_throw( const Reference< XEventAttacherManager >& _rxManager, bool _bRegister );
-
- private:
- FormScriptingEnvironment(); // never implemented
- FormScriptingEnvironment( const FormScriptingEnvironment& ); // never implemented
- FormScriptingEnvironment& operator=( const FormScriptingEnvironment& ); // never implemented
};
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index 670c26e..145b93381 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -24,10 +24,6 @@
using namespace com::sun::star;
-
-#define DECL_SERVICE(ImplName) \
-uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno::Reference< lang::XMultiServiceFactory > &) throw( uno::Exception );
-
#define REGISTER_SERVICE(ImplName, ServiceName) \
sString = (ServiceName); \
xSingleFactory = ::cppu::createSingleFactory(xServiceFactory, \
@@ -36,23 +32,8 @@ uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno
if (xSingleFactory.is()) \
xSet->insert(uno::makeAny(xSingleFactory));
-
- DECL_SERVICE( FmXGridControl )
- DECL_SERVICE( FormController )
- DECL_SERVICE( LegacyFormController )
-
-
-
namespace svxform
{
-
-
- // declare selfaware service
- uno::Reference< uno::XInterface > SAL_CALL OAddConditionDialog_Create( const uno::Reference< lang::XMultiServiceFactory >& );
- OUString SAL_CALL OAddConditionDialog_GetImplementationName();
- uno::Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames();
-
-
void ImplSmartRegisterUnoServices()
{
uno::Reference< lang::XMultiServiceFactory > xServiceFactory(::comphelper::getProcessServiceFactory(), uno::UNO_QUERY);
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index f50f008..4bc46c2 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -160,12 +160,6 @@ struct PropertySetInfo
// sal_False -> the set has _no_ such property or it's value isn't empty
};
-sal_Bool operator < (const Reference< XPropertySet >& lhs,
- const Reference< XPropertySet >& rhs)
-{
- return lhs.get() < rhs.get();
-}
-
typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache;
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index ceefb3e..0db6820 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -99,6 +99,7 @@ using namespace ::connectivity::simple;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
FormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB )
+ throw (css::uno::Exception)
{
return *( new ::svxform::FormController( comphelper::getComponentContext(_rxORB) ) );
}
@@ -469,8 +470,6 @@ struct FmFieldInfo
class FmXAutoControl: public UnoControl
{
- friend Reference< XInterface > SAL_CALL FmXAutoControl_NewInstance_Impl();
-
public:
FmXAutoControl() :UnoControl()
{
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 3176818..da0d3d6 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -201,6 +201,7 @@ namespace svxform
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
LegacyFormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB )
+ throw (css::uno::Exception)
{
return ::svxform::LegacyFormController::Create( _rxORB );
}
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 2bdc7ed..66109e2 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -77,16 +77,9 @@ struct ColumnInfo
{
OUString sColumnName;
OUString sLabel;
- bool bColumn;
ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel)
: sColumnName(i_sColumnName)
, sLabel(i_sLabel)
- , bColumn(true)
- {
- }
- ColumnInfo(const OUString& i_sColumnName)
- : sColumnName(i_sColumnName)
- , bColumn(false)
{
}
};
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index f8c0142..a9d6eb6 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -23,6 +23,7 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/typeprovider.hxx>
#include "datanavi.hxx"
+#include "fmservs.hxx"
#include <vcl/msgbox.hxx>
diff --git a/svx/source/inc/coreservices.hxx b/svx/source/inc/coreservices.hxx
new file mode 100644
index 0000000..4a83c51
--- /dev/null
+++ b/svx/source/inc/coreservices.hxx
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed 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 .
+ */
+
+#ifndef INCLUDED_SVX_SOURCE_INC_CORESERVICES_HXX
+#define INCLUDED_SVX_SOURCE_INC_CORESERVICES_HXX
+
+#include <sal/config.h>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace lang { class XMultiServiceFactory; }
+ namespace uno { class XInterface; }
+} } }
+
+namespace svx
+{
+OUString SAL_CALL ExtrusionDepthController_getImplementationName();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+OUString SAL_CALL ExtrusionDirectionControl_getImplementationName();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+OUString SAL_CALL ExtrusionLightingControl_getImplementationName();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list