From a6b91730053fc61416716ae176081b91de52532b Mon Sep 17 00:00:00 2001 From: nccuong Date: Mon, 4 Mar 2013 15:25:02 +0100 Subject: fdo#60148 Clean up warnings from the Clang compiler plugin Change-Id: I08d755677c46c476710ecbd067ed9f7e2f54a671 loplugin: clean warnings: unused variables, incorrect indentation and log area. Reviewed-on: https://gerrit.libreoffice.org/2544 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- chart2/source/controller/dialogs/tp_DataSource.cxx | 1 - .../controller/main/ChartDropTargetHelper.cxx | 1 - chart2/source/controller/main/ChartFrameloader.cxx | 66 +++++++++++----------- .../source/model/template/BarChartTypeTemplate.cxx | 2 - chart2/source/model/template/ChartTypeTemplate.cxx | 4 +- 5 files changed, 35 insertions(+), 39 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index a13c6779fba9..35fe3500c49a 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -604,7 +604,6 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl) SvTreeListEntry * pEntry = m_aLB_ROLE.FirstSelected(); if( pEntry ) { - OUString aRange( m_aEDT_RANGE.GetText()); OUString aSelectedRoleUI = lcl_GetSelectedRole( m_aLB_ROLE, true ); OUString aSelectedRange = lcl_GetSelectedRolesRange( m_aLB_ROLE ); diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 8669897861d3..83d075a045c5 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -111,7 +111,6 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt ) ::std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes )); if( aStrings.size() >= 3 && aStrings[0] == "soffice" ) { - OUString aDocName( aStrings[1] ); OUString aRangeString( aStrings[2] ); Reference< container::XChild > xChild( m_xChartDocument, uno::UNO_QUERY ); if( xChild.is()) diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 5ca460b0be5f..5b2c03b3aaf6 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -141,45 +141,45 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT // call initNew() or load() at XLoadable if(!bHaveLoadedModel) - try - { - comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL())); - if( aIt != aMediaDescriptor.end()) + try { - ::rtl::OUString aURL( (*aIt).second.get< ::rtl::OUString >()); - if( aURL.matchAsciiL( - RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" ))) - { - // create new file - uno::Reference< frame::XLoadable > xLoadable( xModel, uno::UNO_QUERY_THROW ); - xLoadable->initNew(); - } - else + comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL())); + if( aIt != aMediaDescriptor.end()) { - aMediaDescriptor.addInputStream(); - uno::Sequence< beans::PropertyValue > aCompleteMediaDescriptor; - aMediaDescriptor >> aCompleteMediaDescriptor; - apphelper::MediaDescriptorHelper aMDHelper( aCompleteMediaDescriptor ); - - // load file - // @todo: replace: aMediaDescriptorHelper.getReducedForModel() - uno::Reference< frame::XLoadable > xLoadable( xModel, uno::UNO_QUERY_THROW ); - xLoadable->load( aCompleteMediaDescriptor ); - - //resize standalone files to get correct size: - if( xComponentWindow.is() && aMDHelper.ISSET_FilterName && aMDHelper.FilterName.equals( "StarChart 5.0") ) + ::rtl::OUString aURL( (*aIt).second.get< ::rtl::OUString >()); + if( aURL.matchAsciiL( + RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" ))) + { + // create new file + uno::Reference< frame::XLoadable > xLoadable( xModel, uno::UNO_QUERY_THROW ); + xLoadable->initNew(); + } + else { - awt::Rectangle aRect( xComponentWindow->getPosSize() ); - sal_Int16 nFlags=0; - xComponentWindow->setPosSize( aRect.X, aRect.Y, aRect.Width, aRect.Height, nFlags ); + aMediaDescriptor.addInputStream(); + uno::Sequence< beans::PropertyValue > aCompleteMediaDescriptor; + aMediaDescriptor >> aCompleteMediaDescriptor; + apphelper::MediaDescriptorHelper aMDHelper( aCompleteMediaDescriptor ); + + // load file + // @todo: replace: aMediaDescriptorHelper.getReducedForModel() + uno::Reference< frame::XLoadable > xLoadable( xModel, uno::UNO_QUERY_THROW ); + xLoadable->load( aCompleteMediaDescriptor ); + + //resize standalone files to get correct size: + if( xComponentWindow.is() && aMDHelper.ISSET_FilterName && aMDHelper.FilterName.equals( "StarChart 5.0") ) + { + awt::Rectangle aRect( xComponentWindow->getPosSize() ); + sal_Int16 nFlags=0; + xComponentWindow->setPosSize( aRect.X, aRect.Y, aRect.Width, aRect.Height, nFlags ); + } } } } - } - catch( const uno::Exception & ex ) - { - ASSERT_EXCEPTION( ex ); - } + catch( const uno::Exception & ex ) + { + ASSERT_EXCEPTION( ex ); + } return sal_True; } diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 260b12ece08b..1c1ec10e069b 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -188,8 +188,6 @@ sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate( bResult && getDimension() == 3 ) { - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( - DiagramHelper::getDataSeriesFromDiagram( xDiagram )); bool bGeomFound = false, bGeomAmbiguous = false; sal_Int32 aCommonGeom = DiagramHelper::getGeometry3D( xDiagram, bGeomFound, bGeomAmbiguous ); diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 3f7899f34e15..7858edf87cac 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -237,8 +237,8 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram > } // remove charttype groups from all coordinate systems - Sequence< Reference< XChartType > > aOldChartTypesSeq( - DiagramHelper::getChartTypesFromDiagram(xDiagram) ); + Sequence< Reference< XChartType > > aOldChartTypesSeq( + DiagramHelper::getChartTypesFromDiagram(xDiagram) ); Reference< XCoordinateSystemContainer > xCoordSysCnt( xDiagram, uno::UNO_QUERY ); OSL_ASSERT( xCoordSysCnt.is()); -- cgit