basic/inc/sbstdobj.hxx | 12 - basic/source/runtime/stdobj1.cxx | 25 +- canvas/source/tools/verifyinput.cxx | 9 chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx | 2 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 3 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 2 chart2/source/controller/inc/MultipleChartConverters.hxx | 1 chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 1 chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 3 chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 3 chart2/source/controller/main/ChartController_Insert.cxx | 5 chart2/source/controller/main/ChartController_Properties.cxx | 2 chart2/source/controller/main/ChartController_Tools.cxx | 8 chart2/source/controller/sidebar/ChartElementsPanel.cxx | 2 chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 3 chart2/source/inc/AxisHelper.hxx | 6 chart2/source/inc/ObjectIdentifier.hxx | 8 chart2/source/inc/RegressionCurveHelper.hxx | 4 chart2/source/tools/AxisHelper.cxx | 8 chart2/source/tools/ObjectIdentifier.cxx | 26 -- chart2/source/tools/RegressionCurveHelper.cxx | 5 chart2/source/view/charttypes/PieChart.cxx | 11 - chart2/source/view/charttypes/PieChart.hxx | 1 compilerplugins/clang/checkunusedparams.cxx | 105 ++++++++-- connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 23 +- connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx | 9 connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx | 11 - connectivity/source/inc/hsqldb/HStorageAccess.hxx | 8 cppcanvas/source/mtfrenderer/textaction.cxx | 5 cui/source/inc/swpossizetabpage.hxx | 4 cui/source/tabpages/swpossizetabpage.cxx | 32 +-- dbaccess/source/core/dataaccess/ContentHelper.cxx | 4 dbaccess/source/core/inc/ContentHelper.hxx | 3 dbaccess/source/ui/browser/genericcontroller.cxx | 16 - desktop/source/lib/init.cxx | 6 desktop/source/lib/lokinteractionhandler.cxx | 1 desktop/source/lib/lokinteractionhandler.hxx | 1 drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 2 editeng/source/editeng/impedit2.cxx | 6 filter/source/msfilter/svdfppt.cxx | 4 filter/source/svg/impsvgdialog.cxx | 32 +-- filter/source/svg/parserfragments.cxx | 8 filter/source/svg/svgreader.cxx | 34 --- framework/inc/dispatch/mailtodispatcher.hxx | 3 framework/inc/dispatch/servicehandler.hxx | 3 framework/source/dispatch/mailtodispatcher.cxx | 13 - framework/source/dispatch/servicehandler.cxx | 13 - hwpfilter/source/drawing.h | 48 ++-- include/canvas/verifyinput.hxx | 21 -- include/oox/ole/axcontrol.hxx | 4 include/oox/ppt/timenodelistcontext.hxx | 2 include/svtools/brwbox.hxx | 1 include/svtools/htmlout.hxx | 6 include/svx/ruler.hxx | 3 include/svx/svdobj.hxx | 3 include/svx/xit.hxx | 2 include/vbahelper/vbaeventshelperbase.hxx | 3 include/vbahelper/vbahelper.hxx | 3 oox/source/ole/axcontrol.cxx | 14 - oox/source/ppt/commonbehaviorcontext.cxx | 3 oox/source/ppt/commonbehaviorcontext.hxx | 1 oox/source/ppt/commontimenodecontext.cxx | 6 oox/source/ppt/conditioncontext.cxx | 5 oox/source/ppt/conditioncontext.hxx | 1 oox/source/ppt/timeanimvaluecontext.cxx | 1 oox/source/ppt/timeanimvaluecontext.hxx | 1 oox/source/ppt/timenodelistcontext.cxx | 69 +++--- sc/source/ui/vba/vbaeventshelper.cxx | 4 sfx2/source/control/unoctitm.cxx | 4 sfx2/source/doc/new.cxx | 6 sfx2/source/inc/preview.hxx | 2 svtools/source/brwbox/brwbox1.cxx | 2 svtools/source/brwbox/brwbox2.cxx | 10 svtools/source/svhtml/htmlout.cxx | 5 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 6 svx/source/dialog/svxruler.cxx | 28 -- svx/source/form/fmtextcontrolshell.cxx | 8 svx/source/svdraw/svdobj.cxx | 6 svx/source/toolbars/extrusionbar.cxx | 4 svx/source/toolbars/fontworkbar.cxx | 4 svx/source/xoutdev/xattr.cxx | 6 svx/source/xoutdev/xattrbmp.cxx | 1 sw/source/ui/vba/vbaeventshelper.cxx | 4 vbahelper/source/msforms/vbacontrol.cxx | 4 vbahelper/source/msforms/vbauserform.cxx | 2 vbahelper/source/vbahelper/vbaeventshelperbase.cxx | 2 vbahelper/source/vbahelper/vbahelper.cxx | 3 vcl/unx/generic/print/glyphset.cxx | 5 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16 - writerfilter/source/dmapper/DomainMapper_Impl.hxx | 8 writerfilter/source/dmapper/LoggedResources.cxx | 42 ++-- writerfilter/source/dmapper/LoggedResources.hxx | 2 92 files changed, 387 insertions(+), 490 deletions(-)
New commits: commit 612b489d3e05b24c1b6690082e8518bac033e9d2 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Tue Aug 1 08:40:47 2017 +0200 loplugin:checkunusedparams the "check for taking address of function" part was generating false+ Change-Id: Iad6203850901229b7b1b2f8938c68ec703cd343f Reviewed-on: https://gerrit.libreoffice.org/40613 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index 34a6e49e7450..8fe8c336b848 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -101,12 +101,12 @@ protected: virtual ~SbStdClipboard() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - static void MethClear( SbxVariable* pVar, SbxArray const * pPar_, bool bWrite ); - static void MethGetData( SbxArray* pPar_, bool bWrite ); - static void MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, bool bWrite ); - static void MethGetText( SbxVariable* pVar, SbxArray const * pPar_, bool bWrite ); - static void MethSetData( SbxArray* pPar_, bool bWrite ); - static void MethSetText( SbxArray const * pPar_, bool bWrite ); + static void MethClear( SbxArray const * pPar_ ); + static void MethGetData( SbxArray* pPar_ ); + static void MethGetFormat( SbxVariable* pVar, SbxArray* pPar_ ); + static void MethGetText( SbxVariable* pVar, SbxArray const * pPar_ ); + static void MethSetData( SbxArray* pPar_ ); + static void MethSetText( SbxArray const * pPar_ ); public: diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 07342d1bb1ee..6777f682f9d6 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -277,7 +277,7 @@ void SbStdFont::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } -void SbStdClipboard::MethClear( SbxVariable*, SbxArray const * pPar_, bool ) +void SbStdClipboard::MethClear( SbxArray const * pPar_ ) { if( pPar_ && (pPar_->Count() > 1) ) { @@ -287,7 +287,7 @@ void SbStdClipboard::MethClear( SbxVariable*, SbxArray const * pPar_, bool ) } -void SbStdClipboard::MethGetData( SbxArray* pPar_, bool ) +void SbStdClipboard::MethGetData( SbxArray* pPar_ ) { if( !pPar_ || (pPar_->Count() != 2) ) { @@ -304,7 +304,7 @@ void SbStdClipboard::MethGetData( SbxArray* pPar_, bool ) } -void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, bool ) +void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_ ) { if( !pPar_ || (pPar_->Count() != 2) ) { @@ -322,7 +322,7 @@ void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, bool ) pVar->PutBool( false ); } -void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray const * pPar_, bool ) +void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray const * pPar_ ) { if( pPar_ && (pPar_->Count() > 1) ) { @@ -333,7 +333,7 @@ void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray const * pPar_, boo pVar->PutString( OUString() ); } -void SbStdClipboard::MethSetData( SbxArray* pPar_, bool ) +void SbStdClipboard::MethSetData( SbxArray* pPar_ ) { if( !pPar_ || (pPar_->Count() != 3) ) { @@ -350,7 +350,7 @@ void SbStdClipboard::MethSetData( SbxArray* pPar_, bool ) } -void SbStdClipboard::MethSetText( SbxArray const * pPar_, bool ) +void SbStdClipboard::MethSetText( SbxArray const * pPar_ ) { if( !pPar_ || (pPar_->Count() != 2) ) { @@ -408,17 +408,16 @@ void SbStdClipboard::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SbxVariable* pVar = pHint->GetVar(); SbxArray* pPar_ = pVar->GetParameters(); const sal_uInt32 nWhich = pVar->GetUserData(); - bool bWrite = pHint->GetId() == SfxHintId::BasicDataChanged; // Methods switch( nWhich ) { - case METH_CLEAR: MethClear( pVar, pPar_, bWrite ); return; - case METH_GETDATA: MethGetData( pPar_, bWrite ); return; - case METH_GETFORMAT: MethGetFormat( pVar, pPar_, bWrite ); return; - case METH_GETTEXT: MethGetText( pVar, pPar_, bWrite ); return; - case METH_SETDATA: MethSetData( pPar_, bWrite ); return; - case METH_SETTEXT: MethSetText( pPar_, bWrite ); return; + case METH_CLEAR: MethClear( pPar_ ); return; + case METH_GETDATA: MethGetData( pPar_ ); return; + case METH_GETFORMAT: MethGetFormat( pVar, pPar_ ); return; + case METH_GETTEXT: MethGetText( pVar, pPar_ ); return; + case METH_SETDATA: MethSetData( pPar_ ); return; + case METH_SETTEXT: MethSetText( pPar_ ); return; } SbxObject::Notify( rBC, rHint ); diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx index 5d9716ef50a6..800ca9dca1f4 100644 --- a/canvas/source/tools/verifyinput.cxx +++ b/canvas/source/tools/verifyinput.cxx @@ -581,15 +581,6 @@ namespace canvas } } - void verifyInput( const rendering::FontInfo& /*fontInfo*/, - const char* /*pStr*/, - const uno::Reference< uno::XInterface >& /*xIf*/, - ::sal_Int16 /*nArgPos*/ ) - { - // TODO(E3): Implement FontDescription checks, once the - // Panose stuff is ready. - } - void verifyInput( const rendering::FontRequest& fontRequest, const char* pStr, const uno::Reference< uno::XInterface >& xIf, diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index f7214e3e2946..245fc313558a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -153,7 +153,7 @@ void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterVal if( m_bAxis ) AxisHelper::showAxis( m_nDimensionIndex, m_bMain, xDiagram, m_spChart2ModelContact->m_xContext ); else - AxisHelper::showGrid( m_nDimensionIndex, 0, m_bMain, xDiagram, m_spChart2ModelContact->m_xContext ); + AxisHelper::showGrid( m_nDimensionIndex, 0, m_bMain, xDiagram ); } else { diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 0f8bd60b38f6..f0f5f76e8f71 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -813,8 +813,7 @@ void WrappedRegressionCurvesProperty::setValueToSeries( const Reference< beans:: RegressionCurveHelper::changeRegressionCurveType( eNewRegressionType, xRegressionCurveContainer, - xRegressionCurve, - uno::Reference< uno::XComponentContext >()); + xRegressionCurve); } } diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index a0e1b70ce273..cdf64d7473e8 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -141,7 +141,7 @@ void TitlesAndObjectsTabPage::commitToModel() aNewExistenceList[1] = m_pCB_Grid_Y->IsChecked(); aNewExistenceList[2] = m_pCB_Grid_Z->IsChecked(); AxisHelper::changeVisibilityOfGrids( xDiagram - , aOldExistenceList, aNewExistenceList, m_xCC ); + , aOldExistenceList, aNewExistenceList ); } } diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index c29fa506769e..37a9f8b0cde1 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -35,7 +35,6 @@ public: const css::uno::Reference<css::frame::XModel> & xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory, const css::awt::Size* pRefSize = nullptr ); virtual ~AllAxisItemConverter() override; diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index 2f22f13fd01c..efef2960eb06 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -43,7 +43,6 @@ AllAxisItemConverter::AllAxisItemConverter( const uno::Reference< frame::XModel > & xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const uno::Reference< lang::XMultiServiceFactory > & /*xNamedPropertyContainerFactory*/, const awt::Size* pRefSize ) : MultipleItemConverter( rItemPool ) { diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index ef80018a7bb5..026720001bc9 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -162,8 +162,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem( xCurve = RegressionCurveHelper::changeRegressionCurveType( eNewRegress, m_xCurveContainer, - xCurve, - uno::Reference< uno::XComponentContext >()); + xCurve); uno::Reference<beans::XPropertySet> xProperties( xCurve, uno::UNO_QUERY ); resetPropertySet( xProperties ); bChanged = true; diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index dc48db2d0fa9..f5e988551e5d 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -436,8 +436,7 @@ bool StatisticsItemConverter::ApplySpecialItem( xCurve = RegressionCurveHelper::changeRegressionCurveType( eRegress, xContainer, - xCurve, - uno::Reference< uno::XComponentContext >()); + xCurve); uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); resetPropertySet( xProperties ); bChanged = true; diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index eceb5af49d6d..e3b3e9146b3c 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -145,7 +145,7 @@ void ChartController::executeDispatch_InsertGrid() InsertAxisOrGridDialogData aDialogOutput; aDlg->getResult( aDialogOutput ); bool bChanged = AxisHelper::changeVisibilityOfGrids( xDiagram - , aDialogInput.aExistenceList, aDialogOutput.aExistenceList, m_xCC ); + , aDialogInput.aExistenceList, aDialogOutput.aExistenceList ); if( bChanged ) aUndoGuard.commit(); } @@ -366,8 +366,7 @@ void ChartController::executeDispatch_InsertTrendline() uno::Reference< chart2::XRegressionCurve > xCurve = RegressionCurveHelper::addRegressionCurve( SvxChartRegress::Linear, - xRegressionCurveContainer, - m_xCC ); + xRegressionCurveContainer ); uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index de3eebd88e76..8ea9d08ab2a7 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -313,7 +313,7 @@ wrapper::ItemConverter* createItemConverter( pItemConverter = new wrapper::AllAxisItemConverter( xChartModel, rDrawModel.GetItemPool(), - rDrawModel, uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ), pRefSize.get()); + rDrawModel, pRefSize.get()); } break; case OBJECTTYPE_GRID: diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 860cdde2bb9c..68b85a0b65a8 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -879,12 +879,12 @@ void ChartController::executeDispatch_ToggleGridHorizontal() } else { - AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, false, xDiagram, m_xCC ); + AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, false, xDiagram ); } } else { - AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, true, xDiagram, m_xCC ); + AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, true, xDiagram ); } aUndoGuard.commit(); } @@ -911,12 +911,12 @@ void ChartController::executeDispatch_ToggleGridVertical() } else { - AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, false, xDiagram, m_xCC ); + AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, false, xDiagram ); } } else { - AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, true, xDiagram, m_xCC ); + AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, true, xDiagram ); } aUndoGuard.commit(); diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 36241b580be8..39607513f4f8 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -155,7 +155,7 @@ void setGridVisible(const css::uno::Reference<css::frame::XModel>& xModel, GridT if (bVisible) AxisHelper::showGrid(nDimensionIndex, nCooSysIndex, bMajor, - xDiagram, comphelper::getProcessComponentContext()); + xDiagram); else AxisHelper::hideGrid(nDimensionIndex, nCooSysIndex, bMajor, xDiagram); } diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 6eb04776332b..07cf968c2e7b 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -164,8 +164,7 @@ void setTrendlineVisible(const css::uno::Reference<css::frame::XModel>& { RegressionCurveHelper::addRegressionCurve( SvxChartRegress::Linear, - xRegressionCurveContainer, - comphelper::getProcessComponentContext()); + xRegressionCurveContainer); } else RegressionCurveHelper::removeAllExceptMeanValueLine( diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 65d908aacec3..7343c5f64a09 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -77,8 +77,7 @@ public: , ReferenceSizeProvider * pRefSizeProvider = nullptr ); static void showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid - , const css::uno::Reference< css::chart2::XDiagram >& xDiagram - , const css::uno::Reference< css::uno::XComponentContext >& xContext ); + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); static void hideAxis( sal_Int32 nDimensionIndex, bool bMainAxis , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); @@ -174,8 +173,7 @@ public: static bool changeVisibilityOfGrids( const css::uno::Reference< css::chart2::XDiagram>& xDiagram , const css::uno::Sequence< sal_Bool >& rOldExistenceList - , const css::uno::Sequence< sal_Bool >& rNewExistenceList - , const css::uno::Reference< css::uno::XComponentContext >& xContext ); + , const css::uno::Sequence< sal_Bool >& rNewExistenceList ); static bool changeVisibilityOfAxes( const css::uno::Reference< css::chart2::XDiagram>& xDiagram , const css::uno::Sequence< sal_Bool >& rOldExistenceList diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index c1209851f262..5eb72c1a1ee8 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -119,13 +119,7 @@ public: , const css::uno::Reference< css::frame::XModel >& xChartModel , sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc - SAL_DLLPRIVATE static OUString createParticleForDiagram( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram - , ChartModel& rModel); - - SAL_DLLPRIVATE static OUString createParticleForDiagram( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram - , const css::uno::Reference< css::frame::XModel >& xChartModel ); + SAL_DLLPRIVATE static OUString createParticleForDiagram(); static OUString createParticleForCoordinateSystem( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index f268de036a8b..dad317be913f 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -98,7 +98,6 @@ namespace RegressionCurveHelper addRegressionCurve( SvxChartRegress eType, css::uno::Reference<css::chart2::XRegressionCurveContainer> const & xCurveContainer, - const css::uno::Reference<css::uno::XComponentContext>& xContext, const css::uno::Reference<css::beans::XPropertySet >& xPropertySource = css::uno::Reference<css::beans::XPropertySet>(), const css::uno::Reference<css::beans::XPropertySet>& xEquationProperties = @@ -114,8 +113,7 @@ namespace RegressionCurveHelper changeRegressionCurveType( SvxChartRegress eType, css::uno::Reference<css::chart2::XRegressionCurveContainer> const & xRegressionCurveContainer, - css::uno::Reference<css::chart2::XRegressionCurve> const & xRegressionCurve, - const css::uno::Reference<css::uno::XComponentContext>& xContext ); + css::uno::Reference<css::chart2::XRegressionCurve> const & xRegressionCurve ); /// returns a calculator object for regression curves (used by the view) OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurveCalculator> diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 81c788846241..1b484801d030 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -444,8 +444,7 @@ void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis } void AxisHelper::showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid - , const Reference< XDiagram >& xDiagram - , const Reference< uno::XComponentContext >& /*xContext*/ ) + , const Reference< XDiagram >& xDiagram ) { if( !xDiagram.is() ) return; @@ -1021,8 +1020,7 @@ bool AxisHelper::changeVisibilityOfAxes( const Reference< XDiagram >& xDiagram bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram , const Sequence< sal_Bool >& rOldExistenceList - , const Sequence< sal_Bool >& rNewExistenceList - , const Reference< uno::XComponentContext >& xContext ) + , const Sequence< sal_Bool >& rNewExistenceList ) { bool bChanged = false; for(sal_Int32 nN=0;nN<6;nN++) @@ -1031,7 +1029,7 @@ bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram { bChanged = true; if(rNewExistenceList[nN]) - AxisHelper::showGrid( nN%3, 0, nN<3, xDiagram, xContext ); + AxisHelper::showGrid( nN%3, 0, nN<3, xDiagram ); else AxisHelper::hideGrid( nN%3, 0, nN<3, xDiagram ); } diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index f81722c5009d..d99a21983e60 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -364,7 +364,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( Reference< XDiagram > xDiagram( xObject, uno::UNO_QUERY ); if( xDiagram.is() ) { - return createClassifiedIdentifierForParticle( createParticleForDiagram( xDiagram, rModel ) ); + return createClassifiedIdentifierForParticle( createParticleForDiagram() ); } //todo @@ -446,7 +446,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( Reference< XDiagram > xDiagram( xObject, uno::UNO_QUERY ); if( xDiagram.is() ) { - return createClassifiedIdentifierForParticle( createParticleForDiagram( xDiagram, xChartModel ) ); + return createClassifiedIdentifierForParticle( createParticleForDiagram() ); } //todo @@ -506,19 +506,9 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles( return aRet.makeStringAndClear(); } -OUString ObjectIdentifier::createParticleForDiagram( - const Reference< XDiagram >& /*xDiagram*/ - , ChartModel& /*xChartModel*/ ) +OUString ObjectIdentifier::createParticleForDiagram() { - //todo: if more than one diagram is implemeted, add the correct diagram index here - return OUString("D=0"); -} - -OUString ObjectIdentifier::createParticleForDiagram( - const Reference< XDiagram >& /*xDiagram*/ - , const Reference< frame::XModel >& /*xChartModel*/ ) -{ - //todo: if more than one diagram is implemeted, add the correct diagram index here + //TODO: if more than one diagram is implemented, add the correct diagram index here return OUString("D=0"); } @@ -539,7 +529,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem( Reference< XCoordinateSystem > xCurrentCooSys( aCooSysList[nCooSysIndex] ); if( xCooSys == xCurrentCooSys ) { - aRet = ObjectIdentifier::createParticleForDiagram( xDiagram, rModel ); + aRet = ObjectIdentifier::createParticleForDiagram(); aRet.append(":CS="); aRet.append( OUString::number( nCooSysIndex ) ); break; @@ -567,7 +557,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem( Reference< XCoordinateSystem > xCurrentCooSys( aCooSysList[nCooSysIndex] ); if( xCooSys == xCurrentCooSys ) { - aRet = ObjectIdentifier::createParticleForDiagram( xDiagram, xChartModel ); + aRet = ObjectIdentifier::createParticleForDiagram(); aRet.append(":CS="); aRet.append( OUString::number( nCooSysIndex ) ); break; @@ -649,7 +639,7 @@ OUString ObjectIdentifier::createParticleForLegend( ChartModel& rModel ) Reference< XDiagram > xDiagram( rModel.getFirstDiagram() ); //todo: if more than one diagram is implemeted, find the correct diagram which is owner of the given legend - aRet.append( ObjectIdentifier::createParticleForDiagram( xDiagram, rModel ) ); + aRet.append( ObjectIdentifier::createParticleForDiagram() ); aRet.append(":"); aRet.append(getStringForType( OBJECTTYPE_LEGEND )); aRet.append("="); @@ -665,7 +655,7 @@ OUString ObjectIdentifier::createParticleForLegend( Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); //todo: if more than one diagram is implemeted, find the correct diagram which is owner of the given legend - aRet.append( ObjectIdentifier::createParticleForDiagram( xDiagram, xChartModel ) ); + aRet.append( ObjectIdentifier::createParticleForDiagram() ); aRet.append(":"); aRet.append(getStringForType( OBJECTTYPE_LEGEND )); aRet.append("="); diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 5fa4a34076e7..3b4d32a7dc02 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -347,7 +347,6 @@ void RegressionCurveHelper::removeMeanValueLine( uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::addRegressionCurve( SvxChartRegress eType, uno::Reference< XRegressionCurveContainer > const & xRegressionCurveContainer, - const uno::Reference< XComponentContext >& /* xContext */, const uno::Reference< beans::XPropertySet >& xPropertySource, const uno::Reference< beans::XPropertySet >& xEquationProperties ) { @@ -467,14 +466,12 @@ void RegressionCurveHelper::removeEquations( uno::Reference< XRegressionCurve > RegressionCurveHelper::changeRegressionCurveType( SvxChartRegress eType, uno::Reference< XRegressionCurveContainer > const & xRegressionCurveContainer, - uno::Reference< XRegressionCurve > const & xRegressionCurve, - const uno::Reference< XComponentContext > & xContext ) + uno::Reference< XRegressionCurve > const & xRegressionCurve ) { xRegressionCurveContainer->removeRegressionCurve( xRegressionCurve ); return RegressionCurveHelper::addRegressionCurve( eType, xRegressionCurveContainer, - xContext, uno::Reference< beans::XPropertySet >( xRegressionCurve, uno::UNO_QUERY ), xRegressionCurve->getEquationProperties()); } diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 84ad1938459d..272d26ad82b6 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -1574,15 +1574,6 @@ bool PieChart::performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLab return true; } -/** Handle the outer placement of the labels in the best fit case. - * - */ -bool PieChart::performLabelBestFitOuterPlacement(ShapeParam& /*rShapeParam*/, PieLabelInfo& /*rPieLabelInfo*/) -{ - SAL_WARN( "chart2.pie.label.bestfit", "to be implemented" ); - return false; -} - /** Handle the placement of the label in the best fit case. * First off the routine try to place the label inside the related pie slice, * if this is not possible the label is placed outside. @@ -1594,7 +1585,7 @@ void PieChart::performLabelBestFit(ShapeParam& rShapeParam, PieLabelInfo& rPieLa if( !performLabelBestFitInnerPlacement(rShapeParam, rPieLabelInfo) ) { - performLabelBestFitOuterPlacement(rShapeParam, rPieLabelInfo); + // TODO } } diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index 1b39ba229ed0..d49e20da575f 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -107,7 +107,6 @@ struct PieLabelInfo; , const css::awt::Size& rPageSize ); bool performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLabelInfo const & rPieLabelInfo); - static bool performLabelBestFitOuterPlacement(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); void performLabelBestFit(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); private: //member diff --git a/compilerplugins/clang/checkunusedparams.cxx b/compilerplugins/clang/checkunusedparams.cxx index d1ff8998a083..a63a1903675a 100644 --- a/compilerplugins/clang/checkunusedparams.cxx +++ b/compilerplugins/clang/checkunusedparams.cxx @@ -28,9 +28,14 @@ class CheckUnusedParams: public RecursiveASTVisitor<CheckUnusedParams>, public l public: explicit CheckUnusedParams(InstantiationData const & data): Plugin(data) {} void run() override; - bool VisitFunctionDecl(FunctionDecl const * decl); - bool VisitDeclRefExpr(DeclRefExpr const *); + bool VisitFunctionDecl(FunctionDecl const *); + bool VisitUnaryAddrOf(UnaryOperator const *); + bool VisitInitListExpr(InitListExpr const *); + bool VisitCallExpr(CallExpr const *); + bool VisitBinAssign(BinaryOperator const *); + bool VisitCXXConstructExpr(CXXConstructExpr const *); private: + void checkForFunctionDecl(Expr const *, bool bCheckOnly = false); std::set<FunctionDecl const *> m_addressOfSet; enum class PluginPhase { FindAddressOf, Warning }; PluginPhase m_phase; @@ -68,20 +73,57 @@ void CheckUnusedParams::run() TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } -bool CheckUnusedParams::VisitDeclRefExpr(DeclRefExpr const * declRef) { +bool CheckUnusedParams::VisitUnaryAddrOf(UnaryOperator const * op) { if (m_phase != PluginPhase::FindAddressOf) return true; - if (ignoreLocation(declRef)) + checkForFunctionDecl(op->getSubExpr()); + return true; +} + +bool CheckUnusedParams::VisitBinAssign(BinaryOperator const * binaryOperator) { + if (m_phase != PluginPhase::FindAddressOf) return true; - if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(declRef->getLocStart()))) + checkForFunctionDecl(binaryOperator->getRHS()); + return true; +} + +bool CheckUnusedParams::VisitCallExpr(CallExpr const * callExpr) { + if (m_phase != PluginPhase::FindAddressOf) return true; - auto functionDecl = dyn_cast<FunctionDecl>(declRef->getDecl()); - if (!functionDecl) + for (auto arg : callExpr->arguments()) + checkForFunctionDecl(arg); + return true; +} + +bool CheckUnusedParams::VisitCXXConstructExpr(CXXConstructExpr const * constructExpr) { + if (m_phase != PluginPhase::FindAddressOf) return true; - m_addressOfSet.insert(functionDecl); + for (auto arg : constructExpr->arguments()) + checkForFunctionDecl(arg); return true; } +bool CheckUnusedParams::VisitInitListExpr(InitListExpr const * initListExpr) { + if (m_phase != PluginPhase::FindAddressOf) + return true; + for (auto subStmt : *initListExpr) + checkForFunctionDecl(dyn_cast<Expr>(subStmt)); + return true; +} + +void CheckUnusedParams::checkForFunctionDecl(Expr const * expr, bool bCheckOnly) { + auto e1 = expr->IgnoreParenCasts(); + auto declRef = dyn_cast<DeclRefExpr>(e1); + if (!declRef) + return; + auto functionDecl = dyn_cast<FunctionDecl>(declRef->getDecl()); + if (!functionDecl) + return; + if (bCheckOnly) + parentStmt(expr)->dump(); + else + m_addressOfSet.insert(functionDecl->getCanonicalDecl()); +} static int noFieldsInRecord(RecordType const * recordType) { auto recordDecl = recordType->getDecl(); @@ -103,7 +145,7 @@ static bool endswith(const std::string& rStr, const char* pSubStr) { bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { if (m_phase != PluginPhase::Warning) return true; - if (m_addressOfSet.find(decl) != m_addressOfSet.end()) + if (m_addressOfSet.find(decl->getCanonicalDecl()) != m_addressOfSet.end()) return true; if (ignoreLocation(decl)) return true; @@ -139,7 +181,6 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { { return true; } - FunctionDecl const * canon = decl->getCanonicalDecl(); std::string fqn = canon->getQualifiedNameAsString(); // because sometimes clang returns nonsense for the filename of canon if (ignoreLocation(canon)) @@ -318,7 +359,30 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { || fqn == "DOM::CDocumentBuilder::_getInstance" || fqn == "xml_security::serial_number_adapter::create" || fqn == "desktop::splash::create" || fqn == "ScannerManager_CreateInstance" - || fqn == "formula::FormulaOpCodeMapperObj::create") + || fqn == "formula::FormulaOpCodeMapperObj::create" + || fqn == "(anonymous namespace)::createInstance" + || fqn == "x_error_handler" + || fqn == "warning_func" + || fqn == "error_func" + || fqn == "ScaDateAddIn_CreateInstance" + || fqn == "ScaPricingAddIn_CreateInstance" + || fqn == "(anonymous namespace)::PDFSigningPKCS7PasswordCallback" + || fqn == "ContextMenuEventLink" + || fqn == "DelayedCloseEventLink" + || fqn == "GDIMetaFile::ImplColMonoFnc" + || fqn == "vcl::getGlyph0" + || fqn == "vcl::getGlyph6" + || fqn == "vcl::getGlyph12" + || fqn == "setPasswordCallback" + || fqn == "VCLExceptionSignal_impl" + || fqn == "getFontTable" + || fqn == "textconversiondlgs::ChineseTranslation_UnoDialog::create" + || fqn == "pcr::DefaultHelpProvider::Create" + || fqn == "pcr::DefaultFormComponentInspectorModel::Create" + || fqn == "GraphicExportDialog::GraphicExportDialog" + || fqn == "pcr::ObjectInspectorModel::Create" + || fqn == "GraphicExportFilter::GraphicExportFilter" + ) return true; // TODO if (fqn == "FontSubsetInfo::CreateFontSubsetFromType1") @@ -329,7 +393,24 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { return true; // FIXME if (fqn == "GtkSalDisplay::filterGdkEvent" || fqn == "SvXMLEmbeddedObjectHelper::ImplReadObject" - || "chart::CachedDataSequence::CachedDataSequence") + || fqn == "chart::CachedDataSequence::CachedDataSequence") + return true; + // used via macro + if (fqn == "framework::MediaTypeDetectionHelper::MediaTypeDetectionHelper" + || fqn == "framework::UriAbbreviation::UriAbbreviation" + || fqn == "framework::DispatchDisabler::DispatchDisabler" + || fqn == "framework::DispatchRecorderSupplier::DispatchRecorderSupplier") + return true; + // TODO Armin Le Grand is still working on this + if (fqn == "svx::frame::CreateDiagFrameBorderPrimitives" + || fqn == "svx::frame::CreateBorderPrimitives") + return true; + // marked with a TODO + if (fqn == "pcr::FormLinkDialog::getExistingRelation" + || fqn == "ooo::vba::DebugHelper::basicexception") + return true; + // macros at work + if (fqn == "msfilter::lcl_PrintDigest") return true; // ignore the LINK macros from include/tools/link.hxx diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 34e818351c13..e8030b2c0b71 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -143,7 +143,7 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nati } -jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, jstring key ) +jint read_from_storage_stream( JNIEnv * env, jstring name, jstring key ) { std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>(); @@ -185,7 +185,7 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2 - (JNIEnv* env, jobject obj_this, jstring name, jstring key) + (JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key) { #ifdef HSQLDB_DBG OperationLogFile aOpLog( env, name, "data" ); @@ -194,12 +194,12 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ DataLogFile aDataLog( env, name, "data" ); return read_from_storage_stream( env, obj_this, name, key, &aDataLog ); #else - return read_from_storage_stream( env, obj_this, name, key ); + return read_from_storage_stream( env, name, key ); #endif } -jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jbyteArray buffer, jint off, jint len ) +jint read_from_storage_stream_into_buffer( JNIEnv * env, jstring name, jstring key, jbyteArray buffer, jint off, jint len ) { #ifdef HSQLDB_DBG { @@ -261,7 +261,8 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ DataLogFile aDataLog( env, name, "data" ); return read_from_storage_stream_into_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog ); #else - return read_from_storage_stream_into_buffer( env, obj_this, name, key, buffer, off, len ); + (void)obj_this; + return read_from_storage_stream_into_buffer( env, name, key, buffer, off, len ); #endif } @@ -401,7 +402,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ } -void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jbyteArray buffer, jint off, jint len ) +void write_to_storage_stream_from_buffer( JNIEnv* env, jstring name, jstring key, jbyteArray buffer, jint off, jint len ) { std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>(); @@ -455,12 +456,13 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ DataLogFile aDataLog( env, name, "data" ); write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog ); #else - write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len ); + (void)obj_this; + write_to_storage_stream_from_buffer( env, name, key, buffer, off, len ); #endif } -void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jint v ) +void write_to_storage_stream( JNIEnv* env, jstring name, jstring key, jint v ) { std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>(); @@ -505,9 +507,10 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ aOpLog.logOperation( "writeInt" ); DataLogFile aDataLog( env, name, "data" ); - write_to_storage_stream( env, obj_this, name, key, v, &aDataLog ); + write_to_storage_stream( env, name, key, v, &aDataLog ); #else - write_to_storage_stream( env, obj_this, name, key, v ); + (void)obj_this; + write_to_storage_stream( env, name, key, v ); #endif } diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index 81f06835d520..70cb184b5cb6 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -75,7 +75,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2 - (JNIEnv * env, jobject obj_this,jstring key, jstring name) + (JNIEnv * env, jobject /*obj_this*/, jstring key, jstring name) { #ifdef HSQLDB_DBG OperationLogFile( env, name, "input" ).logOperation( "read()" ); @@ -83,7 +83,7 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora DataLogFile aDataLog( env, name, "input" ); return read_from_storage_stream( env, obj_this, name, key, &aDataLog ); #else - return read_from_storage_stream( env, obj_this, name, key ); + return read_from_storage_stream( env, name, key ); #endif } @@ -94,7 +94,7 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I */ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII - (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray buffer, jint off, jint len) + (JNIEnv * env, jobject obj_this, jstring key, jstring name, jbyteArray buffer, jint off, jint len) { #ifdef HSQLDB_DBG OperationLogFile( env, name, "input" ).logOperation( "read( byte[], int, int )" ); @@ -102,7 +102,8 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora DataLogFile aDataLog( env, name, "input" ); return read_from_storage_stream_into_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog ); #else - return read_from_storage_stream_into_buffer(env,obj_this,name,key,buffer,off,len); + (void)obj_this; + return read_from_storage_stream_into_buffer(env, name,key,buffer,off,len); #endif } diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx index 67e066adee05..ad551ccce06c 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx @@ -79,7 +79,8 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora DataLogFile aDataLog( env, name, "output" ); write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog ); #else - write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len ); + (void)obj_this; + write_to_storage_stream_from_buffer( env, name, key, buffer, off, len ); #endif } @@ -97,7 +98,8 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora DataLogFile aDataLog( env, name, "output" ); write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, 0, env->GetArrayLength( buffer ), &aDataLog ); #else - write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, 0, env->GetArrayLength( buffer ) ); + (void)obj_this; + write_to_storage_stream_from_buffer( env, name, key, buffer, 0, env->GetArrayLength( buffer ) ); #endif } @@ -145,9 +147,10 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora OperationLogFile( env, name, "output" ).logOperation( "write( int )" ); DataLogFile aDataLog( env, name, "output" ); - write_to_storage_stream( env, obj_this, name, key, b, &aDataLog ); + write_to_storage_stream( env, name, key, b, &aDataLog ); #else - write_to_storage_stream( env, obj_this, name, key, b ); + (void)obj_this; + write_to_storage_stream( env, name, key, b ); #endif } diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx index 7fe654119976..c0ae65541530 100644 --- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx +++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx @@ -29,10 +29,10 @@ namespace connectivity { namespace hsqldb class DataLogFile; } } -jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, jstring key ); -jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len ); -void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len ); -void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v ); +jint read_from_storage_stream( JNIEnv * env, jstring name, jstring key ); +jint read_from_storage_stream_into_buffer( JNIEnv * env, jstring name, jstring key, jbyteArray buffer, jint off, jint len ); +void write_to_storage_stream_from_buffer( JNIEnv* env, jstring name, jstring key, jbyteArray buffer, jint off, jint len ); +void write_to_storage_stream( JNIEnv* env, jstring name, jstring key, jint v ); #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index cdf90ef71eac..073b05d4b907 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -482,7 +482,6 @@ namespace cppcanvas */ bool renderEffectText( const TextRenderer& rRenderer, const rendering::RenderState& rRenderState, - const rendering::ViewState& /*rViewState*/, const uno::Reference< rendering::XCanvas >& xCanvas, const ::Color& rShadowColor, const ::basegfx::B2DSize& rShadowOffset, @@ -931,7 +930,6 @@ namespace cppcanvas return renderEffectText( *this, aLocalState, - mpCanvas->getViewState(), mpCanvas->getUNOCanvas(), maShadowColor, maShadowOffset, @@ -1351,7 +1349,6 @@ namespace cppcanvas return renderEffectText( *this, aLocalState, - mpCanvas->getViewState(), mpCanvas->getUNOCanvas(), maShadowColor, maShadowOffset, @@ -1441,7 +1438,6 @@ namespace cppcanvas xTextLines, rViewState ), aLocalState, - rViewState, xCanvas, maShadowColor, maShadowOffset, @@ -1732,7 +1728,6 @@ namespace cppcanvas return renderEffectText( *this, aLocalState, - mpCanvas->getViewState(), mpCanvas->getUNOCanvas(), maShadowColor, maShadowOffset, diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index ed4b555c583a..2c2168d59183 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -108,8 +108,8 @@ class SvxSwPosSizeTabPage : public SfxTabPage sal_uInt16 nV, sal_uInt16 nVRel, long nX, long nY); static sal_uInt16 GetMapPos(FrmMap *pMap, ListBox const &rAlignLB); - static short GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &rAlignLB, ListBox const &rRelationLB); - static short GetRelation(FrmMap *pMap, ListBox const &rRelationLB); + static short GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox const &rRelationLB); + static short GetRelation(ListBox const &rRelationLB); RndStdIds GetAnchorType(bool* pbHasChanged = nullptr); void FillRelLB(FrmMap *pMap, sal_uInt16 nLBSelPos, sal_uInt16 nAlign, sal_uInt16 nRel, ListBox &rLB, FixedText &rFT); sal_uInt16 FillPosLB(FrmMap *pMap, sal_uInt16 nAlign, const sal_uInt16 _nRel, ListBox &rLB); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index f75e1460ffe5..2decad5333fa 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -837,8 +837,8 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) static_cast<const SfxInt32Item&>(rOldSet.Get( SID_ATTR_TRANSFORM_HORI_POSITION)) ; sal_uInt16 nMapPos = GetMapPos(m_pHMap, *m_pHoriLB); - short nAlign = GetAlignment(m_pHMap, nMapPos, *m_pHoriLB, *m_pHoriToLB); - short nRel = GetRelation(m_pHMap, *m_pHoriToLB); + short nAlign = GetAlignment(m_pHMap, nMapPos, *m_pHoriToLB); + short nRel = GetRelation(*m_pHoriToLB); const long nHoriByPos = static_cast<long>(m_pHoriByMF->Denormalize(m_pHoriByMF->GetValue(FUNIT_TWIP))); if ( @@ -867,8 +867,8 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) static_cast<const SfxInt32Item&>(rOldSet.Get( SID_ATTR_TRANSFORM_VERT_POSITION)); sal_uInt16 nMapPos = GetMapPos(m_pVMap, *m_pVertLB); - short nAlign = GetAlignment(m_pVMap, nMapPos, *m_pVertLB, *m_pVertToLB); - short nRel = GetRelation(m_pVMap, *m_pVertToLB); + short nAlign = GetAlignment(m_pVMap, nMapPos, *m_pVertToLB); + short nRel = GetRelation(*m_pVertToLB); // #i34055# - convert vertical position for // as-character anchored objects long nVertByPos = @@ -1162,8 +1162,8 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) { // horizontal alignment sal_uInt16 nMapPos = GetMapPos(m_pHMap, *m_pHoriToLB); - sal_uInt16 nAlign = GetAlignment(m_pHMap, nMapPos, *m_pHoriLB, *m_pHoriToLB); - sal_uInt16 nRel = GetRelation(m_pHMap, *m_pHoriToLB); + sal_uInt16 nAlign = GetAlignment(m_pHMap, nMapPos, *m_pHoriToLB); + sal_uInt16 nRel = GetRelation(*m_pHoriToLB); aVal.nHoriOrient = (short)nAlign; aVal.nHRelOrient = (short)nRel; @@ -1175,8 +1175,8 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) { // vertical alignment sal_uInt16 nMapPos = GetMapPos(m_pVMap, *m_pVertLB); - sal_uInt16 nAlign = GetAlignment(m_pVMap, nMapPos, *m_pVertLB, *m_pVertToLB); - sal_uInt16 nRel = GetRelation(m_pVMap, *m_pVertToLB); + sal_uInt16 nAlign = GetAlignment(m_pVMap, nMapPos, *m_pVertToLB); + sal_uInt16 nRel = GetRelation(*m_pVertToLB); aVal.nVertOrient = (short)nAlign; aVal.nVRelOrient = (short)nRel; @@ -1259,7 +1259,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void ) { if(bHori) { - sal_uInt16 nRel = GetRelation(m_pHMap, *m_pHoriToLB); + sal_uInt16 nRel = GetRelation(*m_pHoriToLB); if(RelOrientation::PRINT_AREA == nRel && 0 == m_pVertLB->GetSelectEntryPos()) { m_pVertLB->SelectEntryPos(1); @@ -1282,7 +1282,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) sal_uInt16 nMapPos = GetMapPos(pMap, rLB); - sal_uInt16 nAlign = GetAlignment(pMap, nMapPos, rLB, *pRelLB); + sal_uInt16 nAlign = GetAlignment(pMap, nMapPos, *pRelLB); if (bHori) { @@ -1396,7 +1396,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl, Button*, void) m_pSizeCB->Enable(m_pPositionCB->IsEnabled() && !m_pPositionCB->IsChecked()); } -short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox const &rRelationLB) +short SvxSwPosSizeTabPage::GetRelation(ListBox const &rRelationLB) { short nRel = 0; sal_Int32 nPos = rRelationLB.GetSelectEntryPos(); @@ -1410,7 +1410,7 @@ short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox const &rRelationLB) return nRel; } -short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &/*rAlignLB*/, ListBox const &rRelationLB) +short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox const &rRelationLB) { short nAlign = 0; @@ -1632,8 +1632,8 @@ void SvxSwPosSizeTabPage::UpdateExample() if ( m_pHMap && nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_uInt16 nMapPos = GetMapPos(m_pHMap, *m_pHoriLB); - short nAlign = GetAlignment(m_pHMap, nMapPos, *m_pHoriLB, *m_pHoriToLB); - short nRel = GetRelation(m_pHMap, *m_pHoriToLB); + short nAlign = GetAlignment(m_pHMap, nMapPos, *m_pHoriToLB); + short nRel = GetRelation(*m_pHoriToLB); m_pExampleWN->SetHAlign(nAlign); m_pExampleWN->SetHoriRel(nRel); @@ -1643,8 +1643,8 @@ void SvxSwPosSizeTabPage::UpdateExample() if ( m_pVMap && nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_uInt16 nMapPos = GetMapPos(m_pVMap, *m_pVertLB); - sal_uInt16 nAlign = GetAlignment(m_pVMap, nMapPos, *m_pVertLB, *m_pVertToLB); - sal_uInt16 nRel = GetRelation(m_pVMap, *m_pVertToLB); + sal_uInt16 nAlign = GetAlignment(m_pVMap, nMapPos, *m_pVertToLB); + sal_uInt16 nRel = GetRelation(*m_pVertToLB); m_pExampleWN->SetVAlign(nAlign); m_pExampleWN->SetVertRel(nRel); diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 01d7d7b811d2..37d1cbb2b48b 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -202,7 +202,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma // Unreachable } - aRet <<= setPropertyValues( aProperties, Environment ); + aRet <<= setPropertyValues( aProperties ); } else if ( aCommand.Name == "getPropertySetInfo" ) { @@ -314,7 +314,7 @@ void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) } } -Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue >& rValues,const Reference< XCommandEnvironment >& /*xEnv*/ ) +Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue >& rValues ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 14c68000ade8..d7ec3ac89a57 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -96,8 +96,7 @@ namespace dbaccess ,public OContentHelper_COMPBASE { css::uno::Sequence< css::uno::Any > - setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); + setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues ); void impl_rename_throw(const OUString& _sNewName,bool _bNotify = true); diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 576289f3fb42..227fe0c5491c 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -92,7 +92,6 @@ class UserDefinedFeatures public: explicit UserDefinedFeatures( const Reference< XController >& _rxController ); - static FeatureState getState( const URL& _rFeatureURL ); void execute( const URL& _rFeatureURL, const Sequence< PropertyValue>& _rArgs ); private: @@ -104,16 +103,6 @@ UserDefinedFeatures::UserDefinedFeatures( const Reference< XController >& _rxCon { } -FeatureState UserDefinedFeatures::getState( const URL& /*_rFeatureURL*/ ) -{ - // for now, enable all the time - // TODO: we should ask the dispatcher. However, this is laborious, since you cannot ask a dispatcher - // directly, but need to add a status listener. - FeatureState aState; - aState.bEnabled = true; - return aState; -} - void UserDefinedFeatures::execute( const URL& _rFeatureURL, const Sequence< PropertyValue>& _rArgs ) { try @@ -874,7 +863,10 @@ FeatureState OGenericUnoController::GetState( sal_uInt16 _nId ) const aReturn.bEnabled = true; break; default: - aReturn = UserDefinedFeatures::getState( getURLForId( _nId ) ); + // for now, enable all the time + // TODO: we should ask the dispatcher. However, this is laborious, since you cannot ask a dispatcher + // directly, but need to add a status listener. + aReturn.bEnabled = true; break; } diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 5d742780a913..d4e4d9c00b33 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1211,7 +1211,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis, beans::PropertyState_DIRECT_VALUE); rtl::Reference<LOKInteractionHandler> const pInteraction( - new LOKInteractionHandler(::comphelper::getProcessComponentContext(), "load", pLib)); + new LOKInteractionHandler("load", pLib)); auto const pair(pLib->mInteractionMap.insert(std::make_pair(aURL.toUtf8(), pInteraction))); comphelper::ScopeGuard const g([&] () { if (pair.second) @@ -1464,7 +1464,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha { // gImpl does not have to exist when running from a unit test rtl::Reference<LOKInteractionHandler> const pInteraction( - new LOKInteractionHandler(::comphelper::getProcessComponentContext(), "saveas", gImpl, pDocument)); + new LOKInteractionHandler("saveas", gImpl, pDocument)); uno::Reference<task::XInteractionHandler2> const xInteraction(pInteraction.get()); aSaveMediaDescriptor[MediaDescriptor::PROP_INTERACTIONHANDLER()] <<= xInteraction; @@ -2116,7 +2116,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pComma if (gImpl && aCommand == ".uno:Save") { rtl::Reference<LOKInteractionHandler> const pInteraction( - new LOKInteractionHandler(::comphelper::getProcessComponentContext(), "save", gImpl, pDocument)); + new LOKInteractionHandler("save", gImpl, pDocument)); uno::Reference<task::XInteractionHandler2> const xInteraction(pInteraction.get()); beans::PropertyValue aValue; diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx index 012a5aa3ec60..924cc61a14bc 100644 --- a/desktop/source/lib/lokinteractionhandler.cxx +++ b/desktop/source/lib/lokinteractionhandler.cxx @@ -48,7 +48,6 @@ using namespace com::sun::star; LOKInteractionHandler::LOKInteractionHandler( - uno::Reference<uno::XComponentContext> const & /*rxContext*/, const OString& rCommand, desktop::LibLibreOffice_Impl *const pLOKit, desktop::LibLODocument_Impl *const pLOKDocument) diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx index 01a43fbe266c..f6dc441327d8 100644 --- a/desktop/source/lib/lokinteractionhandler.hxx +++ b/desktop/source/lib/lokinteractionhandler.hxx @@ -81,7 +81,6 @@ public: void SetPassword(char const* pPassword); explicit LOKInteractionHandler( - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const & rxContext, const OString& rCommand, desktop::LibLibreOffice_Impl *, desktop::LibLODocument_Impl *pLOKDocumt = nullptr); diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index e17f7c03309d..2230d456ca9a 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -297,7 +297,6 @@ namespace drawinglayer sal_uInt32 nSegments, const attribute::MaterialAttribute3D& rMaterial, double fAngle, - double /*fDegreeStepWidth*/, double fMiterMinimumAngle, basegfx::B2DLineJoin aLineJoin) { @@ -642,7 +641,6 @@ namespace drawinglayer nSegments, aMaterial, fAngle, - getDegreeStepWidth(), getMiterMinimumAngle(), getLineJoin())); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 855eee4b40ba..a90fe3152ee3 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -75,7 +75,7 @@ using namespace ::com::sun::star; -static sal_uInt16 lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem ) +static sal_uInt16 lcl_CalcExtraSpace( const SvxLineSpacingItem& rLSItem ) { sal_uInt16 nExtra = 0; if ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) @@ -4153,7 +4153,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion ) // Only Writer3: Do not add up, but minimum distance. // check if distance by LineSpacing > Upper: - sal_uInt16 nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPortion, rLSItem ) ); + sal_uInt16 nExtraSpace = GetYValue( lcl_CalcExtraSpace( rLSItem ) ); if ( nExtraSpace > pPortion->nFirstLineOffset ) { // Paragraph becomes 'bigger': @@ -4183,7 +4183,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion ) // stuck in the height of PrevPortion. if ( !pPrev->IsInvalid() ) { - nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPrev, rPrevLSItem ) ); + nExtraSpace = GetYValue( lcl_CalcExtraSpace( rPrevLSItem ) ); if ( nExtraSpace > nPrevLower ) { sal_uInt16 nMoreLower = nExtraSpace - nPrevLower; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 834b8927561d..97ced6128856 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7228,7 +7228,7 @@ void GetRowPositions( const tools::Rectangle& rSnapRect, const std::set< sal_Int } -void GetColumnPositions( const tools::Rectangle& rSnapRect, const std::set< sal_Int32 >& /* rRows */, +void GetColumnPositions( const tools::Rectangle& rSnapRect, const std::set< sal_Int32 >& rColumns, std::vector< sal_Int32 >& rPositions, sal_Int32 nRow, sal_Int32 nFlags ) { std::set< sal_Int32 >::const_iterator aColumn( rColumns.find( rSnapRect.Left() ) ); @@ -7291,7 +7291,7 @@ void GetLinePositions( const SdrObject* pObj, const std::set< sal_Int32 >& rRows nRow = rRows.size(); nFlags = LinePositionBottom; } - GetColumnPositions( aSnapRect, rRows, rColumns, rPositions, nRow, nFlags ); + GetColumnPositions( aSnapRect, rColumns, rPositions, nRow, nFlags ); } } else diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx index 62eee7edb76e..4acb378c4926 100644 --- a/filter/source/svg/impsvgdialog.cxx +++ b/filter/source/svg/impsvgdialog.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; -inline sal_Int32 implMap( vcl::Window& /*rWnd*/, sal_Int32 nVal ) +inline sal_Int32 implMap( sal_Int32 nVal ) { return( nVal << 1 ); } @@ -45,34 +45,34 @@ ImpSVGDialog::ImpSVGDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFi mbOldNativeDecoration( false ) { SetText( "SVG Export Options" ); - SetOutputSizePixel( Size( implMap( *this, 177 ), implMap( *this, 77 ) ) ); + SetOutputSizePixel( Size( implMap( 177 ), implMap( 77 ) ) ); maFI->SetText( "Export" ); - maFI->SetPosSizePixel( Point( implMap( *this, 6 ), implMap( *this, 3 ) ), - Size( implMap( *this, 165 ), implMap( *this, 8 ) ) ); + maFI->SetPosSizePixel( Point( implMap( 6 ), implMap( 3 ) ), + Size( implMap( 165 ), implMap( 8 ) ) ); maCBTinyProfile->SetText( "Use SVG Tiny profile" ); - maCBTinyProfile->SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 14 ) ), - Size( implMap( *this, 142 ), implMap( *this, 10 ) ) ); + maCBTinyProfile->SetPosSizePixel( Point( implMap( 12 ), implMap( 14 ) ), + Size( implMap( 142 ), implMap( 10 ) ) ); maCBEmbedFonts->SetText( "Embed fonts" ); - maCBEmbedFonts->SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 27 ) ), - Size( implMap( *this, 142 ), implMap( *this, 10 ) ) ); + maCBEmbedFonts->SetPosSizePixel( Point( implMap( 12 ), implMap( 27 ) ), + Size( implMap( 142 ), implMap( 10 ) ) ); maCBUseNativeDecoration->SetText( "Use SVG native text decoration" ); - maCBUseNativeDecoration->SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 41 ) ), - Size( implMap( *this, 142 ), implMap( *this, 10 ) ) ); + maCBUseNativeDecoration->SetPosSizePixel( Point( implMap( 12 ), implMap( 41 ) ), + Size( implMap( 142 ), implMap( 10 ) ) ); maCBTinyProfile->Check( maConfigItem.ReadBool( SVG_PROP_TINYPROFILE, false ) ); maCBEmbedFonts->Check( maConfigItem.ReadBool( SVG_PROP_EMBEDFONTS, true ) ); maCBUseNativeDecoration->Check( maConfigItem.ReadBool( SVG_PROP_NATIVEDECORATION, true ) ); - maBTOK->SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 57 ) ), - Size( implMap( *this, 50 ), implMap( *this, 14 ) ) ); - maBTCancel->SetPosSizePixel( Point( implMap( *this, 65 ), implMap( *this, 57 ) ), - Size( implMap( *this, 50 ), implMap( *this, 14 ) ) ); - maBTHelp->SetPosSizePixel( Point( implMap( *this, 121 ), implMap( *this, 57 ) ), - Size( implMap( *this, 50 ), implMap( *this, 14 ) ) ); + maBTOK->SetPosSizePixel( Point( implMap( 12 ), implMap( 57 ) ), + Size( implMap( 50 ), implMap( 14 ) ) ); + maBTCancel->SetPosSizePixel( Point( implMap( 65 ), implMap( 57 ) ), + Size( implMap( 50 ), implMap( 14 ) ) ); + maBTHelp->SetPosSizePixel( Point( implMap( 121 ), implMap( 57 ) ), + Size( implMap( 50 ), implMap( 14 ) ) ); maCBTinyProfile->SetToggleHdl( LINK( this, ImpSVGDialog, OnToggleCheckbox ) ); OnToggleCheckbox( *maCBTinyProfile.get() ); diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx index e02fe3feeed4..94ccdab42b49 100644 --- a/filter/source/svg/parserfragments.cxx +++ b/filter/source/svg/parserfragments.cxx @@ -41,7 +41,7 @@ void setFourBitColor( double& rChannel, char nChar ) rChannel = (nVal*16+nVal)/255.0; } -void setEightBitColor( double& rChannel, const char* pStart, const char* ) +void setEightBitColor( double& rChannel, const char* pStart ) { const sal_uInt8 nVal0(hex2int(pStart[0])); const sal_uInt8 nVal1(hex2int(pStart[1])); @@ -124,9 +124,9 @@ namespace { using namespace ::boost::spirit::classic; - auto lambdaSetEightBitColorR = [&self](const char* pStart, const char* nChar){ setEightBitColor(self.m_rColor.r, pStart, nChar); }; - auto lambdaSetEightBitColorG = [&self](const char* pStart, const char* nChar){ setEightBitColor(self.m_rColor.g, pStart, nChar); }; - auto lambdaSetEightBitColorB = [&self](const char* pStart, const char* nChar){ setEightBitColor(self.m_rColor.b, pStart, nChar); }; + auto lambdaSetEightBitColorR = [&self](const char* pStart, const char* /*nChar*/){ setEightBitColor(self.m_rColor.r, pStart); }; + auto lambdaSetEightBitColorG = [&self](const char* pStart, const char* /*nChar*/){ setEightBitColor(self.m_rColor.g, pStart); }; + auto lambdaSetEightBitColorB = [&self](const char* pStart, const char* /*nChar*/){ setEightBitColor(self.m_rColor.b, pStart); }; auto lambdaSetFourBitColorR = [&self](char nChar){ setFourBitColor(self.m_rColor.r, nChar); }; auto lambdaSetFourBitColorG = [&self](char nChar){ setFourBitColor(self.m_rColor.g, nChar); }; auto lambdaSetFourBitColorB = [&self](char nChar){ setFourBitColor(self.m_rColor.b, nChar); }; diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 768c93f83031..482a8343dbcd 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -1391,8 +1391,7 @@ void annotateStyles( StatePool& rStatePoo struct ShapeWritingVisitor { - ShapeWritingVisitor(StatePool& /*rStatePool*/, - StateMap& rStateMap, + ShapeWritingVisitor(StateMap& rStateMap, const uno::Reference<xml::sax::XDocumentHandler>& xDocumentHandler) : mrStateMap(rStateMap), mxDocumentHandler(xDocumentHandler), @@ -1464,7 +1463,6 @@ struct ShapeWritingVisitor writePathShape(xAttrs, xUnoAttrs, - xElem, sStyleId, aPoly); } @@ -1482,7 +1480,6 @@ struct ShapeWritingVisitor writePathShape(xAttrs, xUnoAttrs, - xElem, sStyleId, basegfx::B2DPolyPolygon(aPoly)); break; @@ -1540,7 +1537,6 @@ struct ShapeWritingVisitor writePathShape(xAttrs, xUnoAttrs, - xElem, sStyleId, basegfx::B2DPolyPolygon(aPoly)); } @@ -1566,7 +1562,6 @@ struct ShapeWritingVisitor for( sal_uInt32 i(0L); i<aPoly.count(); ++i ) { writePathShape(xAttrs, xUnoAttrs, - xElem, sStyleId, basegfx::B2DPolyPolygon(aPoly.getB2DPolygon(i))); } @@ -1575,7 +1570,6 @@ struct ShapeWritingVisitor { writePathShape(xAttrs, xUnoAttrs, - xElem, sStyleId, aPoly); } @@ -1612,7 +1606,6 @@ struct ShapeWritingVisitor if ( r > 0 ) writeEllipseShape(xAttrs, xUnoAttrs, - xElem, sStyleId, basegfx::B2DEllipse(basegfx::B2DPoint(cx, cy), basegfx::B2DTuple(r,r))); break; @@ -1651,7 +1644,6 @@ struct ShapeWritingVisitor if ( rx > 0 && ry > 0 ) writeEllipseShape(xAttrs, xUnoAttrs, - xElem, sStyleId, basegfx::B2DEllipse(basegfx::B2DPoint(cx, cy), basegfx::B2DTuple(rx,ry))); break; @@ -1707,7 +1699,7 @@ struct ShapeWritingVisitor parseXlinkHref(aValueUtf8.getStr(), sLinkValue); if (!sLinkValue.isEmpty()) - writeBinaryData(xAttrs, xUnoAttrs, xElem, basegfx::B2DRange(x,y,x+width,y+height), sLinkValue); + writeBinaryData(xAttrs, xUnoAttrs, basegfx::B2DRange(x,y,x+width,y+height), sLinkValue); break; } case XML_TSPAN: @@ -1804,7 +1796,6 @@ struct ShapeWritingVisitor void writeBinaryData( rtl::Reference<SvXMLAttributeList> const & xAttrs, const uno::Reference<xml::sax::XAttributeList>& xUnoAttrs, - const uno::Reference<xml::dom::XElement>& /* xElem */, const basegfx::B2DRange& rShapeBounds, const OUString& data) { @@ -1833,7 +1824,6 @@ struct ShapeWritingVisitor void writeEllipseShape( rtl::Reference<SvXMLAttributeList> const & xAttrs, const uno::Reference<xml::sax::XAttributeList>& xUnoAttrs, - const uno::Reference<xml::dom::XElement>& xElem, const OUString& rStyleId, const basegfx::B2DEllipse& rEllipse) { @@ -1843,13 +1833,11 @@ struct ShapeWritingVisitor basegfx::B2DPolygon aPoly = basegfx::tools::createPolygonFromEllipse(rEllipse.getB2DEllipseCenter(), rEllipse.getB2DEllipseRadius().getX(), rEllipse.getB2DEllipseRadius().getY()); - writePathShape(xAttrs, xUnoAttrs, xElem, rStyleId, basegfx::B2DPolyPolygon(aPoly)); - + writePathShape(xAttrs, xUnoAttrs, rStyleId, basegfx::B2DPolyPolygon(aPoly)); } void writePathShape( rtl::Reference<SvXMLAttributeList> const & xAttrs, const uno::Reference<xml::sax::XAttributeList>& xUnoAttrs, - const uno::Reference<xml::dom::XElement>& xElem, const OUString& rStyleId, const basegfx::B2DPolyPolygon& rPoly ) { @@ -1876,7 +1864,6 @@ struct ShapeWritingVisitor basegfx::tools::adaptiveSubdivideByAngle(aPoly)) : basegfx::tools::getRange(aPoly)); fillShapeProperties(xAttrs, - xElem, aBounds, "svggraphicstyle"+rStyleId); @@ -1900,7 +1887,6 @@ struct ShapeWritingVisitor } void fillShapeProperties( rtl::Reference<SvXMLAttributeList> const & xAttrs, - const uno::Reference<xml::dom::XElement>& /* xElem */, const basegfx::B2DRange& rShapeBounds, const OUString& rStyleName ) { @@ -1932,13 +1918,12 @@ struct ShapeWritingVisitor }; /// Write out shapes from DOM tree -void writeShapes( StatePool& rStatePool, - StateMap& rStateMap, - const uno::Reference<xml::dom::XElement>& rElem, - const uno::Reference<xml::sax::XDocumentHandler>& xDocHdl, - std::vector< uno::Reference<xml::dom::XElement> >& rUseElementVector ) +void writeShapes( StateMap& rStateMap, + const uno::Reference<xml::dom::XElement>& rElem, + const uno::Reference<xml::sax::XDocumentHandler>& xDocHdl, + std::vector< uno::Reference<xml::dom::XElement> >& rUseElementVector ) { - ShapeWritingVisitor aVisitor(rStatePool,rStateMap,xDocHdl); + ShapeWritingVisitor aVisitor(rStateMap,xDocHdl); visitElements(aVisitor, rElem, SHAPE_WRITER); std::vector< uno::Reference<xml::dom::XElement> >::iterator it; @@ -2294,8 +2279,7 @@ bool SVGReader::parseAndConvert() m_xDocumentHandler->startElement("draw:page", xUnoAttrs); // write out all shapes - writeShapes(aStatePool, - aStateMap, + writeShapes(aStateMap, xDocElem, m_xDocumentHandler, aUseElementVector); diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index bc3fc2f68717..afcea61455b9 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -93,8 +93,7 @@ class MailToDispatcher : public ::cppu::WeakImplHelper< /* internal */ private: /// @throws css::uno::RuntimeException - bool implts_dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ); + bool implts_dispatch( const css::util::URL& aURL ); }; // class MailToDispatcher diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index fd225ea7111a..c8fd1ec24de6 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -97,8 +97,7 @@ class ServiceHandler : public ::cppu::WeakImplHelper< /* internal */ private: /// @throws css::uno::RuntimeException - css::uno::Reference< css::uno::XInterface > implts_dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ); + css::uno::Reference< css::uno::XInterface > implts_dispatch( const css::util::URL& aURL ); }; // class ServiceHandler diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 904b5416048e..37c5321c747b 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -115,12 +115,12 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail list of optional arguments for this mail request */ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) + const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) { // dispatch() is an [oneway] call ... and may our user release his reference to us immediately. // So we should hold us self alive till this call ends. css::uno::Reference< css::frame::XNotifyingDispatch > xSelfHold(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); - implts_dispatch(aURL,lArguments); + implts_dispatch(aURL); // No notification for status listener! } @@ -137,7 +137,7 @@ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL& reference to a valid listener for state events */ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments, + const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) { // This class was designed to die by reference. And if user release his reference to us immediately after calling this method @@ -145,7 +145,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& // Another reason: We can use this reference as source of sending event at the end too. css::uno::Reference< css::frame::XNotifyingDispatch > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); - bool bState = implts_dispatch(aURL,lArguments); + bool bState = implts_dispatch(aURL); if (xListener.is()) { css::frame::DispatchResultEvent aEvent; @@ -167,16 +167,13 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& @param aURL mail URL which should be executed - @param lArguments - list of optional arguments for this mail request @return <TRUE/> if dispatch could be started successfully Note: Our internal used shell executor doesn't return any state value - so we must believe that call was successfully. <FALSE/> if necessary resource couldn't be created or an exception was thrown. */ -bool MailToDispatcher::implts_dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) +bool MailToDispatcher::implts_dispatch( const css::util::URL& aURL ) { bool bSuccess = false; diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index d1f7bd6f636a..b1046a90d7a5 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -114,12 +114,12 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv list of optional arguments for this request */ void SAL_CALL ServiceHandler::dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) + const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) { // dispatch() is an [oneway] call ... and may our user release his reference to us immediately. // So we should hold us self alive till this call ends. css::uno::Reference< css::frame::XNotifyingDispatch > xSelfHold(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); - implts_dispatch(aURL,lArguments); + implts_dispatch(aURL); // No notification for status listener! } @@ -136,7 +136,7 @@ void SAL_CALL ServiceHandler::dispatch( const css::util::URL& optional listener for state events */ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments, + const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) { // This class was designed to die by reference. And if user release his reference to us immediately after calling this method @@ -144,7 +144,7 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL& // Another reason: We can use this reference as source of sending event at the end too. css::uno::Reference< css::frame::XNotifyingDispatch > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); - css::uno::Reference< css::uno::XInterface > xService = implts_dispatch(aURL,lArguments); + css::uno::Reference< css::uno::XInterface > xService = implts_dispatch(aURL); if (xListener.is()) { css::frame::DispatchResultEvent aEvent; @@ -167,15 +167,12 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL& @param aURL uno URL which should be executed - @param lArguments - list of optional arguments for this request @return <NULL/> if requested service couldn't be created successfully; a valid reference otherwise. This return value can be used to indicate, if dispatch was successfully or not. */ -css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) +css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( const css::util::URL& aURL ) { if (!m_xFactory.is()) return css::uno::Reference< css::uno::XInterface >(); diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h index 1967ddffed1c..a69ecf4878c5 100644 --- a/hwpfilter/source/drawing.h +++ b/hwpfilter/source/drawing.h @@ -430,7 +430,7 @@ static bool LoadDrawingObjectBlock(Picture * pic) // object manipulation function static int -HWPDODefaultFunc(int , HWPDrawingObject * , int cmd, void *, int) +HWPDODefaultFunc(int cmd) { if (cmd == OBJFUNC_LOAD) return OBJRET_FILE_NO_PRIVATE_BLOCK; @@ -438,7 +438,7 @@ HWPDODefaultFunc(int , HWPDrawingObject * , int cmd, void *, int) } static int -HWPDOLineFunc(int type, HWPDrawingObject * hdo, int cmd, void *argp, int argv) +HWPDOLineFunc(int /*type*/, HWPDrawingObject * hdo, int cmd, void * /*argp*/, int /*argv*/) { int ret = OBJRET_FILE_OK; switch (cmd) @@ -455,7 +455,7 @@ HWPDOLineFunc(int type, HWPDrawingObject * hdo, int cmd, void *argp, int argv) ret = OBJRET_FILE_NO_PRIVATE_BLOCK_2; break; default: - ret = HWPDODefaultFunc(type, hdo, cmd, argp, argv); + ret = HWPDODefaultFunc(cmd); break; } return ret; @@ -465,25 +465,25 @@ HWPDOLineFunc(int type, HWPDrawingObject * hdo, int cmd, void *argp, int argv) // rectangle static int -HWPDORectFunc(int type, HWPDrawingObject * hdo, int cmd, void *argp, int argv) +HWPDORectFunc(int /*type*/, HWPDrawingObject * /*hdo*/, int cmd, void * /*argp*/, int /*argv*/) { - return HWPDODefaultFunc(type, hdo, cmd, argp, argv); + return HWPDODefaultFunc(cmd); } // ellipse static int -HWPDOEllipseFunc(int type, HWPDrawingObject * hdo, -int cmd, void *argp, int argv) +HWPDOEllipseFunc(int /*type*/, HWPDrawingObject * /*hdo*/, +int cmd, void * /*argp*/, int /*argv*/) { - return HWPDODefaultFunc(type, hdo, cmd, argp, argv); + return HWPDODefaultFunc(cmd); } #define WTMM(x) ((double)(x) / 1800. * 25.4) static int -HWPDOEllipse2Func(int type, HWPDrawingObject * hdo, -int cmd, void *argp, int argv) +HWPDOEllipse2Func(int /*type*/, HWPDrawingObject * hdo, +int cmd, void * /*argp*/, int /*argv*/) { switch (cmd) { @@ -502,7 +502,7 @@ int cmd, void *argp, int argv) return OBJRET_FILE_ERROR; break; default: - return HWPDODefaultFunc(type, hdo, cmd, argp, argv); + return HWPDODefaultFunc(cmd); } return OBJRET_FILE_OK; } @@ -511,7 +511,7 @@ int cmd, void *argp, int argv) // arc static int -HWPDOArcFunc(int type, HWPDrawingObject * hdo, int cmd, void *argp, int argv) +HWPDOArcFunc(int /*type*/, HWPDrawingObject * hdo, int cmd, void * /*argp*/, int /*argv*/) { switch (cmd) { @@ -526,14 +526,14 @@ HWPDOArcFunc(int type, HWPDrawingObject * hdo, int cmd, void *argp, int argv) return OBJRET_FILE_ERROR; break; default: - return HWPDODefaultFunc(type, hdo, cmd, argp, argv); + return HWPDODefaultFunc(cmd); } return OBJRET_FILE_OK; } static int -HWPDOArc2Func(int type, HWPDrawingObject * hdo, int cmd, void *argp, int argv) +HWPDOArc2Func(int /*type*/, HWPDrawingObject * /*hdo*/, int cmd, void * /*argp*/, int /*argv*/) { int ret = OBJRET_FILE_OK; switch (cmd) @@ -542,7 +542,7 @@ HWPDOArc2Func(int type, HWPDrawingObject * hdo, int cmd, void *argp, int argv) ret = OBJRET_FILE_NO_PRIVATE_BLOCK; break; default: - ret = HWPDODefaultFunc(type, hdo, cmd, argp, argv); + ret = HWPDODefaultFunc(cmd); break; } return ret; @@ -550,8 +550,8 @@ HWPDOArc2Func(int type, HWPDrawingObject * hdo, int cmd, void *argp, int argv) static int -HWPDOFreeFormFunc(int type, HWPDrawingObject * hdo, -int cmd, void *argp, int argv) +HWPDOFreeFormFunc(int /*type*/, HWPDrawingObject * hdo, +int cmd, void * /*argp*/, int /*argv*/) { switch (cmd) { @@ -606,7 +606,7 @@ int cmd, void *argp, int argv) delete[]hdo->u.freeform.pt; break; default: - return HWPDODefaultFunc(type, hdo, cmd, argp, argv); + return HWPDODefaultFunc(cmd); } return OBJRET_FILE_OK; } @@ -640,8 +640,8 @@ static HWPPara *LoadParaList() static int -HWPDOTextBoxFunc(int type, HWPDrawingObject * hdo, -int cmd, void *argp, int argv) +HWPDOTextBoxFunc(int /*type*/, HWPDrawingObject * hdo, +int cmd, void * /*argp*/, int /*argv*/) { switch (cmd) { @@ -660,7 +660,7 @@ int cmd, void *argp, int argv) } break; default: - return HWPDODefaultFunc(type, hdo, cmd, argp, argv); + return HWPDODefaultFunc(cmd); } return OBJRET_FILE_OK; } @@ -668,10 +668,10 @@ int cmd, void *argp, int argv) static int -HWPDOContainerFunc(int type, HWPDrawingObject * hdo, -int cmd, void *argp, int argv) +HWPDOContainerFunc(int /*type*/, HWPDrawingObject * /*hdo*/, +int cmd, void * /*argp*/, int /*argv*/) { - return HWPDODefaultFunc(type, hdo, cmd, argp, argv); + return HWPDODefaultFunc(cmd); } diff --git a/include/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx index 067083d436af..ac9d4e840748 100644 --- a/include/canvas/verifyinput.hxx +++ b/include/canvas/verifyinput.hxx @@ -288,27 +288,6 @@ namespace canvas const css::uno::Reference< css::uno::XInterface >& xIf, ::sal_Int16 nArgPos ); - /** Basic check for font info validity. - - @param fontInfo - Font info to check - - @param xIf - The interface that should be reported as the one - generating the exception. - - @param nArgPos - Argument position on the call site (i.e. the position of - the argument, checked here, on the UNO interface - method. Counting starts at 0). - - @throws an lang::IllegalArgumentException, if anything is wrong - */ - CANVASTOOLS_DLLPUBLIC void verifyInput( const css::rendering::FontInfo& fontInfo, - const char* pStr, - const css::uno::Reference< css::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); - /** Basic check for font request validity. @param fontRequest diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 59e56dc3cedd..6da2e8039ffc 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -322,8 +322,7 @@ public: PropertySet const & rPropSet, OUString& rValue, sal_Int32& nMultiSelect, - ApiDefaultStateMode eDefStateMode, - bool bAwtModel ); + ApiDefaultStateMode eDefStateMode ); /** Converts the Forms 2.0 control orientation to UNO properties. */ static void convertAxOrientation( @@ -333,7 +332,6 @@ public: static void convertToAxOrientation( PropertySet const & rPropSet, - const AxPairData& rSize, sal_Int32& nOrientation ); private: diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx index e592cc289f33..c93ee8a4880f 100644 --- a/include/oox/ppt/timenodelistcontext.hxx +++ b/include/oox/ppt/timenodelistcontext.hxx @@ -43,7 +43,7 @@ namespace oox { namespace ppt { static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ); protected: - TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw(); + TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const TimeNodePtr & pNode ) throw(); sal_Int32 mnElement; TimeNodePtr mpNode; diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 53ca0cc2cbb8..0b089a7235b0 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -417,7 +417,6 @@ public: virtual void CursorMoved(); virtual void ColumnMoved( sal_uInt16 nColId ); virtual void ColumnResized( sal_uInt16 nColId ); - static long QueryColumnResize( sal_uInt16 nColId, long nWidth ); /// called when the row height has been changed interactively virtual void RowHeightChanged(); virtual long QueryMinimumRowHeight(); diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 5d14ef72b845..d58080e8e443 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -58,16 +58,14 @@ struct HTMLOutFuncs OUString *pNonConvertableChars ); SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr, - bool bOn = true, - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252); + bool bOn = true); SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_uInt32 cChar, HTMLOutContext& rContext, OUString *pNonConvertableChars ); SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&, rtl_TextEncoding eDestEnc, OUString *pNonConvertableChars = nullptr ); - SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen, - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); + SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen ); SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color& ); SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&, const HTMLOutEvent *pEventTable, diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 3c5efe0fafea..2fef8b7fb7c9 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -237,9 +237,6 @@ protected: virtual void Update(); - // calculation of boundary values for object borders - // values refer to the page - static bool CalcLimits(long &nMax1, long &nMax2, bool bFirst); bool IsActLastColumn( bool bForceDontConsiderHidden = false, sal_uInt16 nAct=USHRT_MAX) const; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 5d4669eb5749..e85d6de002c0 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -986,8 +986,7 @@ public: static void RemoveMakeObjectHdl(Link<SdrObjCreatorParams, SdrObject*> const & rLink); private: - static SVX_DLLPRIVATE SdrObject* CreateObjectFromFactory( - SdrInventor nInventor, sal_uInt16 nIdentifier, SdrPage* pPage, SdrModel* pModel ); + static SVX_DLLPRIVATE SdrObject* CreateObjectFromFactory( SdrInventor nInventor, sal_uInt16 nIdentifier ); SdrObjFactory() = delete; }; diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 19b5b3c43881..7cbfa15486bc 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -63,7 +63,7 @@ public: Argument pPool2 can be null. If returned string equals NameOrIndex->GetName(), the name was already unique. */ - static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults ); + static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults ); void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 81379c33eb2c..b5c09d83d37f 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -61,8 +61,7 @@ class VBAHELPER_DLLPUBLIC VbaEventsHelperBase : public VbaEventsHelperBase_BASE { public: VbaEventsHelperBase( - const css::uno::Sequence< css::uno::Any >& rArgs, - const css::uno::Reference< css::uno::XComponentContext >& xContext ); ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits