diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-01 08:40:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-01 11:06:26 +0200 |
| commit | 612b489d3e05b24c1b6690082e8518bac033e9d2 (patch) | |
| tree | 23a6c556989071385d1c64730ed72bdbae7c239c | |
| parent | 17e14d459dea201b57be2d8e677fa776ead03291 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
92 files changed, 387 insertions, 490 deletions
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 ); + const css::uno::Sequence< css::uno::Any >& rArgs ); virtual ~VbaEventsHelperBase() override; // script::vba::XVBAEventProcessor diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index 909382d01c78..525b4237795a 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -197,7 +197,7 @@ class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeom { std::unique_ptr< ShapeHelper > m_pShapeHelper; public: - ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ); + ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::drawing::XShape >& xShape ); virtual double getLeft() const override; virtual void setLeft( double nLeft ) override; virtual double getTop() const override; @@ -215,7 +215,6 @@ class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttrib { public: UserFormGeometryHelper( - const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl, double fOffsetX, double fOffsetY ); virtual double getLeft() const override; diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 789259210109..a59beb631475 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -524,7 +524,7 @@ void ControlConverter::convertAxState( PropertyMap& rPropMap, } void ControlConverter::convertToAxState( PropertySet const & rPropSet, - OUString& rValue, sal_Int32& nMultiSelect, ApiDefaultStateMode eDefStateMode, bool /*bAwtModel*/ ) + OUString& rValue, sal_Int32& nMultiSelect, ApiDefaultStateMode eDefStateMode ) { bool bSupportsTriState = eDefStateMode == API_DEFAULTSTATE_TRISTATE; @@ -561,7 +561,7 @@ void ControlConverter::convertAxOrientation( PropertyMap& rPropMap, } void ControlConverter::convertToAxOrientation( PropertySet const & rPropSet, - const AxPairData& /*rSize*/, sal_Int32& nOrientation ) + sal_Int32& nOrientation ) { bool bHorizontal = true; convertToMSOrientation( rPropSet, bHorizontal ); @@ -1576,7 +1576,7 @@ void AxToggleButtonModel::convertFromProperties( PropertySet& rPropSet, const Co ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); // need to process the image if one exists - ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); + ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -1651,7 +1651,7 @@ void AxCheckBoxModel::convertFromProperties( PropertySet& rPropSet, const Contro ControlConverter::convertToAxVisualEffect( rPropSet, mnSpecialEffect ); ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); // need to process the image if one exists - ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); + ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -1713,7 +1713,7 @@ void AxOptionButtonModel::convertFromProperties( PropertySet& rPropSet, const Co ControlConverter::convertToAxVisualEffect( rPropSet, mnSpecialEffect ); ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); // need to process the image if one exists - ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); + ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -2135,7 +2135,7 @@ void AxSpinButtonModel::convertFromProperties( PropertySet& rPropSet, const Cont ControlConverter::convertToMSColor( rPropSet, PROP_SymbolColor, mnArrowColor); ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); - ControlConverter::convertToAxOrientation( rPropSet, maSize, mnOrientation ); + ControlConverter::convertToAxOrientation( rPropSet, mnOrientation ); } void AxSpinButtonModel::exportCompObj( BinaryOutputStream& rOutStream ) @@ -2306,7 +2306,7 @@ void AxScrollBarModel::convertFromProperties( PropertySet& rPropSet, const Contr mnPropThumb = AX_PROPTHUMB_ON; // default ControlConverter::convertToMSColor( rPropSet, PROP_SymbolColor, mnArrowColor); ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); - ControlConverter::convertToAxOrientation( rPropSet, maSize, mnOrientation ); + ControlConverter::convertToAxOrientation( rPropSet, mnOrientation ); rPropSet.getProperty( mnMin, PROP_ScrollValueMin ); rPropSet.getProperty( mnMax, PROP_ScrollValueMax ); diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx index 9751e7b97997..4c30b5ece3d8 100644 --- a/oox/source/ppt/commonbehaviorcontext.cxx +++ b/oox/source/ppt/commonbehaviorcontext.cxx @@ -40,9 +40,8 @@ using namespace ::com::sun::star::xml::sax; namespace oox { namespace ppt { CommonBehaviorContext::CommonBehaviorContext( FragmentHandler2 const & rParent, - const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, PPT_TOKEN( cBhvr ), xAttribs, pNode ) + : TimeNodeContext( rParent, PPT_TOKEN( cBhvr ), pNode ) , mbInAttrList( false ) , mbIsInAttrName( false ) { diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx index e36f746db309..0cf0a1c5089a 100644 --- a/oox/source/ppt/commonbehaviorcontext.hxx +++ b/oox/source/ppt/commonbehaviorcontext.hxx @@ -40,7 +40,6 @@ namespace oox { namespace ppt { { public: CommonBehaviorContext( ::oox::core::FragmentHandler2 const & rParent, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ); virtual ~CommonBehaviorContext( ) throw( ) override; diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index 038e1226cf41..52495b027cda 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -356,7 +356,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mbIterate( false ) { AttributeList attribs( xAttribs ); @@ -607,9 +607,9 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I return new TimeNodeListContext( *this, mpNode->getChildren() ); case PPT_TOKEN( stCondLst ): - return new CondListContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode, mpNode->getStartCondition() ); + return new CondListContext( *this, aElementToken, mpNode, mpNode->getStartCondition() ); case PPT_TOKEN( endCondLst ): - return new CondListContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode, mpNode->getEndCondition() ); + return new CondListContext( *this, aElementToken, mpNode, mpNode->getEndCondition() ); case PPT_TOKEN( endSync ): return new CondContext( *this, rAttribs.getFastAttributeList(), mpNode, mpNode->getEndSyncValue() ); diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx index 591cfa75b32e..2b6aca2c42a3 100644 --- a/oox/source/ppt/conditioncontext.cxx +++ b/oox/source/ppt/conditioncontext.cxx @@ -42,7 +42,7 @@ namespace oox { namespace ppt { CondContext::CondContext( FragmentHandler2 const & rParent, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationCondition & aValue ) - : TimeNodeContext( rParent, PPT_TOKEN( cond ), xAttribs, pNode ) + : TimeNodeContext( rParent, PPT_TOKEN( cond ), pNode ) , maCond( aValue ) { maEvent.Trigger = EventTrigger::NONE; @@ -154,10 +154,9 @@ namespace oox { namespace ppt { /** CT_TLTimeConditionList */ CondListContext::CondListContext( FragmentHandler2 const & rParent, sal_Int32 aElement, - const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationConditionList & aCond ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , maConditions( aCond ) { } diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx index b9bb2cb0c961..76399f792941 100644 --- a/oox/source/ppt/conditioncontext.hxx +++ b/oox/source/ppt/conditioncontext.hxx @@ -52,7 +52,6 @@ namespace oox { namespace ppt { public: CondListContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationConditionList & aCondList ); virtual ~CondListContext( ) throw( ) override; diff --git a/oox/source/ppt/timeanimvaluecontext.cxx b/oox/source/ppt/timeanimvaluecontext.cxx index dccd2c381235..cf020ca62b4a 100644 --- a/oox/source/ppt/timeanimvaluecontext.cxx +++ b/oox/source/ppt/timeanimvaluecontext.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::xml::sax; namespace oox { namespace ppt { TimeAnimValueListContext::TimeAnimValueListContext( FragmentHandler2 const & rParent, - const Reference< XFastAttributeList >& /*xAttribs*/, TimeAnimationValueList & aTavList ) : FragmentHandler2( rParent ) , maTavList( aTavList ) diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx index 059564b44958..d0965edbe595 100644 --- a/oox/source/ppt/timeanimvaluecontext.hxx +++ b/oox/source/ppt/timeanimvaluecontext.hxx @@ -31,7 +31,6 @@ namespace oox { namespace ppt { { public: TimeAnimValueListContext( ::oox::core::FragmentHandler2 const & rParent, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, TimeAnimationValueList & aTavList ); virtual ~TimeAnimValueListContext( ) override; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 3421b4abc475..47e56fe38ebf 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -108,7 +108,7 @@ namespace oox { namespace ppt { MediaNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mbIsNarration( false ) , mbFullScrn( false ) { @@ -140,12 +140,12 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); default: break; } @@ -165,9 +165,8 @@ namespace oox { namespace ppt { { public: SetTimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, - const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { } @@ -190,12 +189,12 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( to ): // CT_TLAnimVariant return new AnimVariantContext( *this, aElementToken, maTo ); @@ -218,7 +217,7 @@ namespace oox { namespace ppt { CmdTimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , maType(0) { switch ( aElement ) @@ -304,12 +303,12 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); default: break; } @@ -331,7 +330,7 @@ namespace oox { namespace ppt { SequenceTimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mnNextAc(0) , mnPrevAc(0) { @@ -348,11 +347,9 @@ namespace oox { namespace ppt { case PPT_TOKEN( cTn ): return new CommonTimeNodeContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode ); case PPT_TOKEN( nextCondLst ): - return new CondListContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode, - mpNode->getNextCondition() ); + return new CondListContext( *this, aElementToken, mpNode, mpNode->getNextCondition() ); case PPT_TOKEN( prevCondLst ): - return new CondListContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode, - mpNode->getPrevCondition() ); + return new CondListContext( *this, aElementToken, mpNode, mpNode->getPrevCondition() ); default: break; } @@ -372,9 +369,8 @@ namespace oox { namespace ppt { { public: ParallelExclTimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, - const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { } @@ -403,7 +399,7 @@ namespace oox { namespace ppt { AnimColorContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mnColorSpace( xAttribs->getOptionalValueToken( XML_clrSpc, 0 ) ) , mnDir( xAttribs->getOptionalValueToken( XML_dir, 0 ) ) , mbHasByColor( false ) @@ -462,7 +458,7 @@ namespace oox { namespace ppt { mbHasByColor = true; return this; case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( to ): // CT_Color return new ColorContext( *this, maToClr ); @@ -494,7 +490,7 @@ namespace oox { namespace ppt { AnimContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { NodePropertyMap & aProps( pNode->getNodeProperties() ); sal_Int32 nCalcMode = xAttribs->getOptionalValueToken( XML_calcmode, 0 ); @@ -571,14 +567,14 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( tavLst ): - return new TimeAnimValueListContext ( *this, rAttribs.getFastAttributeList(), maTavList ); + return new TimeAnimValueListContext ( *this, maTavList ); default: break; } @@ -598,7 +594,7 @@ namespace oox { namespace ppt { AnimScaleContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mbZoomContents( false ) { AttributeList attribs( xAttribs ); @@ -632,7 +628,7 @@ namespace oox { namespace ppt { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( to ): { // CT_TLPoint @@ -678,7 +674,7 @@ namespace oox { namespace ppt { AnimRotContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { AttributeList attribs( xAttribs ); @@ -703,12 +699,12 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); default: break; } @@ -725,7 +721,7 @@ namespace oox { namespace ppt { AnimMotionContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { pNode->getNodeProperties()[ NP_TRANSFORMTYPE ] <<= (sal_Int16)AnimationTransformType::TRANSLATE; @@ -761,7 +757,7 @@ namespace oox { namespace ppt { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( to ): { // CT_TLPoint @@ -820,7 +816,7 @@ namespace oox { namespace ppt { AnimEffectContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { sal_Int32 nDir = xAttribs->getOptionalValueToken( XML_transition, 0 ); OUString sFilter = xAttribs->getOptionalValue( XML_filter ); @@ -835,12 +831,12 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( progress ): return new AnimVariantContext( *this, aElementToken, maProgress ); // TODO handle it. @@ -866,13 +862,13 @@ namespace oox { namespace ppt { pCtx = new AnimColorContext( rParent, aElement, xAttribs, pNode ); break; case PPT_TOKEN( par ): - pCtx = new ParallelExclTimeNodeContext( rParent, aElement, xAttribs, pNode ); + pCtx = new ParallelExclTimeNodeContext( rParent, aElement, pNode ); break; case PPT_TOKEN( seq ): pCtx = new SequenceTimeNodeContext( rParent, aElement, xAttribs, pNode ); break; case PPT_TOKEN( excl ): - pCtx = new ParallelExclTimeNodeContext( rParent, aElement, xAttribs, pNode ); + pCtx = new ParallelExclTimeNodeContext( rParent, aElement, pNode ); break; case PPT_TOKEN( anim ): pCtx = new AnimContext ( rParent, aElement, xAttribs, pNode ); @@ -893,7 +889,7 @@ namespace oox { namespace ppt { pCtx = new CmdTimeNodeContext( rParent, aElement, xAttribs, pNode ); break; case PPT_TOKEN( set ): - pCtx = new SetTimeNodeContext( rParent, aElement, xAttribs, pNode ); + pCtx = new SetTimeNodeContext( rParent, aElement, pNode ); break; case PPT_TOKEN( audio ): case PPT_TOKEN( video ): @@ -906,7 +902,6 @@ namespace oox { namespace ppt { } TimeNodeContext::TimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, - const Reference< XFastAttributeList >& /*xAttribs*/, const TimeNodePtr & pNode ) throw() : FragmentHandler2( rParent ) , mnElement( aElement ) diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 0224d7f39d10..888669d74d95 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -515,8 +515,8 @@ IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, void*, p, void ) release(); } -ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& xContext ) : - VbaEventsHelperBase( rArgs, xContext ), +ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& /*xContext*/ ) : + VbaEventsHelperBase( rArgs ), mbOpened( false ) { mpDocShell = dynamic_cast< ScDocShell* >( mpShell ); // mpShell from base class diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index acb456e595aa..433dfbbf66ea 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -597,7 +597,7 @@ void collectUsageInformation(const util::URL& rURL, const uno::Sequence<beans::P theUsageInfo::get().increment(aCommand); } -void collectUIInformation(const util::URL& rURL, const uno::Sequence<beans::PropertyValue>& /*rArgs*/) +void collectUIInformation(const util::URL& rURL) { static const char* pFile = std::getenv("LO_COLLECT_UIINFO"); if (!pFile) @@ -613,7 +613,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ) { collectUsageInformation(aURL, aArgs); - collectUIInformation(aURL, aArgs); + collectUIInformation(aURL); SolarMutexGuard aGuard; if ( diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 2ea3dc84dc2d..8ffb28820072 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -66,7 +66,7 @@ Size SfxPreviewBase_Impl::GetOptimalSize() const return LogicToPixel(Size(127, 129), MapUnit::MapAppFont); } -void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/, GDIMetaFile* pFile) +void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, GDIMetaFile* pFile) { rRenderContext.SetLineColor(); Color aLightGrayCol(COL_LIGHTGRAY); @@ -111,9 +111,9 @@ void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, const tool } } -void SfxPreviewWin_Impl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) +void SfxPreviewWin_Impl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { - ImpPaint(rRenderContext, rRect, xMetaFile.get()); + ImpPaint(rRenderContext, xMetaFile.get()); } extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSfxPreviewWin(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index f40b4974d33b..890d9b2298df 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -45,7 +45,7 @@ public: : SfxPreviewBase_Impl(pParent, nStyle) {} - static void ImpPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, GDIMetaFile* pFile); + static void ImpPaint(vcl::RenderContext& rRenderContext, GDIMetaFile* pFile); }; #endif diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index f8b5875d407c..fe7d5a8d58e2 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -529,7 +529,6 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) return; // does the state change? - nWidth = QueryColumnResize( nItemId, nWidth ); if ( nWidth >= LONG_MAX || pCols[ nItemPos ]->Width() != nWidth ) { long nOldWidth = pCols[ nItemPos ]->Width(); @@ -544,7 +543,6 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) if ( pDataWin->bAutoSizeLastCol || nWidth > (sal_uLong)nMaxWidth ) { nWidth = nMaxWidth > 16 ? nMaxWidth : nOldWidth; - nWidth = QueryColumnResize( nItemId, nWidth ); } } diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index ee823e22ba60..c73f3695838f 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -197,12 +197,6 @@ void BrowseBox::RowHeightChanged() } -long BrowseBox::QueryColumnResize( sal_uInt16, long nWidth ) -{ - return nWidth; -} - - void BrowseBox::ColumnResized( sal_uInt16 ) { } @@ -1403,9 +1397,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt ) long nDeltaX = nDragX - nResizeX; sal_uInt16 nId = GetColumnId(nResizeCol); sal_uLong nOldWidth = GetColumnWidth(nId); - nDragX = QueryColumnResize( GetColumnId(nResizeCol), - nOldWidth + nDeltaX ) - + nResizeX - nOldWidth; + nDragX = nOldWidth + nDeltaX + nResizeX - nOldWidth; // draw new auxiliary line pDataWin->ShowTracking( tools::Rectangle( Point( nDragX, 0 ), diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index f3993cba8dbe..db854631655e 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -514,7 +514,7 @@ OString HTMLOutFuncs::ConvertStringToHTML( const OUString& rSrc, } SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, const sal_Char *pStr, - bool bOn, rtl_TextEncoding ) + bool bOn ) { if(bOn) rStream.WriteCharPtr("<"); @@ -559,8 +559,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream, return rStream; } -SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen, - rtl_TextEncoding ) +SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen ) { // in einen Stream aus sal_Char aNToABuf[] = "0000000000000000"; diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index cefeb456d3e3..18b4965e87f4 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -551,7 +551,7 @@ void CalcDistances( const tools::Polygon& rPoly, std::vector< double >& rDistanc } } -void InsertMissingOutlinePoints( const tools::Polygon& /*rOutlinePoly*/, const std::vector< double >& rDistances, +void InsertMissingOutlinePoints( const std::vector< double >& rDistances, const tools::Rectangle& rTextAreaBoundRect, tools::Polygon& rPoly ) { sal_uInt16 nSize = rPoly.GetSize(); @@ -749,8 +749,8 @@ void FitTextOutlinesToShapeOutlines( const tools::PolyPolygon& aOutlines2d, FWDa // create local polygon copy to work on tools::Polygon aLocalPoly(aCandidate); - InsertMissingOutlinePoints( rOutlinePoly, vDistances, rTextAreaBoundRect, aLocalPoly ); - InsertMissingOutlinePoints( rOutlinePoly2, vDistances2, rTextAreaBoundRect, aLocalPoly ); + InsertMissingOutlinePoints( vDistances, rTextAreaBoundRect, aLocalPoly ); + InsertMissingOutlinePoints( vDistances2, rTextAreaBoundRect, aLocalPoly ); sal_uInt16 _nPointCount = aLocalPoly.GetSize(); if (_nPointCount) diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 307c31b51863..a506345821c3 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -2572,19 +2572,6 @@ void SvxRuler::Click() } } -bool SvxRuler::CalcLimits ( long& nMax1, // minimum value to be set - long& nMax2, // minimum value to be set - bool ) -{ - /* - Default implementation of the virtual function; the application can be - overridden to implement customized limits. The values are based on the page. - */ - nMax1 = LONG_MIN; - nMax2 = LONG_MAX; - return false; -} - void SvxRuler::CalcMinMax() { /* @@ -2966,19 +2953,8 @@ void SvxRuler::CalcMinMax() // ObjectItem else { - if(mxObjectItem->HasLimits()) - { - if(CalcLimits(nMaxLeft, nMaxRight, (nIdx & 1) == 0)) - { - nMaxLeft = ConvertPosPixel(nMaxLeft); - nMaxRight = ConvertPosPixel(nMaxRight); - } - } - else - { - nMaxLeft = LONG_MIN; - nMaxRight = LONG_MAX; - } + nMaxLeft = LONG_MIN; + nMaxRight = LONG_MAX; } break; } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 4eded5beda73..e32cc0112dd8 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -406,7 +406,7 @@ namespace svx } - OUString lcl_getUnoSlotName( SfxApplication&, SfxSlotId _nSlotId ) + OUString lcl_getUnoSlotName( SfxSlotId _nSlotId ) { OUString sSlotUnoName; @@ -565,7 +565,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 OUString sUnoSlotName; if ( SfxGetpApp() ) - sUnoSlotName = lcl_getUnoSlotName( *SfxGetpApp(), nSlotId ); + sUnoSlotName = lcl_getUnoSlotName( nSlotId ); else sUnoSlotName = "<unknown>"; OString sUnoSlotNameAscii( "\"" ); @@ -711,7 +711,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 else { - OUString sUnoSlotName = lcl_getUnoSlotName( *SfxGetpApp(), nSlotForItemSet ); + OUString sUnoSlotName = lcl_getUnoSlotName( nSlotForItemSet ); if ( sUnoSlotName.isEmpty() ) sUnoSlotName = "unknown (no SfxSlot)"; SAL_WARN( "svx", "FmTextControShell::executeAttributeDialog: Could not handle the following item:" @@ -1259,7 +1259,7 @@ namespace svx { OSL_PRECOND( _rxProvider.is() && _pApplication, "FmTextControlShell::implGetFeatureDispatcher: invalid arg(s)!" ); URL aFeatureURL; - aFeatureURL.Complete = lcl_getUnoSlotName( *_pApplication, _nSlot ); + aFeatureURL.Complete = lcl_getUnoSlotName( _nSlot ); try { if ( !m_xURLTransformer.is() ) diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index bbb564ed2cb8..2a1881eb974d 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3099,7 +3099,7 @@ SdrDelayBroadcastObjectChange::~SdrDelayBroadcastObjectChange() } -SdrObject* SdrObjFactory::CreateObjectFromFactory( SdrInventor nInventor, sal_uInt16 nObjIdentifier, SdrPage* , SdrModel* ) +SdrObject* SdrObjFactory::CreateObjectFromFactory( SdrInventor nInventor, sal_uInt16 nObjIdentifier ) { SdrObjCreatorParams aParams { nInventor, nObjIdentifier }; for (const auto & i : ImpGetUserMakeObjHdl()) { @@ -3159,7 +3159,7 @@ SdrObject* SdrObjFactory::MakeNewObject(SdrInventor nInvent, sal_uInt16 nIdent, } if (!pObj) - pObj = CreateObjectFromFactory(nInvent, nIdent, pPage, pModel); + pObj = CreateObjectFromFactory(nInvent, nIdent); if (!pObj) { @@ -3246,7 +3246,7 @@ SdrObject* SdrObjFactory::MakeNewObject( } if (!pObj) - pObj = CreateObjectFromFactory(nInventor, nIdentifier, pPage, pModel); + pObj = CreateObjectFromFactory(nInventor, nIdentifier); if (!pObj) { diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 92aa0e7aba11..3245a65aacd1 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -111,7 +111,7 @@ void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const *pLighting2Defaults = aLighting2Defaults; }; -static void impl_execute( SdrView*, SfxRequest const & rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) +static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { static const char sExtrusion[] = "Extrusion"; static const char sRotateAngle[] = "RotateAngle"; @@ -546,7 +546,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindi pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ))); - impl_execute( pSdrView, rReq, aGeometryItem, pObj ); + impl_execute( rReq, aGeometryItem, pObj ); pObj->SetMergedItem( aGeometryItem ); pObj->BroadcastObjectChange(); if( bUndo ) diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 8fffcccf549e..f5557b5faaa6 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -246,7 +246,7 @@ bool checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatu } } -static void impl_execute( SdrView*, SfxRequest const & rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) +static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -534,7 +534,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindin pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ))); - impl_execute( pSdrView, rReq, aGeometryItem, pObj ); + impl_execute( rReq, aGeometryItem, pObj ); pObj->SetMergedItem( aGeometryItem ); pObj->BroadcastObjectChange(); if( bUndo ) diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 17d40cccc111..9f56324a21fd 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -136,7 +136,7 @@ SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const Argument pPool2 can be null. If returned string equals NameOrIndex->GetName(), the name was already unique. */ -OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults ) +OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults ) { bool bForceNew = false; @@ -1005,7 +1005,6 @@ XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const { const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, XATTR_LINEDASH, &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XLineDashItem::CompareValueFunc, RID_SVXSTR_DASH11, pModel->GetPropertyList( XPropertyListType::Dash ) ); @@ -2734,7 +2733,6 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con { const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, Which(), &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillGradientItem::CompareValueFunc, RID_SVXSTR_GRADIENT, pModel->GetPropertyList( XPropertyListType::Gradient ) ); @@ -2829,7 +2827,6 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, XATTR_FILLFLOATTRANSPARENCE, &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillFloatTransparenceItem::CompareValueFunc, RID_SVXSTR_TRASNGR0, XPropertyListRef() ); @@ -3140,7 +3137,6 @@ XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const { const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, XATTR_FILLHATCH, &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillHatchItem::CompareValueFunc, RID_SVXSTR_HATCH10, pModel->GetPropertyList( XPropertyListType::Hatch ) ); diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index e3e51300469c..2ffb49bfad19 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -482,7 +482,6 @@ XFillBitmapItem* XFillBitmapItem::checkForUniqueItem( SdrModel* pModel ) const aListType = XPropertyListType::Pattern; const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, XATTR_FILLBITMAP, &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillBitmapItem::CompareValueFunc, RID_SVXSTR_BMP21, pModel->GetPropertyList( aListType ) ); diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx index 28b6f4e08650..3520cb38ccc3 100644 --- a/sw/source/ui/vba/vbaeventshelper.cxx +++ b/sw/source/ui/vba/vbaeventshelper.cxx @@ -28,8 +28,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::script::vba::VBAEventId; -SwVbaEventsHelper::SwVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext ) : - VbaEventsHelperBase( aArgs, xContext ) +SwVbaEventsHelper::SwVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& /*xContext*/ ) : + VbaEventsHelperBase( aArgs ) { using namespace ::com::sun::star::script::ModuleType; registerEventHandler( DOCUMENT_NEW, DOCUMENT, "Document_New" ); diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 9e6290ddf474..e45f05f6f896 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -601,7 +601,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) xProps->getPropertyValue( "ClassId" ) >>= nClassId; uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess uno::Reference< drawing::XShape > xShape( xControlShape, uno::UNO_QUERY_THROW ); - ::std::unique_ptr< ConcreteXShapeGeometryAttributes > xGeoHelper( new ConcreteXShapeGeometryAttributes( xContext, xShape ) ); + ::std::unique_ptr< ConcreteXShapeGeometryAttributes > xGeoHelper( new ConcreteXShapeGeometryAttributes( xShape ) ); switch( nClassId ) { case form::FormComponentType::COMBOBOX: @@ -646,7 +646,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) uno::Reference< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xVBAControl; uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess - ::std::unique_ptr< UserFormGeometryHelper > xGeoHelper( new UserFormGeometryHelper( xContext, xControl, fOffsetX, fOffsetY ) ); + ::std::unique_ptr< UserFormGeometryHelper > xGeoHelper( new UserFormGeometryHelper( xControl, fOffsetX, fOffsetY ) ); if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) ) xVBAControl.set( new ScVbaCheckbox( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) ); diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 111ff8c7f614..56c8999f9992 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -49,7 +49,7 @@ ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Refer m_xDialog.set( m_xControl, uno::UNO_QUERY_THROW ); uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW ); m_xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW ); - setGeometryHelper( new UserFormGeometryHelper( xContext, xControl, 0.0, 0.0 ) ); + setGeometryHelper( new UserFormGeometryHelper( xControl, 0.0, 0.0 ) ); if ( aArgs.getLength() >= 4 ) aArgs[ 3 ] >>= m_sLibName; } diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index 800fa7231f8e..4fb57ff85f56 100644 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -VbaEventsHelperBase::VbaEventsHelperBase( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& /*xContext*/ ) : +VbaEventsHelperBase::VbaEventsHelperBase( const uno::Sequence< uno::Any >& rArgs ) : mpShell( nullptr ), mbDisposed( true ) { diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index d1b68f198503..dc442156a24a 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -657,7 +657,7 @@ double HmmToPoints( sal_Int32 nHmm ) return nHmm / factor; } -ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& /*xContext*/, const css::uno::Reference< css::drawing::XShape >& xShape ) +ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::drawing::XShape >& xShape ) { m_pShapeHelper.reset( new ShapeHelper( xShape ) ); } @@ -787,7 +787,6 @@ void setOrAppendPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, con // ====UserFormGeomentryHelper==== UserFormGeometryHelper::UserFormGeometryHelper( - const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl, double fOffsetX, double fOffsetY ) : mfOffsetX( fOffsetX ), diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx index ed7f626ab7fe..ee246fe03619 100644 --- a/vcl/unx/generic/print/glyphset.cxx +++ b/vcl/unx/generic/print/glyphset.cxx @@ -212,7 +212,7 @@ struct EncEntry static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile, const char* pGlyphSetName, int nGlyphCount, /*const*/ const sal_uInt16* pRequestedGlyphs, /*const*/ const unsigned char* pEncoding, - bool bAllowType42, bool /*bAllowCID*/ ) + bool bAllowType42 ) { // match the font-subset to the printer capabilities // TODO: allow CFF for capable printers @@ -265,7 +265,6 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42 // of the glyph in the output file unsigned char pEncoding[256]; sal_uInt16 pTTGlyphMapping[256]; - const bool bAllowCID = false; // TODO: nPSLanguageLevel>=3 // loop through all the font glyph subsets sal_Int32 nGlyphSetID; @@ -291,7 +290,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42 OString aGlyphSetName = GetGlyphSetName(nGlyphSetID); fprintf( pTmpFile, "%%%%BeginResource: font %s\n", aGlyphSetName.getStr() ); CreatePSUploadableFont( pTTFont, pTmpFile, aGlyphSetName.getStr(), (*aGlyphSet).size(), - pTTGlyphMapping, pEncoding, bAllowType42, bAllowCID ); + pTTGlyphMapping, pEncoding, bAllowType42 ); fprintf( pTmpFile, "%%%%EndResource\n" ); rSuppliedFonts.push_back( aGlyphSetName ); } diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 76f9be6b8391..d3c3d7fd6eb6 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3195,7 +3195,6 @@ void DomainMapper_Impl::handleAutoNum void DomainMapper_Impl::handleAuthor (OUString const& rFirstParam, - uno::Reference< uno::XInterface > & /*xFieldInterface*/, uno::Reference< beans::XPropertySet > const& xFieldProperties, FieldId eFieldId ) { @@ -3215,8 +3214,7 @@ void DomainMapper_Impl::handleAuthor void DomainMapper_Impl::handleDocProperty (const FieldContextPtr& pContext, OUString const& rFirstParam, - uno::Reference< uno::XInterface > & xFieldInterface, - uno::Reference< beans::XPropertySet > const&) + uno::Reference< uno::XInterface > & xFieldInterface) { //some docproperties should be imported as document statistic fields, some as DocInfo fields //others should be user fields @@ -3361,8 +3359,6 @@ static uno::Sequence< beans::PropertyValues > lcl_createTOXLevelHyperlinks( bool void DomainMapper_Impl::handleToc (const FieldContextPtr& pContext, - uno::Reference< uno::XInterface > & /*xFieldInterface*/, - uno::Reference< beans::XPropertySet > const& /*xFieldProperties*/, const OUString & sTOCServiceName) { OUString sValue; @@ -3627,8 +3623,6 @@ void DomainMapper_Impl::handleBibliography void DomainMapper_Impl::handleIndex (const FieldContextPtr& pContext, - uno::Reference< uno::XInterface > & /*xFieldInterface*/, - uno::Reference< beans::XPropertySet > const& /*xFieldProperties*/, const OUString & sTOCServiceName) { uno::Reference< beans::XPropertySet > xTOC; @@ -3802,7 +3796,7 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_USERNAME : case FIELD_USERINITIALS : handleAuthor(sFirstParam, - xFieldInterface, xFieldProperties, + xFieldProperties, aIt->second.eFieldId); break; case FIELD_DATE: @@ -3852,7 +3846,7 @@ void DomainMapper_Impl::CloseFieldCommand() break; case FIELD_DOCPROPERTY : handleDocProperty(pContext, sFirstParam, - xFieldInterface, xFieldProperties); + xFieldInterface); break; case FIELD_DOCVARIABLE : { @@ -4298,7 +4292,7 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_USERADDRESS : //todo: user address collects street, city ... break; case FIELD_INDEX: - handleIndex(pContext, xFieldInterface, xFieldProperties, + handleIndex(pContext, OUString::createFromAscii(aIt->second.cFieldServiceName)); break; case FIELD_BIBLIOGRAPHY: @@ -4306,7 +4300,7 @@ void DomainMapper_Impl::CloseFieldCommand() OUString::createFromAscii(aIt->second.cFieldServiceName)); break; case FIELD_TOC: - handleToc(pContext, xFieldInterface, xFieldProperties, + handleToc(pContext, OUString::createFromAscii(aIt->second.cFieldServiceName)); break; case FIELD_XE: diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index f4fb77625097..3d3296396b13 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -674,23 +674,17 @@ public: css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties); static void handleAuthor (OUString const& rFirstParam, - css::uno::Reference< css::uno::XInterface > & xFieldInterface, css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties, FieldId eFieldId); void handleDocProperty (const FieldContextPtr& pContext, OUString const& rFirstParam, - css::uno::Reference< css::uno::XInterface > & xFieldInterface, - css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties); + css::uno::Reference< css::uno::XInterface > & xFieldInterface); void handleToc (const FieldContextPtr& pContext, - css::uno::Reference< css::uno::XInterface > & xFieldInterface, - css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties, const OUString & sTOCServiceName); void handleIndex (const FieldContextPtr& pContext, - css::uno::Reference< css::uno::XInterface > & xFieldInterface, - css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties, const OUString & sTOCServiceName); void handleBibliography diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx index 33744b9765e7..c58c8e37411c 100644 --- a/writerfilter/source/dmapper/LoggedResources.cxx +++ b/writerfilter/source/dmapper/LoggedResources.cxx @@ -43,7 +43,7 @@ void LoggedResourcesHelper::startElement(const std::string & sElement) TagLogger::getInstance().startElement(msPrefix + "." + sElement); } -void LoggedResourcesHelper::endElement(const std::string & /*sElement*/) +void LoggedResourcesHelper::endElement() { TagLogger::getInstance().endElement(); } @@ -101,7 +101,7 @@ void LoggedStream::endSectionGroup() lcl_endSectionGroup(); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("section"); + LoggedResourcesHelper::endElement(); #endif } @@ -119,7 +119,7 @@ void LoggedStream::endParagraphGroup() lcl_endParagraphGroup(); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("paragraph"); + LoggedResourcesHelper::endElement(); #endif } @@ -138,7 +138,7 @@ void LoggedStream::endCharacterGroup() lcl_endCharacterGroup(); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("charactergroup"); + LoggedResourcesHelper::endElement(); #endif } @@ -156,7 +156,7 @@ void LoggedStream::endShape() lcl_endShape(); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("shape"); + LoggedResourcesHelper::endElement(); #endif } @@ -169,13 +169,13 @@ void LoggedStream::text(const sal_uInt8 * data, size_t len) mHelper.startElement("data"); LoggedResourcesHelper::chars(sText); - LoggedResourcesHelper::endElement("data"); + LoggedResourcesHelper::endElement(); #endif lcl_text(data, len); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("text"); + LoggedResourcesHelper::endElement(); #endif } @@ -192,13 +192,13 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t len) LoggedResourcesHelper::chars(sText); - LoggedResourcesHelper::endElement("data"); + LoggedResourcesHelper::endElement(); #endif lcl_utext(data, len); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("utext"); + LoggedResourcesHelper::endElement(); #endif } @@ -213,7 +213,7 @@ void LoggedStream::positionOffset(const OUString& rText, bool bVertical) lcl_positionOffset(rText, bVertical); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("positionOffset"); + LoggedResourcesHelper::endElement(); #endif } @@ -228,7 +228,7 @@ void LoggedStream::align(const OUString& rText, bool bVertical) lcl_align(rText, bVertical); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("align"); + LoggedResourcesHelper::endElement(); #endif } @@ -242,7 +242,7 @@ void LoggedStream::positivePercentage(const OUString& rText) lcl_positivePercentage(rText); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("positivePercentage"); + LoggedResourcesHelper::endElement(); #endif } @@ -255,7 +255,7 @@ void LoggedStream::props(writerfilter::Reference<Properties>::Pointer_t ref) lcl_props(ref); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("props"); + LoggedResourcesHelper::endElement(); #endif } @@ -269,7 +269,7 @@ void LoggedStream::table(Id name, writerfilter::Reference<Table>::Pointer_t ref) lcl_table(name, ref); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("table"); + LoggedResourcesHelper::endElement(); #endif } @@ -283,7 +283,7 @@ void LoggedStream::substream(Id name, writerfilter::Reference<Stream>::Pointer_t lcl_substream(name, ref); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("substream"); + LoggedResourcesHelper::endElement(); #endif } @@ -297,7 +297,7 @@ void LoggedStream::info(const std::string & _info) lcl_info(_info); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("info"); + LoggedResourcesHelper::endElement(); #endif } @@ -310,7 +310,7 @@ void LoggedStream::startGlossaryEntry() lcl_startGlossaryEntry(); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("startGlossaryEntry"); + LoggedResourcesHelper::endElement(); #endif } @@ -323,7 +323,7 @@ void LoggedStream::endGlossaryEntry() lcl_endGlossaryEntry(); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("endGlossaryEntry"); + LoggedResourcesHelper::endElement(); #endif } @@ -349,7 +349,7 @@ void LoggedProperties::attribute(Id name, Value & val) mHelper.startElement("attribute"); LoggedResourcesHelper::attribute("name", (*QNameToString::Instance())(name)); LoggedResourcesHelper::attribute("value", val.toString()); - LoggedResourcesHelper::endElement("attribute"); + LoggedResourcesHelper::endElement(); #endif lcl_attribute(name, val); @@ -366,7 +366,7 @@ void LoggedProperties::sprm(Sprm & rSprm) lcl_sprm(rSprm); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("sprm"); + LoggedResourcesHelper::endElement(); #endif } @@ -395,7 +395,7 @@ void LoggedTable::entry(int pos, writerfilter::Reference<Properties>::Pointer_t lcl_entry(pos, ref); #ifdef DEBUG_WRITERFILTER - LoggedResourcesHelper::endElement("entry"); + LoggedResourcesHelper::endElement(); #endif } diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx index c5d59a68a9ec..85569b58e7c4 100644 --- a/writerfilter/source/dmapper/LoggedResources.hxx +++ b/writerfilter/source/dmapper/LoggedResources.hxx @@ -35,7 +35,7 @@ public: ~LoggedResourcesHelper(); void startElement(const std::string & sElement); - static void endElement(const std::string & sElement); + static void endElement(); static void chars(const OUString & rChars); static void chars(const std::string & rChars); static void attribute(const std::string & rName, const std::string & rValue); |