mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove a few more unused variables

Browse Source 
Change-Id: I6c70c000f60e7e6e43bd068ccb98b693b80746f2
This commit is contained in:
Markus Mohrhard
2013-04-29 20:57:10 +02:00
parent d5ef883025
commit f9cd73ebe1
2 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/oox/export/chartexport.hxx
View File

@@ -89,11 +89,8 @@ private:
com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > mxNewDiagram; com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > mxNewDiagram;
// members filled by InitRangeSegmentationProperties (retrieved from DataProvider) // members filled by InitRangeSegmentationProperties (retrieved from DataProvider)
sal_Bool mbHasSeriesLabels;
sal_Bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false sal_Bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false
sal_Bool mbRowSourceColumns;
OUString msChartAddress; OUString msChartAddress;
OUString msTableNumberList;
::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping; ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping;
//::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes; //::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes;

44
oox/source/export/chartexport.cxx
View File

@@ -438,14 +438,8 @@ ChartExport::ChartExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, Reference< f
, mnXmlNamespace( nXmlNamespace ) , mnXmlNamespace( nXmlNamespace )
, maFraction( 1, 576 ) , maFraction( 1, 576 )
, mxChartModel( xModel ) , mxChartModel( xModel )
, mbHasSeriesLabels( sal_False )
, mbHasCategoryLabels( sal_False ) , mbHasCategoryLabels( sal_False )
, mbRowSourceColumns( sal_True )
, mbHasXAxis( sal_False )
, mbHasYAxis( sal_False )
, mbHasZAxis( sal_False ) , mbHasZAxis( sal_False )
, mbHasSecondaryXAxis( sal_False )
, mbHasSecondaryYAxis( sal_False )
, mbIs3DChart( sal_False ) , mbIs3DChart( sal_False )
{ {
} }
@@ -631,18 +625,8 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha
if( aArgs[i].Value >>= sBrokenRange ) if( aArgs[i].Value >>= sBrokenRange )
bBrokenRangeAvailable = true; bBrokenRangeAvailable = true;
} }
else if ( aArgs[i].Name == "DataRowSource" )
{
::com::sun::star::chart::ChartDataRowSource eRowSource;
aArgs[i].Value >>= eRowSource;
mbRowSourceColumns = ( eRowSource == ::com::sun::star::chart::ChartDataRowSource_COLUMNS );
}
else if ( aArgs[i].Name == "FirstCellAsLabel" )
aArgs[i].Value >>= mbHasSeriesLabels;
else if ( aArgs[i].Name == "SequenceMapping" ) else if ( aArgs[i].Name == "SequenceMapping" )
aArgs[i].Value >>= maSequenceMapping; aArgs[i].Value >>= maSequenceMapping;
else if ( aArgs[i].Name == "TableNumberList" )
aArgs[i].Value >>= msTableNumberList;
} }
// #i79009# For Writer we have to export a broken version of the // #i79009# For Writer we have to export a broken version of the
@@ -720,10 +704,6 @@ void ChartExport::_ExportContent()
aAny >>= msChartAddress; aAny >>= msChartAddress;
//maExportHelper.SetChartRangeAddress( sChartAddress ); //maExportHelper.SetChartRangeAddress( sChartAddress );
// OUString sTableNumberList;
aAny = xProp->getPropertyValue(
OUString("TableNumberList"));
aAny >>= msTableNumberList;
//maExportHelper.SetTableNumberList( sTableNumberList ); //maExportHelper.SetTableNumberList( sTableNumberList );
// do not include own table if there are external addresses // do not include own table if there are external addresses
@@ -1820,36 +1800,12 @@ void ChartExport::InitPlotArea( )
Reference<lang::XServiceInfo> xServiceInfo (mxDiagram, uno::UNO_QUERY); Reference<lang::XServiceInfo> xServiceInfo (mxDiagram, uno::UNO_QUERY);
if (xServiceInfo.is()) if (xServiceInfo.is())
{ {
if (xServiceInfo->supportsService(
OUString("com.sun.star.chart.ChartAxisXSupplier")))
{
xDiagramProperties->getPropertyValue(
OUString("HasXAxis")) >>= mbHasXAxis;
}
if (xServiceInfo->supportsService(
OUString("com.sun.star.chart.ChartAxisYSupplier")))
{
xDiagramProperties->getPropertyValue(
OUString("HasYAxis")) >>= mbHasYAxis;
}
if (xServiceInfo->supportsService( if (xServiceInfo->supportsService(
OUString("com.sun.star.chart.ChartAxisZSupplier"))) OUString("com.sun.star.chart.ChartAxisZSupplier")))
{ {
xDiagramProperties->getPropertyValue( xDiagramProperties->getPropertyValue(
OUString("HasZAxis")) >>= mbHasZAxis; OUString("HasZAxis")) >>= mbHasZAxis;
} }
if (xServiceInfo->supportsService(
OUString("com.sun.star.chart.ChartTwoAxisXSupplier")))
{
xDiagramProperties->getPropertyValue(
OUString("HasSecondaryXAxis")) >>= mbHasSecondaryXAxis;
}
if (xServiceInfo->supportsService(
OUString("com.sun.star.chart.ChartTwoAxisYSupplier")))
{
xDiagramProperties->getPropertyValue(
OUString("HasSecondaryYAxis")) >>= mbHasSecondaryYAxis;
}
} }
xDiagramProperties->getPropertyValue( xDiagramProperties->getPropertyValue(