Kaydet (Commit) 0f79440a authored tarafından Eike Rathke's avatar Eike Rathke

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
üst d2a02df2
...@@ -636,7 +636,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram( ...@@ -636,7 +636,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
if( !sColTrans.isEmpty() || !sRowTrans.isEmpty() ) if( !sColTrans.isEmpty() || !sRowTrans.isEmpty() )
{ {
aArgs.realloc( aArgs.getLength() + 1 ); 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" ), ::rtl::OUString( "SequenceMapping" ),
-1, uno::makeAny( !sColTrans.isEmpty() -1, uno::makeAny( !sColTrans.isEmpty()
? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() )
...@@ -662,7 +662,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram( ...@@ -662,7 +662,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
if( !aChartOleObjectName.isEmpty() ) if( !aChartOleObjectName.isEmpty() )
{ {
aArgs.realloc( aArgs.getLength() + 1 ); 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" ), ::rtl::OUString( "ChartOleObjectName" ),
-1, uno::makeAny( aChartOleObjectName ), -1, uno::makeAny( aChartOleObjectName ),
beans::PropertyState_DIRECT_VALUE ); beans::PropertyState_DIRECT_VALUE );
...@@ -674,11 +674,11 @@ void lcl_ApplyDataFromRectangularRangeToDiagram( ...@@ -674,11 +674,11 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
xDataProvider->createDataSource( aArgs )); xDataProvider->createDataSource( aArgs ));
aArgs.realloc( aArgs.getLength() + 2 ); 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" ), ::rtl::OUString( "HasCategories" ),
-1, uno::makeAny( bHasCateories ), -1, uno::makeAny( bHasCateories ),
beans::PropertyState_DIRECT_VALUE ); 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"), ::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) -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 ); beans::PropertyState_DIRECT_VALUE );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment