loplugin:constantparam

Change-Id: Iced8ff99d52d55e6b6c3126affafbea6786e94f0
Reviewed-on: https://gerrit.libreoffice.org/30858
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

49 files changed, 128 insertions, 205 deletions

diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 36cf31411a0b..0bd256484117 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -56,7 +56,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
     ,::comphelper::OPropertyContainer(OStatement_BASE::rBHelper)
     ,m_xDBMetaData(_pConnection->getMetaData())
     ,m_aParser( _pConnection->getDriver()->getComponentContext() )
-    ,m_aSQLIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr )
+    ,m_aSQLIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser )
     ,m_pConnection(_pConnection)
     ,m_pParseTree(nullptr)
     ,m_pSQLAnalyzer(nullptr)
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 8236c3b222df..2fa468e4c2b9 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -67,7 +67,7 @@ MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection )
     : MacabCommonStatement_BASE(m_aMutex),
     OPropertySetHelper(MacabCommonStatement_BASE::rBHelper),
     m_aParser(_pConnection->getDriver()->getComponentContext()),
-    m_aSQLIterator(_pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr ),
+    m_aSQLIterator(_pConnection, _pConnection->createCatalog()->getTables(), m_aParser ),
     m_pParseTree(nullptr),
     m_pConnection(_pConnection),
     rBHelper(MacabCommonStatement_BASE::rBHelper)
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 0096d36e094d..505afda939c2 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -65,7 +65,7 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
     ,m_pTable(nullptr)
     ,m_pConnection(_pConnection)
     ,m_aParser( comphelper::getComponentContext(_pConnection->getDriver()->getFactory()) )
-    ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr ) )
+    ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser ) )
 {
     m_xDBMetaData = _pConnection->getMetaData();
     m_pParseTree = nullptr;
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 1534d793c362..8e880557793c 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -135,12 +135,11 @@ namespace connectivity
 
 OSQLParseTreeIterator::OSQLParseTreeIterator(const Reference< XConnection >& _rxConnection,
                                              const Reference< XNameAccess >& _rxTables,
-                                             const OSQLParser& _rParser,
-                                             const OSQLParseNode* pRoot )
+                                             const OSQLParser& _rParser )
     :m_rParser( _rParser )
     ,m_pImpl( new OSQLParseTreeIteratorImpl( _rxConnection, _rxTables ) )
 {
-    setParseTree(pRoot);
+    setParseTree(nullptr);
 }
 
 
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 07bfe1e37d43..52311a0ead09 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -262,7 +262,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
     parseNodeToStr(
         rString, _rxConnection, nullptr, nullptr, OUString(),
         pContext ? pContext->getPreferredLocale() : OParseContext::getDefaultLocale(),
-        pContext, _bIntl, _bQuote, '.', false, false );
+        pContext, _bIntl, _bQuote, '.', false );
 }
 
 
@@ -276,7 +276,7 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
     OSL_ENSURE(xFormatter.is(), "OSQLParseNode::parseNodeToPredicateStr:: no formatter!");
 
     if (xFormatter.is())
-        parseNodeToStr(rString, _rxConnection, xFormatter, nullptr, OUString(), rIntl, pContext, true, true, _cDec, true, false);
+        parseNodeToStr(rString, _rxConnection, xFormatter, nullptr, OUString(), rIntl, pContext, true, true, _cDec, true);
 }
 
 
@@ -292,7 +292,7 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
     OSL_ENSURE(xFormatter.is(), "OSQLParseNode::parseNodeToPredicateStr:: no formatter!");
 
     if (xFormatter.is())
-        parseNodeToStr( rString, _rxConnection, xFormatter, _xField, _sPredicateTableAlias, rIntl, pContext, true, true, _cDec, true, false );
+        parseNodeToStr( rString, _rxConnection, xFormatter, _xField, _sPredicateTableAlias, rIntl, pContext, true, true, _cDec, true );
 }
 
 
@@ -306,8 +306,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
                       bool _bIntl,
                       bool _bQuote,
                       sal_Char _cDecSep,
-                      bool _bPredicate,
-                      bool _bSubstitute) const
+                      bool _bPredicate) const
 {
     OSL_ENSURE( _rxConnection.is(), "OSQLParseNode::parseNodeToStr: invalid connection!" );
 
@@ -319,7 +318,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
             OSQLParseNode::impl_parseNodeToString_throw( sBuffer,
                 SQLParseNodeParameter(
                      _rxConnection, xFormatter, _xField, _sPredicateTableAlias, rIntl, pContext,
-                    _bIntl, _bQuote, _cDecSep, _bPredicate, _bSubstitute
+                    _bIntl, _bQuote, _cDecSep, _bPredicate, false
                 ) );
         }
         catch( const SQLException& )
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index f32e709f9c44..4deceec8f5e0 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -91,7 +91,7 @@ OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext,
                              sal_Int32& o_nRowCount)
             :OKeySet(nullptr,nullptr,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount)
             ,m_aSqlParser( _rContext )
-            ,m_aSqlIterator( i_xConnection, Reference<XTablesSupplier>(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser, nullptr )
+            ,m_aSqlIterator( i_xConnection, Reference<XTablesSupplier>(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser )
             ,m_bResultSetChanged(false)
 {
 }
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 468b1c969cae..f10dd6a36dcb 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -222,8 +222,8 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc
     :OSubComponent(m_aMutex,_xConnection)
     ,OPropertyContainer(m_aBHelper)
     ,m_aSqlParser( _rContext, &m_aParseContext )
-    ,m_aSqlIterator( _xConnection, _rxTables, m_aSqlParser, nullptr )
-    ,m_aAdditiveIterator( _xConnection, _rxTables, m_aSqlParser, nullptr )
+    ,m_aSqlIterator( _xConnection, _rxTables, m_aSqlParser )
+    ,m_aAdditiveIterator( _xConnection, _rxTables, m_aSqlParser )
     ,m_aElementaryParts( (size_t)SQLPartCount )
     ,m_xConnection(_xConnection)
     ,m_xMetaData(_xConnection->getMetaData())
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 718611b984e1..b148f9c26544 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1085,7 +1085,7 @@ void OQueryController::setQueryComposer()
             OSL_ENSURE(m_xComposer.is(),"No querycomposer available!");
             Reference<XTablesSupplier> xTablesSup(getConnection(), UNO_QUERY);
             deleteIterator();
-            m_pSqlIterator = new ::connectivity::OSQLParseTreeIterator( getConnection(), xTablesSup->getTables(), m_aSqlParser, nullptr );
+            m_pSqlIterator = new ::connectivity::OSQLParseTreeIterator( getConnection(), xTablesSup->getTables(), m_aSqlParser );
         }
     }
 }
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 1d72ee553302..442d69d8b536 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -158,8 +158,7 @@ namespace connectivity
         OSQLParseTreeIterator(
             const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
             const css::uno::Reference< css::container::XNameAccess >& _rxTables,
-            const OSQLParser& _rParser,
-            const OSQLParseNode* pRoot = nullptr );
+            const OSQLParser& _rParser );
         ~OSQLParseTreeIterator();
 
         inline static void * SAL_CALL operator new( size_t nSize )
@@ -176,7 +175,6 @@ namespace connectivity
         // The parse tree to be analysed/traversed:
         // If NULL is passed, the current parse tree will be deleted and the error status cleared.
         void setParseTree(const OSQLParseNode * pNewParseTree);
-//      void setParser(const OSQLParser* _pParser) { m_pParser = _pParser; }
         const OSQLParseNode * getParseTree() const { return m_pParseTree; };
 
         // subtrees in case of a select statement
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index cb750e53d2a3..2622faa857c4 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -417,8 +417,7 @@ namespace connectivity
                             bool _bIntl,
                             bool _bQuote,
                             sal_Char _cDecSep,
-                            bool _bPredicate,
-                            bool _bSubstitute) const;
+                            bool _bPredicate) const;
 
     private:
         void impl_parseNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam, bool bSimple=true ) const;
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 51e05b8a0d2c..1b79d9049997 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -113,7 +113,7 @@ public:
                         SfxDispatcher();
                         SfxDispatcher( SfxViewFrame *pFrame );
 
-    SAL_DLLPRIVATE void Construct_Impl( SfxDispatcher* pParent );
+    SAL_DLLPRIVATE void Construct_Impl();
 
                         ~SfxDispatcher();
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 80936ae91a69..71cd48bd5466 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -418,7 +418,7 @@ void SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
     }
 }
 
-void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
+void SfxDispatcher::Construct_Impl()
 {
     xImp.reset(new SfxDispatcher_Impl);
     xImp->bFlushed = true;
@@ -438,7 +438,7 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
     xImp->pFilterSIDs = nullptr;
     xImp->nDisableFlags = 0;
 
-    xImp->pParent = pParent;
+    xImp->pParent = nullptr;
 
     xImp->bInvalidateOnUnlock = false;
 
@@ -455,7 +455,7 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
 
 SfxDispatcher::SfxDispatcher()
 {
-    Construct_Impl( nullptr );
+    Construct_Impl();
     xImp->pFrame = nullptr;
 }
 
@@ -464,7 +464,7 @@ SfxDispatcher::SfxDispatcher()
 */
 SfxDispatcher::SfxDispatcher(SfxViewFrame *pViewFrame)
 {
-    Construct_Impl( nullptr );
+    Construct_Impl();
     xImp->pFrame = pViewFrame;
 }
 
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index fefd677b1bb6..0ce16d4900e5 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -842,7 +842,7 @@ void Storage::SetClass( const SvGlobalName & rClass,
             SetError( aCompObj.GetError() );
         else
         {
-            StgOleStream aOle(*this, true);
+            StgOleStream aOle(*this);
             if( !aOle.Store() )
                 SetError( aOle.GetError() );
         }
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index a13a68ff6d2f..9adfcac5fbd4 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -163,8 +163,8 @@ bool StgCompObjStream::Store()
 
 /////////////////////////// class StgOleStream
 
-StgOleStream::StgOleStream( BaseStorage& rStg, bool bWr )
-    : StgInternalStream( rStg, OUString("\1Ole"), bWr )
+StgOleStream::StgOleStream( BaseStorage& rStg )
+    : StgInternalStream( rStg, OUString("\1Ole"), true )
 {
 }
 
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index 30d8ab3336cb..cfe09b18ba63 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -59,7 +59,7 @@ public:
 class StgOleStream : public StgInternalStream
 {
 public:
-    StgOleStream( BaseStorage&, bool );
+    explicit StgOleStream( BaseStorage& );
     bool Store();
 };
 
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index b0a4f87017b0..148e9cc9efa6 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -436,7 +436,7 @@ public:
                                                 // reference is destroyed
     bool                        m_bIsOLEStorage;// an OLEStorage on a UCBStorageStream makes this an Autocommit-stream
 
-                                UCBStorageStream_Impl( const OUString&, StreamMode, UCBStorageStream*, bool, const OString* pKey,
+                                UCBStorageStream_Impl( const OUString&, StreamMode, UCBStorageStream*, bool,
                                                        bool bRepair, Reference< XProgressHandler > const & xProgress );
 
     void                        Free();
@@ -634,7 +634,7 @@ bool UCBStorageElement_Impl::IsModified()
     return bModified;
 }
 
-UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode nMode, UCBStorageStream* pStream, bool bDirect, const OString* pKey, bool bRepair, Reference< XProgressHandler > const & xProgress  )
+UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode nMode, UCBStorageStream* pStream, bool bDirect, bool bRepair, Reference< XProgressHandler > const & xProgress  )
     : m_pAntiImpl( pStream )
     , m_aURL( rName )
     , m_pContent( nullptr )
@@ -665,21 +665,6 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode
         }
 
         m_pContent = new ::ucbhelper::Content( aTemp, xComEnv, comphelper::getProcessComponentContext() );
-
-        if ( pKey )
-        {
-            m_aKey = *pKey;
-
-            // stream is encrypted and should be decrypted (without setting the key we'll get the raw data)
-            sal_uInt8 aBuffer[RTL_DIGEST_LENGTH_SHA1];
-            rtlDigestError nErr = rtl_digest_SHA1( pKey->getStr(), pKey->getLength(), aBuffer, RTL_DIGEST_LENGTH_SHA1 );
-            if ( nErr == rtl_Digest_E_None )
-            {
-                sal_uInt8* pBuffer = aBuffer;
-                css::uno::Sequence < sal_Int8 > aSequ( reinterpret_cast<sal_Int8*>(pBuffer), RTL_DIGEST_LENGTH_SHA1 );
-                m_pContent->setPropertyValue("EncryptionKey", Any(aSequ) );
-            }
-        }
     }
     catch (const ContentCreationException&)
     {
@@ -1245,7 +1230,7 @@ UCBStorageStream::UCBStorageStream( const OUString& rName, StreamMode nMode, boo
 {
     // pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
     // to class UCBStorageStream !
-    pImp = new UCBStorageStream_Impl( rName, nMode, this, bDirect, nullptr, bRepair, xProgress );
+    pImp = new UCBStorageStream_Impl( rName, nMode, this, bDirect, bRepair, xProgress );
     pImp->AddFirstRef();             // use direct refcounting because in header file only a pointer should be used
     StorageBase::m_nMode = pImp->m_nMode;
 }
@@ -2687,7 +2672,7 @@ void UCBStorage_Impl::OpenStream( UCBStorageElement_Impl* pElement, StreamMode n
     OUString aName( m_aURL );
     aName += "/";
     aName += pElement->m_aOriginalName;
-    pElement->m_xStream = new UCBStorageStream_Impl( aName, nMode, nullptr, bDirect, nullptr, m_bRepairPackage, m_xProgressHandler );
+    pElement->m_xStream = new UCBStorageStream_Impl( aName, nMode, nullptr, bDirect, m_bRepairPackage, m_xProgressHandler );
 }
 
 BaseStorage* UCBStorage::OpenUCBStorage( const OUString& rEleName, StreamMode nMode, bool bDirect )
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 0a1087ee4884..51699a014c25 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -171,8 +171,7 @@ public:
 
     /** Insert OLE-objects.
     */
-    virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
-        const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
+    virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet) = 0;
 
     virtual SwFlyFrameFormat* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
                            const SfxItemSet* pGrfAttrSet) = 0;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 33e4473681ef..90ec57051f12 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1400,7 +1400,7 @@ public:
 
     // Call into intransparent Basic / JavaScript.
     sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
-                        bool bChkPtr = false, SbxArray* pArgs = nullptr );
+                        bool bChkPtr = false );
 
     /** Adjust left margin via object bar (similar to adjustment of numerations).
      One can either change the margin "by" adding or subtracting a given
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 7cd5c762a33a..bdf8038e670e 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2646,27 +2646,23 @@ SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg, co
 }
 
 SwFlyFrameFormat* DocumentContentOperationsManager::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
-                        const SfxItemSet* pFlyAttrSet,
-                        const SfxItemSet* pGrfAttrSet,
-                        SwFrameFormat* pFrameFormat )
+                        const SfxItemSet* pFlyAttrSet)
 {
-    if( !pFrameFormat )
+    sal_uInt16 nId = RES_POOLFRM_OLE;
+    if (xObj.is())
     {
-        sal_uInt16 nId = RES_POOLFRM_OLE;
-        if (xObj.is())
-        {
-            SvGlobalName aClassName( xObj->getClassID() );
-            if (SotExchange::IsMath(aClassName))
-                nId = RES_POOLFRM_FORMEL;
-        }
-
-        pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( nId );
+        SvGlobalName aClassName( xObj->getClassID() );
+        if (SotExchange::IsMath(aClassName))
+            nId = RES_POOLFRM_FORMEL;
     }
+
+    SwFrameFormat* pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( nId );
+
     return InsNoTextNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             xObj,
                             m_rDoc.GetDfltGrfFormatColl() ),
-                            pFlyAttrSet, pGrfAttrSet,
+                            pFlyAttrSet, nullptr,
                             pFrameFormat );
 }
 
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index b189e573224e..80c894bdc20f 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -131,7 +131,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pArgs )
 }
 
 sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
-                    bool bCheckPtr, SbxArray* pArgs )
+                    bool bCheckPtr )
 {
     if( !mpDocShell )        // we can't do that without a DocShell!
         return 0;
@@ -208,21 +208,11 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
             if( STARBASIC == rMacro.GetScriptType() )
             {
                 nRet += 0 == mpDocShell->CallBasic( rMacro.GetMacName(),
-                                    rMacro.GetLibName(), pArgs ) ? 1 : 0;
+                                    rMacro.GetLibName(), nullptr ) ? 1 : 0;
             }
             else if( EXTENDED_STYPE == rMacro.GetScriptType() )
             {
-                std::unique_ptr<Sequence<Any> > pUnoArgs;
-
-                if( pArgs )
-                {
-                    pUnoArgs.reset(lcl_docbasic_convertArgs( *pArgs ));
-                }
-
-                if (!pUnoArgs)
-                {
-                    pUnoArgs.reset(new Sequence <Any> (0));
-                }
+                std::unique_ptr<Sequence<Any> > pUnoArgs(new Sequence<Any>());
 
                 Any aRet;
                 Sequence< sal_Int16 > aOutArgsIndex;
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 4a829a33a94f..a1a8f0664ff4 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -55,8 +55,7 @@ public:
     // Inserts a Frame under every pUpper of the array
     void RestoreUpperFrames( SwNodes& rNds, sal_uLong nStt, sal_uLong nEnd );
 
-    SwFrame* GetFrame( const Point* pDocPos,
-                    const SwPosition *pPos ) const;
+    SwFrame* GetFrame( const Point* pDocPos ) const;
 };
 
 SwNode* GoNextWithFrame(const SwNodes& rNodes, SwNodeIndex *pIdx)
@@ -415,11 +414,10 @@ void SwNode2LayImpl::RestoreUpperFrames( SwNodes& rNds, sal_uLong nStt, sal_uLon
     }
 }
 
-SwFrame* SwNode2LayImpl::GetFrame( const Point* pDocPos,
-                                const SwPosition *pPos ) const
+SwFrame* SwNode2LayImpl::GetFrame( const Point* pDocPos ) const
 {
     // test if change of member pIter -> pMod broke anything
-    return pMod ? ::GetFrameOfModify( nullptr, *pMod, FRM_ALL, pDocPos, pPos ) : nullptr;
+    return pMod ? ::GetFrameOfModify( nullptr, *pMod, FRM_ALL, pDocPos, nullptr ) : nullptr;
 }
 
 SwNode2Layout::SwNode2Layout( const SwNode& rNd, sal_uLong nIdx )
@@ -455,7 +453,7 @@ SwNode2Layout::~SwNode2Layout()
 
 SwFrame* SwNode2Layout::GetFrame( const Point* pDocPos ) const
 {
-    return pImpl->GetFrame( pDocPos, nullptr );
+    return pImpl->GetFrame( pDocPos );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index fd11278b9d89..51fd93275954 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -856,7 +856,7 @@ SwFlyFrameFormat* SwFEShell::InsertObject( const svt::EmbeddedObjectRef&  xObj,
         for(SwPaM& rPaM : GetCursor()->GetRingContainer())
         {
             pFormat = GetDoc()->getIDocumentContentOperations().Insert(rPaM, xObj,
-                                    pFlyAttrSet, nullptr, nullptr );
+                                    pFlyAttrSet );
             OSL_ENSURE( pFormat, "Doc->getIDocumentContentOperations().Insert(notxt) failed." );
 
         }
diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx
index 80263f558bb9..1319bf4ac214 100644
--- a/sw/source/core/inc/DocumentContentOperationsManager.hxx
+++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx
@@ -73,8 +73,7 @@ public:
 
     SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) override;
 
-    SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
-        const SfxItemSet* pGrfAttrSet, SwFrameFormat*) override;
+    SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet) override;
 
     SwFlyFrameFormat* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
                            const SfxItemSet* pGrfAttrSet) override;
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index cbeaf53c6413..774c8d2a7225 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -122,7 +122,7 @@ protected:
     // checks if forward flow makes sense to prevent infinite moves
     inline bool IsFwdMoveAllowed();
     // #i44049# - method <CalcContent(..)> has to check this property.
-    friend void CalcContent( SwLayoutFrame *pLay, bool bNoColl, bool bNoCalcFollow );
+    friend void CalcContent( SwLayoutFrame *pLay, bool bNoColl );
     bool IsKeepFwdMoveAllowed( bool bIgnoreMyOwnKeepValue = false );    // like above, forward flow for Keep.
 
     /** method to determine overlapping of an object that requests floating
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index fb9dfec03965..e8f56ce064e6 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -132,7 +132,7 @@ class SW_DLLPUBLIC SwFrame: public SwClient, public SfxBroadcaster
 
     // voids lower during creation of a column
     friend SwFrame *SaveContent( SwLayoutFrame *, SwFrame* pStart );
-    friend void   RestoreContent( SwFrame *, SwLayoutFrame *, SwFrame *pSibling, bool bGrow );
+    friend void   RestoreContent( SwFrame *, SwLayoutFrame *, SwFrame *pSibling );
 
     // for validating a mistakenly invalidated one in SwContentFrame::MakeAll
     friend void ValidateSz( SwFrame *pFrame );
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 168ed121dfe9..c99bf110a1fb 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -101,7 +101,7 @@ void PaintCharacterBorder(
 SwFlyFrame *GetFlyFromMarked( const SdrMarkList *pLst, SwViewShell *pSh );
 
 SwFrame *SaveContent( SwLayoutFrame *pLay, SwFrame *pStart = nullptr );
-void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling, bool bGrow );
+void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling );
 
 // Get ContentNodes, create ContentFrames, and add them to LayFrame.
 void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc, sal_uLong nIndex,
@@ -162,9 +162,7 @@ SwFrame* GetFrameOfModify( const SwRootFrame* pLayout,
 bool IsExtraData( const SwDoc *pDoc );
 
 // #i11760# - method declaration <CalcContent(..)>
-void CalcContent( SwLayoutFrame *pLay,
-                bool bNoColl = false,
-                bool bNoCalcFollow = false );
+void CalcContent( SwLayoutFrame *pLay, bool bNoColl = false );
 
 // Notify classes memorize the current sizes in their constructor and do
 // the necessary notifications in their destructor if needed
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 125bb6ebf6c8..aa5ea1d50a8c 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -39,7 +39,7 @@ class SwLayoutFrame: public SwFrame
 
     // Releases the Lower while restructuring columns
     friend SwFrame* SaveContent( SwLayoutFrame *, SwFrame * );
-    friend void   RestoreContent( SwFrame *, SwLayoutFrame *, SwFrame *pSibling, bool bGrow );
+    friend void   RestoreContent( SwFrame *, SwLayoutFrame *, SwFrame *pSibling );
 
 protected:
 
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index df6686a5bbf4..2c0dc88d5386 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -66,7 +66,7 @@ protected:
     bool bInPutMuchBlocks : 1;          // Put serveral block entries
     bool bInfoChanged : 1;              // Whether any info of TextBlock changed
 
-    SwImpBlocks( const OUString&, bool = false );
+    explicit SwImpBlocks( const OUString& );
     virtual ~SwImpBlocks();
 
     enum class FileType {
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index cc25ced948d0..aa74c3239699 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -30,7 +30,7 @@ class SwAttrSetChg;
 /// SwTabFrame is one table in the document layout, containing rows (which contain cells).
 class SwTabFrame: public SwLayoutFrame, public SwFlowFrame
 {
-    friend void CalcContent( SwLayoutFrame *pLay, bool bNoColl, bool bNoCalcFollow );
+    friend void CalcContent( SwLayoutFrame *pLay, bool bNoColl );
 
     // does the special treatment for Get_[Next|Prev]Leaf()
     using SwFrame::GetLeaf;
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 3bb752413645..d229164bd5bb 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -233,7 +233,7 @@ void SwLayoutFrame::ChgColumns( const SwFormatCol &rOld, const SwFormatCol &rNew
             else
                 GetFormat()->SetFormatAttr( SwFormatFillOrder() );
             if ( pSave )
-                ::RestoreContent( pSave, this, nullptr, true );
+                ::RestoreContent( pSave, this, nullptr );
             return;
         }
         if ( nOldNum == 1 )
@@ -286,7 +286,7 @@ void SwLayoutFrame::ChgColumns( const SwFormatCol &rOld, const SwFormatCol &rNew
                 static_cast<SwLayoutFrame*>(Lower())->Lower() &&
                 static_cast<SwLayoutFrame*>(Lower())->Lower()->IsLayoutFrame(),
                 "no column body." );   // ColumnFrames contain BodyFrames
-        ::RestoreContent( pSave, static_cast<SwLayoutFrame*>(static_cast<SwLayoutFrame*>(Lower())->Lower()), nullptr, true );
+        ::RestoreContent( pSave, static_cast<SwLayoutFrame*>(static_cast<SwLayoutFrame*>(Lower())->Lower()), nullptr );
     }
 }
 
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 8eb91011c6de..523e1a1e7133 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -540,7 +540,7 @@ void SwFlyFrame::UnchainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow )
         {
             SwFrame *pTmp = ::SaveContent( pFoll );
             if ( pTmp )
-                ::RestoreContent( pTmp, pUpper, pMaster->FindLastLower(), true );
+                ::RestoreContent( pTmp, pUpper, pMaster->FindLastLower() );
             pFoll->SetCompletePaint();
             pFoll->InvalidateSize();
             pFoll = pFoll->GetNextLink();
@@ -1366,9 +1366,7 @@ void SwFlyFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA
 //                          problems in method <SwContentFrame::WouldFit_(..)>,
 //                          which assumes that the follows are formatted.
 //                          Thus, <bNoCalcFollow> no longer used by <FormatWidthCols(..)>.
-void CalcContent( SwLayoutFrame *pLay,
-                bool bNoColl,
-                bool bNoCalcFollow )
+void CalcContent( SwLayoutFrame *pLay, bool bNoColl )
 {
     vcl::RenderContext* pRenderContext = pLay->getRootFrame()->GetCurrShell()->GetOut();
     SwSectionFrame* pSect;
@@ -1450,10 +1448,6 @@ void CalcContent( SwLayoutFrame *pLay,
                 }
             }
 
-            // OD 14.03.2003 #i11760# - forbid format of follow, if requested.
-            if ( bNoCalcFollow && pFrame->IsTextFrame() )
-                static_cast<SwTextFrame*>(pFrame)->ForbidFollowFormat();
-
             {
                 SwFrameDeleteGuard aDeleteGuard(pSect);
                 pFrame->Calc(pRenderContext);
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 6aa488a4c764..6c470530adf8 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2522,7 +2522,7 @@ static void lcl_AddObjsToPage( SwFrame* _pFrame, SwPageFrame* _pPage )
     }
 }
 
-void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling, bool bGrow )
+void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling )
 {
     OSL_ENSURE( pSav && pParent, "no Save or Parent provided for RestoreContent." );
     SwRectFnSet aRectFnSet(pParent);
@@ -2607,8 +2607,7 @@ void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling, b
         pNxt->mpPrev = pLast;
     }
 
-    if ( bGrow )
-        pParent->Grow( nGrowVal );
+    pParent->Grow( nGrowVal );
 }
 
 SwPageFrame * InsertNewPage( SwPageDesc &rDesc, SwFrame *pUpper,
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 4c7988931a93..7fbb23ff8e77 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -338,7 +338,7 @@ void SwSectionFrame::Paste( SwFrame* pParent, SwFrame* pSibling )
                         pTmp = pTmp->GetNext();
                     SwFrame* pSave = ::SaveContent( pCol );
                     if (pSave)
-                        ::RestoreContent( pSave, pSibling->GetUpper(), pTmp, true );
+                        ::RestoreContent( pSave, pSibling->GetUpper(), pTmp );
                 }
             }
         }
@@ -449,7 +449,7 @@ void SwSectionFrame::MergeNext( SwSectionFrame* pNxt )
                             pLast = pLast->GetNext();
                 }
             }
-            ::RestoreContent( pTmp, pLay, pLast, true );
+            ::RestoreContent( pTmp, pLay, pLast );
         }
         SetFollow( pNxt->GetFollow() );
         pNxt->SetFollow( nullptr );
@@ -493,7 +493,7 @@ bool SwSectionFrame::SplitSect( SwFrame* pFrame, bool bApres )
             // Search for last layout frame, e.g. for columned sections.
             while( pLay->Lower() && pLay->Lower()->IsLayoutFrame() )
                 pLay = static_cast<SwLayoutFrame*>(pLay->Lower());
-            ::RestoreContent( pSav, pLay, nullptr, true );
+            ::RestoreContent( pSav, pLay, nullptr );
         }
         InvalidateSize_();
         if( HasFollow() )
@@ -681,7 +681,7 @@ void SwSectionFrame::MoveContentAndDelete( SwSectionFrame* pDel, bool bSave )
     if( pSave )
     {
         lcl_InvalidateInfFlags( pSave, bSize );
-        ::RestoreContent( pSave, pUp, pPrv, true );
+        ::RestoreContent( pSave, pUp, pPrv );
         pUp->FindPageFrame()->InvalidateContent();
         if( !bOldFootnote )
             static_cast<SwFootnoteFrame*>(pUp)->ColUnlock();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 93d01cf671fc..e22b064990d1 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -462,7 +462,7 @@ static void lcl_MoveRowContent( SwRowFrame& rSourceLine, SwRowFrame& rDestLine )
 
                 // Find last content
                 SwFrame* pFrame = pDestCell->GetLastLower();
-                ::RestoreContent( pTmp, pDestCell, pFrame, true );
+                ::RestoreContent( pTmp, pDestCell, pFrame );
             }
         }
         pCurrDestCell = static_cast<SwCellFrame*>(pCurrDestCell->GetNext());
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 6941ae5fa91a..9176f503cbbc 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -86,7 +86,7 @@ SwImpBlocks::FileType SwImpBlocks::GetFileType( const OUString& rFile )
     return FileType::None;
 }
 
-SwImpBlocks::SwImpBlocks( const OUString& rFile, bool )
+SwImpBlocks::SwImpBlocks( const OUString& rFile )
     : aFile( rFile ),
     aDateModified( Date::EMPTY ),
     aTimeModified( tools::Time::EMPTY ),
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ad0e3f9edb19..0f467d28e713 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -246,8 +246,8 @@ SwTextSizeInfo::SwTextSizeInfo( const SwTextSizeInfo &rNew )
 #endif
 }
 
-void SwTextSizeInfo::CtorInitTextSizeInfo( OutputDevice* pRenderContext, SwTextFrame *pFrame, SwFont *pNewFnt,
-                   const sal_Int32 nNewIdx, const sal_Int32 nNewLen )
+void SwTextSizeInfo::CtorInitTextSizeInfo( OutputDevice* pRenderContext, SwTextFrame *pFrame,
+                   const sal_Int32 nNewIdx )
 {
     m_pKanaComp = nullptr;
     m_nKanaIdx = 0;
@@ -308,12 +308,12 @@ void SwTextSizeInfo::CtorInitTextSizeInfo( OutputDevice* pRenderContext, SwTextF
     SetSnapToGrid( pNd->GetSwAttrSet().GetParaGrid().GetValue() &&
                    m_pFrame->IsInDocBody() );
 
-    m_pFnt = pNewFnt;
+    m_pFnt = nullptr;
     m_pUnderFnt = nullptr;
     m_pText = &pNd->GetText();
 
     m_nIdx = nNewIdx;
-    m_nLen = nNewLen;
+    m_nLen = COMPLETE_STRING;
     m_bNotEOL = false;
     m_bStopUnderflow = m_bFootnoteInside = m_bOtherThanFootnoteInside = false;
     m_bMulti = m_bFirstMulti = m_bRuby = m_bHanging = m_bScriptSpace =
@@ -361,7 +361,7 @@ SwTextSizeInfo::SwTextSizeInfo( const SwTextSizeInfo &rNew, const OUString* pTex
 SwTextSizeInfo::SwTextSizeInfo( SwTextFrame *pTextFrame, const sal_Int32 nIndex )
     : m_bOnWin(false)
 {
-    CtorInitTextSizeInfo( pTextFrame->getRootFrame()->GetCurrShell()->GetOut(), pTextFrame, nullptr, nIndex );
+    CtorInitTextSizeInfo( pTextFrame->getRootFrame()->GetCurrShell()->GetOut(), pTextFrame, nIndex );
 }
 
 void SwTextSizeInfo::SelectFont()
@@ -481,7 +481,7 @@ bool SwTextSizeInfo::HasHint_( const SwTextNode* pTextNode, sal_Int32 nPos )
 
 void SwTextPaintInfo::CtorInitTextPaintInfo( OutputDevice* pRenderContext, SwTextFrame *pFrame, const SwRect &rPaint )
 {
-    CtorInitTextSizeInfo( pRenderContext, pFrame );
+    CtorInitTextSizeInfo( pRenderContext, pFrame, 0 );
     aTextFly.CtorInitTextFly( pFrame );
     aPaintRect = rPaint;
     nSpaceIdx = 0;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 51747ac2bb5f..0be4a14e488f 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -187,9 +187,8 @@ protected:
     sal_uInt8 m_nDirection : 2; // writing direction: 0/90/180/270 degree
 
 protected:
-    void CtorInitTextSizeInfo( OutputDevice* pRenderContext, SwTextFrame *pFrame, SwFont *pFnt = nullptr,
-                   const sal_Int32 nIdx = 0,
-                   const sal_Int32 nLen = COMPLETE_STRING );
+    void CtorInitTextSizeInfo( OutputDevice* pRenderContext, SwTextFrame *pFrame,
+                   const sal_Int32 nIdx );
     SwTextSizeInfo();
 public:
     SwTextSizeInfo( const SwTextSizeInfo &rInf );
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index ec7ca8d0fafe..159dee7e8128 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -441,7 +441,7 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext)
                 rDoc.getIDocumentContentOperations().Insert( rContext.GetRepeatPaM(),
                     svt::EmbeddedObjectRef( aNew,
                         static_cast<SwOLENode*>(pCNd)->GetAspect() ),
-                    nullptr, nullptr, nullptr );
+                    nullptr );
             }
 
             break;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index d56428d96c49..43ff3cec26bd 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2979,7 +2979,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                     // TODO/LATER: Is it the only possible aspect here?
                     sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
                     ::svt::EmbeddedObjectRef xObjRef( xIPObj, nAspect );
-                    pFormat2 = pDoc->getIDocumentContentOperations().Insert(aPam, xObjRef, &aFrameSet, nullptr, nullptr );
+                    pFormat2 = pDoc->getIDocumentContentOperations().Insert(aPam, xObjRef, &aFrameSet );
                     assert(pFormat2 && "Doc->Insert(notxt) failed.");
 
                     pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, nullptr);
@@ -3021,7 +3021,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                 rPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName );
 
                 SwFlyFrameFormat* pFrameFormat = nullptr;
-                pFrameFormat = pDoc->getIDocumentContentOperations().Insert( aPam, xObj, &aFrameSet, nullptr, nullptr );
+                pFrameFormat = pDoc->getIDocumentContentOperations().Insert( aPam, xObj, &aFrameSet );
                 pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, nullptr);
                 pFrameFormat->Add(this);
                 if(!m_sName.isEmpty())
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index c624ff522507..468ba55f2a97 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -459,7 +459,7 @@ void SwHTMLParser::InsertEmbed()
 
     // und in das Dok einfuegen
     SwFrameFormat* pFlyFormat =
-        m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrameSet, nullptr, nullptr );
+        m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrameSet );
 
     // Namen am FrameFormat setzen
     if( !aName.isEmpty() )
@@ -632,9 +632,7 @@ void SwHTMLParser::EndObject()
         SwFrameFormat* pFlyFormat =
             m_pDoc->getIDocumentContentOperations().Insert( *m_pPam,
                     ::svt::EmbeddedObjectRef( m_pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
-                    &m_pAppletImpl->GetItemSet(),
-                    nullptr,
-                    nullptr );
+                    &m_pAppletImpl->GetItemSet() );
 
         // den alternativen Namen setzen
         SwNoTextNode *pNoTextNd =
@@ -766,9 +764,7 @@ void SwHTMLParser::EndApplet()
     SwFrameFormat* pFlyFormat =
         m_pDoc->getIDocumentContentOperations().Insert( *m_pPam,
                     ::svt::EmbeddedObjectRef( m_pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
-                    &m_pAppletImpl->GetItemSet(),
-                    nullptr,
-                    nullptr );
+                    &m_pAppletImpl->GetItemSet());
 
     // den alternativen Namen setzen
     SwNoTextNode *pNoTextNd =
@@ -937,7 +933,7 @@ void SwHTMLParser::InsertFloatingFrame()
 
     // und in das Dok einfuegen
     SwFrameFormat* pFlyFormat =
-        m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrameSet, nullptr, nullptr );
+        m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrameSet );
 
     // den alternativen Namen setzen
     SwNoTextNode *pNoTextNd =
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index c6dfe603a070..1c8b6df15ad0 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -640,7 +640,7 @@ public:
     void OutputItem( const SfxPoolItem& rHt );
 
     /// Use OutputItem() on an item set - for styles.
-    void OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool bTestForDefault );
+    void OutputStyleItemSet( const SfxItemSet& rSet, bool bTestForDefault );
 
     /// Output frames.
     void OutputFlyFrame( const ww8::Frame& rFormat );
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 850b0d7f9f05..e6a73593e953 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -545,7 +545,7 @@ void RtfExport::WritePageDescTable()
         OutULong(n).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCUSE);
         OutULong((sal_uLong)rPageDesc.ReadUseOn());
 
-        OutPageDescription(rPageDesc, false, false);
+        OutPageDescription(rPageDesc, false);
 
         // search for the next page description
         std::size_t i = nSize;
@@ -719,7 +719,7 @@ void RtfExport::ExportDocument_Impl()
         // All sections are unlocked by default
         Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED);
         OutLong(1);
-        OutPageDescription(rPageDesc, false, true);     // Changed bCheckForFirstPage to true so headers
+        OutPageDescription(rPageDesc, true);     // Changed bCheckForFirstPage to true so headers
         // following title page are correctly added - i13107
         if (pSttPgDsc)
         {
@@ -1223,7 +1223,7 @@ const OUString* RtfExport::GetRedline(sal_uInt16 nId)
     return nullptr;
 }
 
-void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bWriteReset, bool bCheckForFirstPage)
+void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bCheckForFirstPage)
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
     const SwPageDesc* pSave = m_pAktPageDesc;
@@ -1233,14 +1233,6 @@ void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bWriteReset, b
             m_pAktPageDesc->GetFollow() != m_pAktPageDesc)
         m_pAktPageDesc = m_pAktPageDesc->GetFollow();
 
-    if (bWriteReset)
-    {
-        if (m_pCurPam->GetPoint()->nNode == m_pOrigPam->Start()->nNode)
-            Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTD).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SBKNONE);
-        else
-            Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECT).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTD);
-    }
-
     if (m_pAktPageDesc->GetLandscape())
         Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LNDSCPSXN);
 
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index d8341ce189d5..81d18c119377 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -182,7 +182,7 @@ public:
     SvStream& OutLong(long nVal);
     void OutUnicode(const sal_Char* pToken, const OUString& rContent, bool bUpr = false);
     void OutDateTime(const sal_Char* pStr, const css::util::DateTime& rDT);
-    void OutPageDescription(const SwPageDesc& rPgDsc, bool bWriteReset, bool bCheckForFirstPage);
+    void OutPageDescription(const SwPageDesc& rPgDsc, bool bCheckForFirstPage);
 
     sal_uInt16 GetColor(const Color& rColor) const;
     void InsColor(const Color& rCol);
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 10286ede4104..3c0a4a32df3f 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1589,7 +1589,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
 
             // Switch off test on default item values, if page description
             // set (value of <bOutPgDscSet>) isn't written.
-            AttrOutput().OutputStyleItemSet( aSet, true, bOutPgDscSet );
+            AttrOutput().OutputStyleItemSet( aSet, bOutPgDscSet );
             bOutputStyleItemSet = true;
 
             //Cannot export as normal page framedir, as continuous sections
@@ -1679,7 +1679,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
 
         m_pISet = &pPdFormat->GetAttrSet();
         if (!bOutputStyleItemSet)
-            AttrOutput().OutputStyleItemSet( pPdFormat->GetAttrSet(), true, false );
+            AttrOutput().OutputStyleItemSet( pPdFormat->GetAttrSet(), false );
         AttrOutput().SectionPageBorders( pPdFormat, pPdFirstPgFormat );
         m_pISet = pOldI;
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4ff302d54d6d..0a9f88b3ed1f 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5043,7 +5043,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
     }
 }
 
-void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool bTestForDefault )
+void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bTestForDefault )
 {
     // based on OutputItemSet() from wrt_fn.cxx
 
@@ -5051,9 +5051,6 @@ void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep
     const SfxItemSet* pSet = &rSet;
     if ( !pSet->Count() )
     {
-        if ( !bDeep )
-            return;
-
         while ( nullptr != ( pSet = pSet->GetParent() ) && !pSet->Count() )
             ;
 
@@ -5062,7 +5059,7 @@ void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep
     }
 
     const SfxPoolItem* pItem;
-    if ( !bDeep || !pSet->GetParent() )
+    if ( !pSet->GetParent() )
     {
         OSL_ENSURE( rSet.Count(), "Wurde doch schon behandelt oder?" );
         SfxItemIter aIter( *pSet );
@@ -5077,7 +5074,7 @@ void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep
         sal_uInt16 nWhich = aIter.FirstWhich();
         while ( nWhich )
         {
-            if ( SfxItemState::SET == pSet->GetItemState( nWhich, bDeep, &pItem ) &&
+            if ( SfxItemState::SET == pSet->GetItemState( nWhich, true/*bDeep*/, &pItem ) &&
                  ( !bTestForDefault ||
                    *pItem != rPool.GetDefaultItem( nWhich ) ||
                    ( pSet->GetParent() && *pItem != pSet->GetParent()->Get( nWhich ) ) ) )
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index b75d96ed5617..15c0abb63c94 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -74,8 +74,8 @@ OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key )
     return OUString();
 }
 
-SwCTBWrapper::SwCTBWrapper( bool bReadId ) : Tcg255SubStruct( bReadId )
-,reserved2(0)
+SwCTBWrapper::SwCTBWrapper() :
+reserved2(0)
 ,reserved3(0)
 ,reserved4(0)
 ,reserved5(0)
@@ -833,33 +833,33 @@ bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream &rS )
      {
          case 0x1:
          {
-             pSubStruct = new PlfMcd( false ); // don't read the id
+             pSubStruct = new PlfMcd;
              break;
          }
          case 0x2:
          {
-             pSubStruct = new PlfAcd( false );
+             pSubStruct = new PlfAcd;
              break;
          }
          case 0x3:
          case 0x4:
          {
-             pSubStruct = new PlfKme( false );
+             pSubStruct = new PlfKme;
              break;
          }
          case 0x10:
          {
-             pSubStruct = new TcgSttbf( false );
+             pSubStruct = new TcgSttbf;
              break;
          }
          case 0x11:
          {
-             pSubStruct = new MacroNames( false );
+             pSubStruct = new MacroNames;
              break;
          }
          case 0x12:
          {
-             pSubStruct = new SwCTBWrapper( false );
+             pSubStruct = new SwCTBWrapper;
              break;
          }
          default:
@@ -927,7 +927,7 @@ void Tcg255::Print( FILE* fp)
 }
 #endif
 
-Tcg255SubStruct::Tcg255SubStruct( bool bReadId ) : mbReadId( bReadId ), ch(0)
+Tcg255SubStruct::Tcg255SubStruct( ) : ch(0)
 {
 }
 
@@ -935,14 +935,11 @@ bool Tcg255SubStruct::Read(SvStream &rS)
 {
     SAL_INFO("sw.ww8","Tcg255SubStruct::Read() stream pos 0x" << std::hex << rS.Tell() );
     nOffSet = rS.Tell();
-    if ( mbReadId )
-        rS.ReadUChar( ch );
     return rS.good();
 }
 
-PlfMcd::PlfMcd(bool bReadId)
-    : Tcg255SubStruct(bReadId)
-    , iMac(0)
+PlfMcd::PlfMcd()
+    : iMac(0)
 {
 }
 
@@ -979,8 +976,8 @@ void PlfMcd::Print( FILE* fp )
 }
 #endif
 
-PlfAcd::PlfAcd( bool bReadId ) : Tcg255SubStruct( bReadId )
-,iMac(0)
+PlfAcd::PlfAcd() :
+ iMac(0)
 ,rgacd(nullptr)
 {
 }
@@ -1031,8 +1028,8 @@ void PlfAcd::Print( FILE* fp )
 }
 #endif
 
-PlfKme::PlfKme( bool bReadId ) : Tcg255SubStruct( bReadId )
-,iMac( 0 )
+PlfKme::PlfKme() :
+ iMac( 0 )
 ,rgkme( nullptr )
 {
 }
@@ -1075,7 +1072,7 @@ void PlfKme::Print( FILE* fp )
 }
 #endif
 
-TcgSttbf::TcgSttbf( bool bReadId ) : Tcg255SubStruct( bReadId )
+TcgSttbf::TcgSttbf()
 {
 }
 
@@ -1145,8 +1142,8 @@ void TcgSttbfCore::Print( FILE* fp )
 }
 #endif
 
-MacroNames::MacroNames( bool bReadId ) : Tcg255SubStruct( bReadId )
-,iMac( 0 )
+MacroNames::MacroNames() :
+ iMac( 0 )
 ,rgNames( nullptr )
 {
 }
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 2ee0af5f6419..c5079f4eb617 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -100,7 +100,6 @@ class Tcg255SubStruct : public TBBase
 {
     friend class Tcg255;
 
-    bool mbReadId;
     Tcg255SubStruct(const Tcg255SubStruct&) = delete;
     Tcg255SubStruct& operator = ( const Tcg255SubStruct&) = delete;
 
@@ -108,7 +107,7 @@ protected:
     sal_uInt8 ch;
 
 public:
-    explicit Tcg255SubStruct( bool bReadId );
+    explicit Tcg255SubStruct();
     virtual ~Tcg255SubStruct() override {}
     sal_uInt8 id() const { return ch; }
     bool Read(SvStream &rS) override;
@@ -162,7 +161,7 @@ class SwCTBWrapper : public Tcg255SubStruct
     SwCTBWrapper& operator = ( const SwCTBWrapper&) = delete;
 
 public:
-    explicit SwCTBWrapper( bool bReadId );
+    explicit SwCTBWrapper();
     virtual ~SwCTBWrapper() override;
     void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); }
     SwTBC* GetTBCAtOffset( sal_uInt32 nStreamOffset );
@@ -206,7 +205,7 @@ class PlfMcd : public Tcg255SubStruct
     PlfMcd& operator = ( const PlfMcd&) = delete;
 
 public:
-    explicit PlfMcd( bool bReadId );
+    explicit PlfMcd();
     bool Read(SvStream &rS) override;
 #if OSL_DEBUG_LEVEL > 1
     virtual void Print( FILE* ) override;
@@ -237,7 +236,7 @@ class PlfAcd: public Tcg255SubStruct
     PlfAcd& operator = ( const PlfAcd&) = delete;
 
 public:
-    explicit PlfAcd( bool bReadId );
+    explicit PlfAcd();
     virtual ~PlfAcd() override;
     bool Read(SvStream &rS) override;
 #if OSL_DEBUG_LEVEL > 1
@@ -274,7 +273,7 @@ class PlfKme : public Tcg255SubStruct
     PlfKme& operator = ( const PlfKme&) = delete;
 
 public:
-    explicit PlfKme( bool bReadId );
+    explicit PlfKme();
     virtual ~PlfKme() override;
     bool Read(SvStream &rS) override;
 #if OSL_DEBUG_LEVEL > 1
@@ -315,7 +314,7 @@ class TcgSttbf : public Tcg255SubStruct
     TcgSttbf& operator = ( const TcgSttbf&) = delete;
 
 public:
-    explicit TcgSttbf( bool bReadId );
+    explicit TcgSttbf();
     virtual ~TcgSttbf() override {}
     bool Read(SvStream &rS) override;
 #if OSL_DEBUG_LEVEL > 1
@@ -365,7 +364,7 @@ class MacroNames : public Tcg255SubStruct
     MacroNames& operator = ( const MacroNames&) = delete;
 
 public:
-    explicit MacroNames( bool bReadId );
+    explicit MacroNames();
     virtual ~MacroNames() override;
     bool Read(SvStream &rS) override;
 #if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 784909fdbfdd..06a6bbe6aeb3 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -293,9 +293,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
                 {
                     pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
                                             ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
-                                            &aItemSet,
-                                            nullptr,
-                                            nullptr );
+                                            &aItemSet );
                     pOLENd = lcl_GetOLENode( pFrameFormat );
                 }
 
@@ -598,9 +596,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
         {
             SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
                                             ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
-                                            &aItemSet,
-                                            nullptr,
-                                            nullptr );
+                                            &aItemSet );
 
             // TODO/LATER: in future may need a way to set replacement image url to the link ( may be even to the object ), needs oasis cws???
 
@@ -660,9 +656,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
 
     SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
                                        ::svt::EmbeddedObjectRef( aAppletImpl.GetApplet(), embed::Aspects::MSOLE_CONTENT ),
-                                       &aAppletImpl.GetItemSet(),
-                                       nullptr,
-                                       nullptr);
+                                       &aAppletImpl.GetItemSet());
     xPropSet.set(SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
                 *pDoc, pFrameFormat), uno::UNO_QUERY);
     if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
@@ -735,9 +729,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
 
             SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
                                             ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
-                                            &aItemSet,
-                                            nullptr,
-                                            nullptr);
+                                            &aItemSet);
             xPropSet.set(SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
                             *pDoc, pFrameFormat), uno::UNO_QUERY);
             if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
@@ -888,9 +880,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
 
             SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
                                             ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
-                                            &aItemSet,
-                                            nullptr,
-                                            nullptr);
+                                            &aItemSet);
             xPropSet.set(SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
                             *pDoc, pFrameFormat), uno::UNO_QUERY);
             if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index cba1746a9135..0494864d1631 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -36,7 +36,7 @@ class lcl_ColorPropertySetInfo : public ::cppu::WeakImplHelper<
         XPropertySetInfo  >
 {
 public:
-    explicit lcl_ColorPropertySetInfo( bool bFillColor );
+    explicit lcl_ColorPropertySetInfo();
 
 protected:
     // ____ XPropertySetInfo ____
@@ -49,9 +49,9 @@ private:
     Property m_aColorProp;
 };
 
-lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo( bool bFillColor ) :
+lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo() :
         // note: length of FillColor and LineColor is 9
-        m_aColorPropName( (bFillColor ? "FillColor" : "LineColor"), 9, RTL_TEXTENCODING_ASCII_US ),
+        m_aColorPropName( "FillColor", 9, RTL_TEXTENCODING_ASCII_US ),
         m_aColorProp( m_aColorPropName, -1,
                       cppu::UnoType<sal_Int32>::get(), 0)
 {}
@@ -100,7 +100,7 @@ Reference< XPropertySetInfo > SAL_CALL ColorPropertySet::getPropertySetInfo()
     throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xInfo.is())
-        m_xInfo.set( new lcl_ColorPropertySetInfo( true/*bIsFillColor*/ ));
+        m_xInfo.set( new lcl_ColorPropertySetInfo );
 
     return m_xInfo;
 }