[Libreoffice-commits] .: xmloff/source
Eike Rathke
erack at kemper.freedesktop.org
Tue Jun 12 04:32:57 PDT 2012
xmloff/source/chart/SchXMLChartContext.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 0f79440a86dc788a38ef4b3be63bffd2cd396ddc
Author: Eike Rathke <erack at redhat.com>
Date: Tue Jun 12 11:51:55 2012 +0200
work around spurious signed overflow warnings
gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2)
com/sun/star/uno/Sequence.hxx:178:10: error: assuming signed overflow does not
occur when assuming that (X - c) > X is always false [-Werror=strict-overflow]
Change-Id: Ibbc2f3533097ad379e1707f77039c675a0d00133
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 801d412..cdadaf4 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -636,7 +636,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
if( !sColTrans.isEmpty() || !sRowTrans.isEmpty() )
{
aArgs.realloc( aArgs.getLength() + 1 );
- aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
+ aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue(
::rtl::OUString( "SequenceMapping" ),
-1, uno::makeAny( !sColTrans.isEmpty()
? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() )
@@ -662,7 +662,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
if( !aChartOleObjectName.isEmpty() )
{
aArgs.realloc( aArgs.getLength() + 1 );
- aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
+ aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue(
::rtl::OUString( "ChartOleObjectName" ),
-1, uno::makeAny( aChartOleObjectName ),
beans::PropertyState_DIRECT_VALUE );
@@ -674,11 +674,11 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
xDataProvider->createDataSource( aArgs ));
aArgs.realloc( aArgs.getLength() + 2 );
- aArgs[ aArgs.getLength() - 2 ] = beans::PropertyValue(
+ aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 2 ] = beans::PropertyValue(
::rtl::OUString( "HasCategories" ),
-1, uno::makeAny( bHasCateories ),
beans::PropertyState_DIRECT_VALUE );
- aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
+ aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue(
::rtl::OUString("UseCategoriesAsX"),
-1, uno::makeAny( sal_False ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui)
beans::PropertyState_DIRECT_VALUE );
More information about the Libreoffice-commits
mailing list