loplugin:constantparam

Change-Id: Ie690088d7a7d568703afd22f544628fc8012a7e1

38 files changed, 83 insertions, 187 deletions

diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index a6d8dcffd589..4cb14c46dd0a 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -737,8 +737,7 @@ void DialogModel::setData(
                 xInterpreter->interpretDataSource(
                     xDataSource, rArguments,
                     comphelper::containerToSequence( aSeriesToReUse )),
-                aSeriesToReUse,
-                true /* bSetStyles */);
+                aSeriesToReUse);
 
             ThreeDHelper::setScheme( xDiagram, e3DScheme );
         }
@@ -784,8 +783,7 @@ sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleStr
 
 void DialogModel::applyInterpretedData(
     const InterpretedData & rNewData,
-    const ::std::vector< Reference< XDataSeries > > & rSeriesToReUse,
-    bool bSetStyles )
+    const ::std::vector< Reference< XDataSeries > > & rSeriesToReUse )
 {
     if( ! m_xChartDocument.is())
         return;
@@ -795,7 +793,7 @@ void DialogModel::applyInterpretedData(
     if( xDiagram.is())
     {
         // styles
-        if( bSetStyles && m_xTemplate.is() )
+        if( m_xTemplate.is() )
         {
             sal_Int32 nGroup = 0;
             sal_Int32 nSeriesCounter = 0;
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index 45980a14936f..a863b614779d 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -164,8 +164,7 @@ private:
 private:
     void applyInterpretedData(
         const css::chart2::InterpretedData & rNewData,
-        const ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > & rSeriesToReUse,
-        bool bSetStyles );
+        const ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > & rSeriesToReUse );
 
     sal_Int32 countSeries() const;
 
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 6915191b81aa..63e9a710f5c7 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -45,23 +45,14 @@ using namespace ::com::sun::star;
 #define STATE_OBJECTS      3
 #define STATE_LAST         STATE_OBJECTS
 
-namespace
-{
-    const sal_Int32 nPageCount = 4;
-}
-
 CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< frame::XModel >& xChartModel
-                               , const uno::Reference< uno::XComponentContext >& xContext
-                               , sal_Int32 nOnePageOnlyIndex )
+                               , const uno::Reference< uno::XComponentContext >& xContext )
                 : svt::RoadmapWizard( pParent,
-                    (nOnePageOnlyIndex >= 0 && nOnePageOnlyIndex < nPageCount)
-                        ?  WizardButtonFlags::HELP | WizardButtonFlags::CANCEL | WizardButtonFlags::FINISH
-                        :  WizardButtonFlags::HELP | WizardButtonFlags::CANCEL | WizardButtonFlags::PREVIOUS | WizardButtonFlags::NEXT | WizardButtonFlags::FINISH
+                        WizardButtonFlags::HELP | WizardButtonFlags::CANCEL | WizardButtonFlags::PREVIOUS | WizardButtonFlags::NEXT | WizardButtonFlags::FINISH
                   )
                 , m_xChartModel(xChartModel,uno::UNO_QUERY)
                 , m_xCC( xContext )
                 , m_bIsClosable(true)
-                , m_nOnePageOnlyIndex(nOnePageOnlyIndex)
                 , m_pTemplateProvider(nullptr)
                 , m_nFirstState(STATE_FIRST)
                 , m_nLastState(STATE_LAST)
@@ -71,13 +62,7 @@ CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< fram
     m_pDialogModel.reset( new DialogModel( m_xChartModel, m_xCC ));
     defaultButton( WizardButtonFlags::FINISH );
 
-    if( m_nOnePageOnlyIndex < 0 || m_nOnePageOnlyIndex >= nPageCount )
-    {
-        m_nOnePageOnlyIndex = -1;
-        this->setTitleBase(SCH_RESSTR(STR_DLG_CHART_WIZARD));
-    }
-    else
-        this->setTitleBase(OUString());
+    this->setTitleBase(SCH_RESSTR(STR_DLG_CHART_WIZARD));
 
     declarePath( PATH_FULL
         , STATE_CHARTTYPE
@@ -109,15 +94,12 @@ CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< fram
 VclPtr<TabPage> CreationWizard::createPage(WizardState nState)
 {
     VclPtr<svt::OWizardPage> pRet;
-    if(m_nOnePageOnlyIndex!=-1 && m_nOnePageOnlyIndex!=nState)
-        return pRet;
-    bool bDoLiveUpdate = m_nOnePageOnlyIndex == -1;
     switch( nState )
     {
     case STATE_CHARTTYPE:
         {
         m_aTimerTriggeredControllerLock.startTimer();
-        VclPtrInstance<ChartTypeTabPage> pChartTypeTabPage(this,m_xChartModel,bDoLiveUpdate);
+        VclPtrInstance<ChartTypeTabPage> pChartTypeTabPage(this,m_xChartModel,true/*bDoLiveUpdate*/);
         pRet  = pChartTypeTabPage;
         m_pTemplateProvider = pChartTypeTabPage;
         if (m_pDialogModel)
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index 18b2904b91e2..eb2ed7373590 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -42,10 +42,7 @@ class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable
 public:
     CreationWizard( vcl::Window* pParent,
         const css::uno::Reference< css::frame::XModel >& xChartModel
-        , const css::uno::Reference< css::uno::XComponentContext >& xContext
-        // if nOnePageOnlyIndex is an index of an exsisting  page starting with 0
-        // then only this page is displayed without next/previous and roadmap
-        , sal_Int32 nOnePageOnlyIndex=-1 );
+        , const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     CreationWizard() = delete;
 
@@ -68,7 +65,6 @@ private:
     css::uno::Reference< css::chart2::XChartDocument >   m_xChartModel;
     css::uno::Reference< css::uno::XComponentContext>    m_xCC;
     bool m_bIsClosable;
-    sal_Int32 m_nOnePageOnlyIndex;//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap
     ChartTypeTemplateProvider*   m_pTemplateProvider;
     std::unique_ptr<DialogModel> m_pDialogModel;
 
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 3bb12a864edc..6552d2abbc86 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -39,7 +39,7 @@ friend class LifeTimeGuard;
 protected:
     mutable ::osl::Mutex                    m_aAccessMutex;
 public:
-    LifeTimeManager( css::lang::XComponent* pComponent, bool bLongLastingCallsCancelable = false );
+    LifeTimeManager( css::lang::XComponent* pComponent );
     virtual ~LifeTimeManager();
 
     bool        impl_isDisposed( bool bAssert=true );
@@ -66,7 +66,6 @@ protected:
     bool volatile       m_bDisposed;
     bool volatile       m_bInDispose;
 
-    bool                m_bLongLastingCallsCancelable;
     ::osl::Condition        m_aNoLongLastingCallCountCondition;
     sal_Int32 volatile      m_nLongLastingCallCount;
 };
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index f71c4e4b2c26..da9a04c128d2 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -56,8 +56,7 @@ class BaseCoordinateSystem :
 public:
     BaseCoordinateSystem(
         const css::uno::Reference< css::uno::XComponentContext > & xContext,
-        sal_Int32 nDimensionCount = 2,
-        bool bSwapXAndYAxis = false );
+        sal_Int32 nDimensionCount = 2 );
     explicit BaseCoordinateSystem( const BaseCoordinateSystem & rSource );
     virtual ~BaseCoordinateSystem();
 
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 07c42d7cfa01..cbd9f7d44261 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -124,8 +124,7 @@ namespace chart
 
 BaseCoordinateSystem::BaseCoordinateSystem(
     const Reference< uno::XComponentContext > & xContext,
-    sal_Int32 nDimensionCount /* = 2 */,
-    bool bSwapXAndYAxis /* = sal_False */ ) :
+    sal_Int32 nDimensionCount /* = 2 */ ) :
         ::property::OPropertySet( m_aMutex ),
         m_xContext( xContext ),
         m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
@@ -159,7 +158,7 @@ BaseCoordinateSystem::BaseCoordinateSystem(
     for( sal_Int32 i = 0; i < m_nDimensionCount; ++i )
         m_aOrigin[ i ] = uno::makeAny( double( 0.0 ) );
 
-    setFastPropertyValue_NoBroadcast( PROP_COORDINATESYSTEM_SWAPXANDYAXIS, uno::makeAny( bSwapXAndYAxis ));
+    setFastPropertyValue_NoBroadcast( PROP_COORDINATESYSTEM_SWAPXANDYAXIS, uno::makeAny( false ));
 }
 
 // explicit
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 3e49456885ad..44dd8f4482a6 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -48,7 +48,7 @@ namespace chart
 CartesianCoordinateSystem::CartesianCoordinateSystem(
     const uno::Reference< uno::XComponentContext > & xContext,
     sal_Int32 nDimensionCount /* = 2 */ ) :
-        BaseCoordinateSystem( xContext, nDimensionCount, false/*bSwapXAndYAxis*/ )
+        BaseCoordinateSystem( xContext, nDimensionCount )
 {}
 
 CartesianCoordinateSystem::CartesianCoordinateSystem(
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index 525f3fec8d0a..c702dfab169d 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -48,7 +48,7 @@ namespace chart
 PolarCoordinateSystem::PolarCoordinateSystem(
     const uno::Reference< uno::XComponentContext > & xContext,
     sal_Int32 nDimensionCount /* = 2 */ ) :
-        BaseCoordinateSystem( xContext, nDimensionCount, false/*bSwapXAndYAxis*/ )
+        BaseCoordinateSystem( xContext, nDimensionCount )
 {}
 
 PolarCoordinateSystem::PolarCoordinateSystem(
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index f6c2975986a5..643adedf4e3c 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -128,12 +128,9 @@ namespace chart
 {
 
 PieChartType::PieChartType(
-    const uno::Reference< uno::XComponentContext > & xContext,
-    bool bUseRings  /* = sal_False */) :
+    const uno::Reference< uno::XComponentContext > & xContext) :
         ChartType( xContext )
 {
-    if( bUseRings )
-        setFastPropertyValue_NoBroadcast( PROP_PIECHARTTYPE_USE_RINGS, uno::makeAny( bUseRings ));
 }
 
 PieChartType::PieChartType( const PieChartType & rOther ) :
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index c0685469875a..7d200ece5226 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -28,8 +28,7 @@ class PieChartType : public ChartType
 {
 public:
     PieChartType(
-        css::uno::Reference< css::uno::XComponentContext > const & xContext,
-        bool bUseRings = false );
+        css::uno::Reference< css::uno::XComponentContext > const & xContext );
     virtual ~PieChartType();
 
     virtual OUString SAL_CALL
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index a802287b0550..219b71cbc2f8 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -29,10 +29,9 @@ using namespace ::com::sun::star;
 namespace apphelper
 {
 
-LifeTimeManager::LifeTimeManager( lang::XComponent* pComponent, bool bLongLastingCallsCancelable )
+LifeTimeManager::LifeTimeManager( lang::XComponent* pComponent )
     : m_aListenerContainer( m_aAccessMutex )
     , m_pComponent(pComponent)
-    , m_bLongLastingCallsCancelable(bLongLastingCallsCancelable)
 {
     impl_init();
 }
@@ -163,7 +162,7 @@ bool LifeTimeManager::dispose()
 
 CloseableLifeTimeManager::CloseableLifeTimeManager( css::util::XCloseable* pCloseable
         , css::lang::XComponent* pComponent )
-        : LifeTimeManager( pComponent, false/*bLongLastingCallsCancelable*/ )
+        : LifeTimeManager( pComponent )
         , m_pCloseable(pCloseable)
 {
     impl_init();
@@ -276,9 +275,6 @@ bool CloseableLifeTimeManager::g_close_isNeedToCancelLongLastingCalls( bool bDel
     if( !m_nLongLastingCallCount )
         return false;
 
-      if(m_bLongLastingCallsCancelable)
-        return true;
-
     impl_setOwnership( bDeliverOwnership, true );
 
     m_bInTryClose = false;
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 2f37b12b01ab..ec6e0e93750b 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -118,7 +118,7 @@ class SvxIconChoiceCtrlEntry
                             }
 
 public:
-                            SvxIconChoiceCtrlEntry( const OUString& rText, const Image& rImage, SvxIconViewFlags nFlags = SvxIconViewFlags::NONE );
+                            SvxIconChoiceCtrlEntry( const OUString& rText, const Image& rImage );
                             ~SvxIconChoiceCtrlEntry () {}
 
     Image                   GetImage () const { return aImage; }
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 75f27ba02f1b..77dbc23e9050 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -819,7 +819,7 @@ class SvInplaceEdit2
 public:
                 SvInplaceEdit2( vcl::Window* pParent, const Point& rPos, const Size& rSize,
                    const OUString& rData, const Link<SvInplaceEdit2&,void>& rNotifyEditEnd,
-                   const Selection&, bool bMultiLine = false );
+                   const Selection& );
                ~SvInplaceEdit2();
     bool        KeyInput( const KeyEvent& rKEvt );
     void        LoseFocus();
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index 2d0340b68f5c..ccdb218aaf8c 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -125,7 +125,7 @@ public:
 
     // insert point
     sal_uInt32 NbcInsPointOld(const Point& rPos, bool bNewObj);
-    sal_uInt32 NbcInsPoint(sal_uInt32 i, const Point& rPos, bool bNewObj, bool bHideHim);
+    sal_uInt32 NbcInsPoint(sal_uInt32 i, const Point& rPos, bool bNewObj);
 
     // rip at given point
     SdrObject* RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index);
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 7b48084e7be5..f5ee05110f18 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -1005,7 +1005,7 @@ private:
     TOOLS_DLLPRIVATE void setInvalid();
 
     bool setAbsURIRef(
-        OUString const & rTheAbsURIRef, bool bOctets,
+        OUString const & rTheAbsURIRef,
         EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bSmart,
         FSysStyle eStyle);
 
@@ -1186,7 +1186,7 @@ inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
                                     rtl_TextEncoding eCharset):
     m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http)
 {
-    setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, false,
+    setAbsURIRef(rTheAbsURIRef, eMechanism, eCharset, false,
                  FSysStyle(0));
 }
 
@@ -1194,7 +1194,7 @@ inline bool INetURLObject::SetURL(OUString const & rTheAbsURIRef,
                                   EncodeMechanism eMechanism,
                                   rtl_TextEncoding eCharset)
 {
-    return setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, false,
+    return setAbsURIRef(rTheAbsURIRef, eMechanism, eCharset, false,
                         FSysStyle(0));
 }
 
@@ -1205,7 +1205,7 @@ inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
                                     FSysStyle eStyle):
     m_eScheme(INetProtocol::NotValid), m_eSmartScheme(eTheSmartScheme)
 {
-    setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, true, eStyle);
+    setAbsURIRef(rTheAbsURIRef, eMechanism, eCharset, true, eStyle);
 }
 
 inline bool INetURLObject::SetSmartURL(OUString const & rTheAbsURIRef,
@@ -1213,7 +1213,7 @@ inline bool INetURLObject::SetSmartURL(OUString const & rTheAbsURIRef,
                                        rtl_TextEncoding eCharset,
                                        FSysStyle eStyle)
 {
-    return setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, true,
+    return setAbsURIRef(rTheAbsURIRef, eMechanism, eCharset, true,
                         eStyle);
 }
 
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index ba618d647d04..5e895d5ac9f9 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -449,7 +449,7 @@ public:
     void        ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr );
     void        ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr,
                                   ScEditDataArray* pDataArray = nullptr );
-    void        SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, bool bPutToPool = false );
+    void        SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr );
     void        SetPatternArea( SCROW nStartRow, SCROW nEndRow,
                                 const ScPatternAttr& rPatAttr );
     void        ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
@@ -468,7 +468,7 @@ public:
     const ScStyleSheet* GetAreaStyle( bool& rFound, SCROW nRow1, SCROW nRow2 ) const;
 
     void        FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
-    bool    IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const;
+    bool        IsStyleSheetUsed( const ScStyleSheet& rStyle ) const;
 
                 /// May return -1 if not found
     SCsROW SearchStyle(
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 4502a260a77a..bbb525bb93e7 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2228,7 +2228,7 @@ private:
     void    UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
                              const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
 
-    void    CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks, bool bAllTabs);
+    void    CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks);
 
     bool    HasPartOfMerged( const ScRange& rRange );
 
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 10a96ce341fb..749d914b9e45 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -323,7 +323,7 @@ public:
 
     void SetCompile( bool bVal );
     ScDocument* GetDocument() const { return pDocument;}
-    void            SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag=true );
+    void            SetMatColsRows( SCCOL nCols, SCROW nRows );
     void            GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const;
 
                     // cell belongs to ChangeTrack and not to the real document
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index a8b30635fb4d..fb8589655309 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -620,7 +620,7 @@ public:
     void        SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr )
                     {
                         if (ValidColRow(rPos.Col(),rPos.Row()))
-                            aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr, true/*bPutToPool*/ );
+                            aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr );
                     }
     void        SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr );
     void        ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index f7fa19f7d7e1..df0afc54b0f2 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -663,9 +663,9 @@ void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolR
     pAttrArray->FindStyleSheet( pStyleSheet, rUsedRows, bReset );
 }
 
-bool ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const
+bool ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle ) const
 {
-    return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles );
+    return pAttrArray->IsStyleSheetUsed( rStyle, true/*bGatherAllStyles*/ );
 }
 
 bool ScColumn::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags )
@@ -683,9 +683,9 @@ void ScColumn::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWh
     pAttrArray->ClearItems( nStartRow, nEndRow, pWhich );
 }
 
-void ScColumn::SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, bool bPutToPool )
+void ScColumn::SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr )
 {
-    pAttrArray->SetPattern( nRow, &rPatAttr, bPutToPool );
+    pAttrArray->SetPattern( nRow, &rPatAttr, true/*bPutToPool*/ );
 }
 
 void ScColumn::SetPatternArea( SCROW nStartRow, SCROW nEndRow,
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 6b81fe660008..e145e758dc76 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -996,8 +996,8 @@ void ScColumn::Swap( ScColumn& rOther, SCROW nRow1, SCROW nRow2, bool bPattern )
             const ScPatternAttr* pPat2 = rOther.GetPattern(nRow);
             if (pPat1 != pPat2)
             {
-                SetPattern(nRow, *pPat2, true);
-                rOther.SetPattern(nRow, *pPat1, true);
+                SetPattern(nRow, *pPat2);
+                rOther.SetPattern(nRow, *pPat1);
             }
         }
     }
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 605cf2e640f1..bf608c3efc27 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2132,7 +2132,7 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam,
     pClipDoc->ResetClip(this, pMarks);
 
     sc::CopyToClipContext aCxt(*pClipDoc, bKeepScenarioFlags, true/*bCloneNoteCaptions*/);
-    CopyRangeNamesToClip(pClipDoc, aClipRange, pMarks, false/*bAllTabs*/);
+    CopyRangeNamesToClip(pClipDoc, aClipRange, pMarks);
 
     for (SCTAB i = 0; i < nEndTab; ++i)
     {
@@ -2333,7 +2333,7 @@ void copyUsedNamesToClip(ScRangeName* pClipRangeName, ScRangeName* pRangeName,
 
 }
 
-void ScDocument::CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks, bool bAllTabs)
+void ScDocument::CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks)
 {
     if (!pRangeName || pRangeName->empty())
         return;
@@ -2342,7 +2342,7 @@ void ScDocument::CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClip
     SCTAB nMinSizeBothTabs = static_cast<SCTAB>(std::min(maTabs.size(), pClipDoc->maTabs.size()));
     for (SCTAB i = 0; i < nMinSizeBothTabs; ++i)
         if (maTabs[i] && pClipDoc->maTabs[i])
-            if ( bAllTabs || !pMarks || pMarks->GetTableSelect(i) )
+            if ( !pMarks || pMarks->GetTableSelect(i) )
                 maTabs[i]->FindRangeNamesInUse(
                     rClipRange.aStart.Col(), rClipRange.aStart.Row(),
                     rClipRange.aEnd.Col(), rClipRange.aEnd.Row(), aUsedNames);
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 725ad88e6618..51d653a45078 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2439,7 +2439,7 @@ void ScFormulaCell::SetCompile( bool bVal )
     bCompile = bVal;
 }
 
-void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag )
+void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows )
 {
     ScMatrixFormulaCellToken* pMat = aResult.GetMatrixFormulaCellTokenNonConst();
     if (pMat)
@@ -2449,7 +2449,7 @@ void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag )
         aResult.SetToken( new ScMatrixFormulaCellToken( nCols, nRows));
         // Setting the new token actually forces an empty result at this top
         // left cell, so have that recalculated.
-        SetDirty( bDirtyFlag );
+        SetDirty();
     }
 }
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 3d36d4d2c37e..f11c6f090912 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2563,7 +2563,7 @@ bool ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle ) const
 
     for ( SCCOL i=0; i<=MAXCOL; i++ )
     {
-        if ( aCol[i].IsStyleSheetUsed( rStyle, true/*bGatherAllStyles*/ ) )
+        if ( aCol[i].IsStyleSheetUsed( rStyle ) )
         {
             bIsUsed = true;
         }
@@ -2621,7 +2621,7 @@ bool ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
 void ScTable::SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr )
 {
     if (ValidColRow(nCol,nRow))
-        aCol[nCol].SetPattern( nRow, rAttr, true/*bPutToPool*/ );
+        aCol[nCol].SetPattern( nRow, rAttr );
 }
 
 void ScTable::ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr )
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index b2a19253529e..929c2402c3d4 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1609,7 +1609,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                 for (SCCOL nAtCol = static_cast<SCCOL>(nIMin); nAtCol <= sal::static_int_cast<SCCOL>(nIMax); nAtCol++)
                     if(!ColHidden(nAtCol))
                     {
-                        aCol[nAtCol].SetPattern(static_cast<SCROW>(nRow), *pSrcPattern, true);
+                        aCol[nAtCol].SetPattern(static_cast<SCROW>(nRow), *pSrcPattern);
                         for(std::vector<sal_uInt32>::const_iterator itr = rCondFormatIndex.begin(), itrEnd = rCondFormatIndex.end();
                                 itr != itrEnd; ++itr)
                         {
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d57d37116d94..6e51edbab5aa 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -60,18 +60,16 @@ struct Data_Impl
     CreateTabPage fnCreatePage;   // Pointer to Factory
     GetTabPageRanges fnGetRanges; // Pointer to Ranges-Function
     VclPtr<SfxTabPage> pTabPage;         // The TabPage itself
-    bool bOnDemand;              // Flag: ItemSet onDemand
     bool bRefresh;                // Flag: Page must be re-initialized
 
     // Constructor
     Data_Impl( sal_uInt16 Id, CreateTabPage fnPage,
-               GetTabPageRanges fnRanges, bool bDemand ) :
+               GetTabPageRanges fnRanges ) :
 
         nId         ( Id ),
         fnCreatePage( fnPage ),
         fnGetRanges ( fnRanges ),
         pTabPage    ( nullptr ),
-        bOnDemand   ( bDemand ),
         bRefresh    ( false )
     {
         if ( !fnCreatePage  )
@@ -366,8 +364,6 @@ void SfxTabDialog::dispose()
                 aPageOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aPageData ) ) );
             }
 
-            if ( pDataObject->bOnDemand )
-                delete &pDataObject->pTabPage->GetItemSet();
             pDataObject->pTabPage.disposeAndClear();
         }
         delete pDataObject;
@@ -593,7 +589,7 @@ sal_uInt16 SfxTabDialog::AddTabPage
 {
     sal_uInt16 nId = m_pTabCtrl->GetPageId(rName);
     m_pImpl->aData.push_back(
-        new Data_Impl( nId, pCreateFunc, pRangesFunc, false/*bItemsOnDemand*/ ) );
+        new Data_Impl( nId, pCreateFunc, pRangesFunc ) );
     return nId;
 }
 
@@ -613,7 +609,7 @@ sal_uInt16 SfxTabDialog::AddTabPage
     assert(pCreateFunc);
     GetTabPageRanges pRangesFunc = pFact->GetTabPageRangesFunc(nPageCreateId);
     sal_uInt16 nPageId = m_pTabCtrl->GetPageId(rName);
-    m_pImpl->aData.push_back(new Data_Impl(nPageId, pCreateFunc, pRangesFunc, false));
+    m_pImpl->aData.push_back(new Data_Impl(nPageId, pCreateFunc, pRangesFunc));
     return nPageId;
 }
 
@@ -637,8 +633,7 @@ void SfxTabDialog::AddTabPage
     DBG_ASSERT( TAB_PAGE_NOTFOUND == m_pTabCtrl->GetPagePos( nId ),
                 "Double Page-Ids in the Tabpage" );
     m_pTabCtrl->InsertPage( nId, rRiderText, nPos );
-    m_pImpl->aData.push_back(
-        new Data_Impl( nId, pCreateFunc, pRangesFunc, false/*bItemsOnDemand*/ ) );
+    m_pImpl->aData.push_back( new Data_Impl( nId, pCreateFunc, pRangesFunc ) );
 }
 
 void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
@@ -674,8 +669,6 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
                 aPageOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aPageData ) ) );
             }
 
-            if ( pDataObject->bOnDemand )
-                delete &pDataObject->pTabPage->GetItemSet();
             pDataObject->pTabPage.disposeAndClear();
         }
 
@@ -787,13 +780,7 @@ short SfxTabDialog::Ok()
 
         if ( pTabPage )
         {
-            if ( pDataObject->bOnDemand )
-            {
-                SfxItemSet& rSet = (SfxItemSet&)pTabPage->GetItemSet();
-                rSet.ClearItem();
-                bModified |= pTabPage->FillItemSet( &rSet );
-            }
-            else if ( m_pSet && !pTabPage->HasExchangeSupport() )
+            if ( m_pSet && !pTabPage->HasExchangeSupport() )
             {
                 SfxItemSet aTmp( *m_pSet->GetPool(), m_pSet->GetRanges() );
 
@@ -965,14 +952,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void)
     Data_Impl* pDataObject = Find( m_pImpl->aData, nId );
     DBG_ASSERT( pDataObject, "Id not known" );
 
-    if ( pDataObject->bOnDemand )
-    {
-        // CSet on AIS has problems here, thus separated
-        const SfxItemSet* pItemSet = &pDataObject->pTabPage->GetItemSet();
-        pDataObject->pTabPage->Reset( pItemSet );
-    }
-    else
-        pDataObject->pTabPage->Reset( m_pSet );
+    pDataObject->pTabPage->Reset( m_pSet );
 }
 
 
@@ -1101,7 +1081,7 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
                 pTmpSet = m_pSet;
         }
 
-        if ( pTmpSet && !pDataObject->bOnDemand )
+        if ( pTmpSet )
             pTabPage = (pDataObject->fnCreatePage)( pTabCtrl, pTmpSet );
         else
             pTabPage = (pDataObject->fnCreatePage)
@@ -1134,10 +1114,7 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
 
         PageCreated( nId, *pTabPage );
 
-        if ( pDataObject->bOnDemand )
-            pTabPage->Reset( &pTabPage->GetItemSet() );
-        else
-            pTabPage->Reset( m_pSet );
+        pTabPage->Reset( m_pSet );
 
         pTabCtrl->SetTabPage( nId, pTabPage );
     }
@@ -1176,10 +1153,6 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool )
 #ifdef DBG_UTIL
     Data_Impl* pDataObject = Find( m_pImpl->aData, pTabCtrl->GetCurPageId() );
     DBG_ASSERT( pDataObject, "no Data structure for current page" );
-    if ( pPage->HasExchangeSupport() && pDataObject->bOnDemand )
-    {
-        SAL_INFO( "sfx.config", "Data exchange in ItemsOnDemand is not desired!" );
-    }
 #endif
 
     int nRet = SfxTabPage::LEAVE_PAGE;
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index db98c3e6e1c9..3cc2bc54a6e7 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -174,9 +174,9 @@ struct OStorePageGuard
 
     /** Construction.
      */
-    explicit OStorePageGuard (sal_uInt32 nMagic = 0, sal_uInt32 nCRC32 = 0)
+    explicit OStorePageGuard (sal_uInt32 nMagic = 0)
         : m_nMagic (store::htonl(nMagic)),
-          m_nCRC32 (store::htonl(nCRC32))
+          m_nCRC32 (store::htonl(0))
     {}
 
     void swap (OStorePageGuard & rhs)
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index 94e61a11bd24..1146859aa1f4 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -53,11 +53,10 @@ struct OStoreBTreeEntry
     */
     explicit OStoreBTreeEntry (
         K const &  rKey    = K(),
-        L const &  rLink   = L(),
-        sal_uInt32 nAttrib = 0)
+        L const &  rLink   = L())
         : m_aKey    (rKey),
           m_aLink   (rLink),
-          m_nAttrib (store::htonl(nAttrib))
+          m_nAttrib (store::htonl(0))
     {}
 
     OStoreBTreeEntry (const OStoreBTreeEntry & rhs)
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 43041ecbf1ac..1e872e34cd7d 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -34,8 +34,7 @@ using namespace ::com::sun::star::accessibility;
 \*****************************************************************************/
 
 SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const OUString& rText,
-                                                const Image& rImage,
-                                                SvxIconViewFlags _nFlags )
+                                                const Image& rImage )
     : aImage(rImage)
     , aText(rText)
     , pUserData(nullptr)
@@ -45,7 +44,7 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const OUString& rText,
     , eTextMode(IcnShowTextShort)
     , nX(0)
     , nY(0)
-    , nFlags(_nFlags)
+    , nFlags(SvxIconViewFlags::NONE)
 {
 }
 
@@ -102,7 +101,7 @@ void SvtIconChoiceCtrl::dispose()
 
 SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, const Image& rImage  )
 {
-    SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, SvxIconViewFlags::NONE);
+    SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage);
 
     _pImp->InsertEntry( pEntry, CONTAINER_APPEND );
 
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 025fabf1dc3b..7a7e5a24d1df 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -67,17 +67,6 @@ public:
     virtual void LoseFocus() override;
 };
 
-class MyMultiEdit_Impl : public MultiLineEdit
-{
-    SvInplaceEdit2* pOwner;
-public:
-                 MyMultiEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* pOwner );
-    virtual     ~MyMultiEdit_Impl() { disposeOnce(); }
-    virtual void dispose() override { pOwner = nullptr; MultiLineEdit::dispose(); }
-    virtual void KeyInput( const KeyEvent& rKEvt ) override;
-    virtual void LoseFocus() override;
-};
-
 MyEdit_Impl::MyEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* _pOwner ) :
 
     Edit( pParent, WB_LEFT ),
@@ -99,34 +88,13 @@ void MyEdit_Impl::LoseFocus()
         pOwner->LoseFocus();
 }
 
-MyMultiEdit_Impl::MyMultiEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* _pOwner )
-    : MultiLineEdit( pParent,
-    WB_CENTER
-    ), pOwner(_pOwner)
-{
-}
-
-void MyMultiEdit_Impl::KeyInput( const KeyEvent& rKEvt )
-{
-    if( !pOwner->KeyInput( rKEvt ))
-        MultiLineEdit::KeyInput( rKEvt );
-}
-
-void MyMultiEdit_Impl::LoseFocus()
-{
-    if (pOwner)
-        pOwner->LoseFocus();
-}
-
-
 SvInplaceEdit2::SvInplaceEdit2
 (
     vcl::Window* pParent, const Point& rPos,
     const Size& rSize,
     const OUString& rData,
     const Link<SvInplaceEdit2&,void>& rNotifyEditEnd,
-    const Selection& rSelection,
-    bool bMulti
+    const Selection& rSelection
 ) :
 
     aCallBackHdl       ( rNotifyEditEnd ),
@@ -135,10 +103,7 @@ SvInplaceEdit2::SvInplaceEdit2
 
 {
 
-    if( bMulti )
-        pEdit = VclPtr<MyMultiEdit_Impl>::Create( pParent, this );
-    else
-        pEdit = VclPtr<MyEdit_Impl>::Create( pParent, this );
+    pEdit = VclPtr<MyEdit_Impl>::Create( pParent, this );
 
     vcl::Font aFont( pParent->GetFont() );
     aFont.SetTransparent( false );
@@ -974,7 +939,7 @@ void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect,
     pEdCtrl = new SvInplaceEdit2(
         this, rRect.TopLeft(), rRect.GetSize(), rStr,
         LINK( this, SvTreeListBox, TextEditEndedHdl_Impl ),
-        rSel, false/*bMulti*/ );
+        rSel );
 }
 
 IMPL_LINK_NOARG_TYPED(SvTreeListBox, TextEditEndedHdl_Impl, SvInplaceEdit2&, void)
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 950b0cc2426a..c9dbcfa436ae 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -657,7 +657,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point
 
         if(bIdxZwang)
         {
-            mnInsPointNum = pMarkedPath->NbcInsPoint(nIdx, aPt, bNewObj, true);
+            mnInsPointNum = pMarkedPath->NbcInsPoint(nIdx, aPt, bNewObj);
         }
         else
         {
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 789c51f44de7..93cc4db67d04 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2540,7 +2540,7 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj)
 
     if(bNewObj)
     {
-        nNewHdl = NbcInsPoint(0L, rPos, true, true/*bHideHim*/);
+        nNewHdl = NbcInsPoint(0L, rPos, true);
     }
     else
     {
@@ -2559,14 +2559,14 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj)
             nPolyIndex += GetPathPoly().getB2DPolygon(a).count();
         }
 
-        nNewHdl = NbcInsPoint(nPolyIndex, rPos, false, true/*bHideHim*/);
+        nNewHdl = NbcInsPoint(nPolyIndex, rPos, false);
     }
 
     ImpForceKind();
     return nNewHdl;
 }
 
-sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bool bNewObj, bool /*bHideHim*/)
+sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bool bNewObj)
 {
     sal_uInt32 nNewHdl;
 
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index eb0b025ec848..8f869d869329 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -674,12 +674,12 @@ OUString parseScheme(
 }
 
 bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef,
-                                 bool bOctets,
                                  EncodeMechanism eMechanism,
                                  rtl_TextEncoding eCharset,
                                  bool bSmart,
                                  FSysStyle eStyle)
 {
+    const bool bOctets = false;
     sal_Unicode const * pPos = rTheAbsURIRef.getStr();
     sal_Unicode const * pEnd = pPos + rTheAbsURIRef.getLength();
 
@@ -1541,7 +1541,7 @@ bool INetURLObject::convertRelToAbs(OUString const & rTheRelURIRef,
             if (bFSys)
             {
                 INetURLObject aNewURI;
-                aNewURI.setAbsURIRef(rTheRelURIRef, false/*bOctets*/, eMechanism,
+                aNewURI.setAbsURIRef(rTheRelURIRef, eMechanism,
                                      eCharset, true, eStyle);
                 if (!aNewURI.HasError())
                 {
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 3491964f8628..d530500a41c2 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -431,8 +431,7 @@ class INetMIMECharsetList_Impl
         bool m_bDisabled;
         Node * m_pNext;
 
-        inline Node(const Charset & rTheCharset, bool bTheDisabled,
-                    Node * pTheNext);
+        inline Node(const Charset & rTheCharset, Node * pTheNext);
     };
 
     Node * m_pFirst;
@@ -443,7 +442,7 @@ public:
     ~INetMIMECharsetList_Impl();
 
     void prepend(const Charset & rCharset)
-    { m_pFirst = new Node(rCharset, false, m_pFirst); }
+    { m_pFirst = new Node(rCharset, m_pFirst); }
 
     void includes(sal_uInt32 nChar);
 
@@ -455,10 +454,9 @@ public:
 };
 
 inline INetMIMECharsetList_Impl::Node::Node(const Charset & rTheCharset,
-                                            bool bTheDisabled,
                                             Node * pTheNext):
     m_aCharset(rTheCharset),
-    m_bDisabled(bTheDisabled),
+    m_bDisabled(false),
     m_pNext(pTheNext)
 {}
 
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 32917ca6bc5c..f3f7fa3a9c2e 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -84,7 +84,7 @@ class VCLSession:
 
     void SAL_CALL disposing() override;
 
-    void callSaveRequested( bool bShutdown, bool bCancelable );
+    void callSaveRequested( bool bShutdown );
     void callShutdownCancelled();
     void callInteractionGranted( bool bGranted );
     void callQuit();
@@ -105,7 +105,7 @@ VCLSession::VCLSession()
         m_xSession->SetCallback( SalSessionEventProc, this );
 }
 
-void VCLSession::callSaveRequested( bool bShutdown, bool bCancelable )
+void VCLSession::callSaveRequested( bool bShutdown )
 {
     std::list< Listener > aListeners;
     {
@@ -138,7 +138,7 @@ void VCLSession::callSaveRequested( bool bShutdown, bool bCancelable )
 
     SolarMutexReleaser aReleaser;
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
-        it->m_xListener->doSave( bShutdown, bCancelable );
+        it->m_xListener->doSave( bShutdown, false/*bCancelable*/ );
 }
 
 void VCLSession::callInteractionGranted( bool bInteractionGranted )
@@ -218,7 +218,7 @@ void VCLSession::SalSessionEventProc( void* pData, SalSessionEvent* pEvent )
         case SaveRequest:
         {
             SalSessionSaveRequestEvent* pSEv = static_cast<SalSessionSaveRequestEvent*>(pEvent);
-            pThis->callSaveRequested( pSEv->m_bShutdown, false );
+            pThis->callSaveRequested( pSEv->m_bShutdown );
         }
         break;
         case ShutdownCancel:
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index d3dd4a255a22..e41fffcd5547 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -44,9 +44,8 @@ SdXML3DObjectContext::SdXML3DObjectContext(
     sal_uInt16 nPrfx,
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-    uno::Reference< drawing::XShapes >& rShapes,
-    bool bTemporaryShape)
-:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+    uno::Reference< drawing::XShapes >& rShapes)
+:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
     mbSetTransform( false )
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -111,7 +110,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes)
-:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
+:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
     maMinEdge(-2500.0, -2500.0, -2500.0),
     maMaxEdge(2500.0, 2500.0, 2500.0),
     mbMinEdgeUsed(false),
@@ -211,7 +210,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes)
-:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
+:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
     maCenter(0.0, 0.0, 0.0),
     maSize(5000.0, 5000.0, 5000.0),
     mbCenterUsed(false),
@@ -308,7 +307,7 @@ SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext(
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes)
-:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
+:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for(sal_Int16 i=0; i < nAttrCount; i++)
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index ab9fef2ba05b..b66dbaece749 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -45,8 +45,7 @@ public:
         sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXML3DObjectContext();
 
     virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;