loplugin:constantparam

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

76 files changed, 181 insertions, 345 deletions

diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 5e6195ddc420..2183d16ad38e 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -36,52 +36,15 @@ SbxValue::SbxValue() : SbxBase()
     aData.eType = SbxEMPTY;
 }
 
-SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
+SbxValue::SbxValue( SbxDataType t ) : SbxBase()
 {
     int n = t & 0x0FFF;
-    if( p )
-        n |= SbxBYREF;
+
     if( n == SbxVARIANT )
         n = SbxEMPTY;
     else
         SetFlag( SbxFlagBits::Fixed );
-    if( p )
-    {
-        switch( t & 0x0FFF )
-        {
-            case SbxINTEGER:    n |= SbxBYREF; aData.pInteger = static_cast<sal_Int16*>(p); break;
-            case SbxSALUINT64:  n |= SbxBYREF; aData.puInt64 = static_cast<sal_uInt64*>(p); break;
-            case SbxSALINT64:
-            case SbxCURRENCY:   n |= SbxBYREF; aData.pnInt64 = static_cast<sal_Int64*>(p); break;
-            case SbxLONG:       n |= SbxBYREF; aData.pLong = static_cast<sal_Int32*>(p); break;
-            case SbxSINGLE:     n |= SbxBYREF; aData.pSingle = static_cast<float*>(p); break;
-            case SbxDATE:
-            case SbxDOUBLE:     n |= SbxBYREF; aData.pDouble = static_cast<double*>(p); break;
-            case SbxSTRING:     n |= SbxBYREF; aData.pOUString = static_cast<OUString*>(p); break;
-            case SbxERROR:
-            case SbxUSHORT:
-            case SbxBOOL:       n |= SbxBYREF; aData.pUShort = static_cast<sal_uInt16*>(p); break;
-            case SbxULONG:      n |= SbxBYREF; aData.pULong = static_cast<sal_uInt32*>(p); break;
-            case SbxCHAR:       n |= SbxBYREF; aData.pChar = static_cast<sal_Unicode*>(p); break;
-            case SbxBYTE:       n |= SbxBYREF; aData.pByte = static_cast<sal_uInt8*>(p); break;
-            case SbxINT:        n |= SbxBYREF; aData.pInt = static_cast<int*>(p); break;
-            case SbxOBJECT:
-                aData.pObj = static_cast<SbxBase*>(p);
-                if( p )
-                    aData.pObj->AddFirstRef();
-                break;
-            case SbxDECIMAL:
-                aData.pDecimal = static_cast<SbxDecimal*>(p);
-                if( p )
-                    aData.pDecimal->addRef();
-                break;
-            default:
-                SAL_WARN( "basic", "Improper pointer argument" );
-                n = SbxNULL;
-        }
-    }
-    else
-        memset( &aData, 0, sizeof( SbxValues ) );
+    memset( &aData, 0, sizeof( SbxValues ) );
     aData.eType = SbxDataType( n );
 }
 
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 908c88f4d2c4..ff8c7e07fccc 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -116,7 +116,7 @@ void SbxEnsureParentVariable::SetParent(SbxObject* p)
     assert(GetParent() == xParent.get());
 }
 
-SbxVariable::SbxVariable( SbxDataType t ) : SbxValue( t, nullptr )
+SbxVariable::SbxVariable( SbxDataType t ) : SbxValue( t )
 {
     pCst = nullptr;
     pParent = nullptr;
diff --git a/compilerplugins/clang/constantparam.py b/compilerplugins/clang/constantparam.py
index ed5acc449968..2f930187666f 100755
--- a/compilerplugins/clang/constantparam.py
+++ b/compilerplugins/clang/constantparam.py
@@ -35,13 +35,24 @@ for callInfo, callValues in callDict.iteritems():
     callValue = next(iter(callValues))
     if "unknown" in callValue:
         continue
+    sourceLoc = callInfo[4]
+    functionSig = callInfo[0] + " " + callInfo[1]
+
     # try and ignore setter methods
     if ("," not in nameAndParams) and (("::set" in nameAndParams) or ("::Set" in nameAndParams)):
         continue
-    v0 = callInfo[4]
-    v1 = callInfo[0] + " " + callInfo[1]
+    # ignore code that follows a common pattern
+    if sourceLoc.startswith("sw/inc/swatrset.hxx"): continue
+    if sourceLoc.startswith("sw/inc/format.hxx"): continue
+    # template generated code
+    if sourceLoc.startswith("include/sax/fshelper.hxx"): continue
+    # debug code
+    if sourceLoc.startswith("include/oox/dump"): continue
+    # part of our binary API
+    if sourceLoc.startswith("include/LibreOfficeKit"): continue
+
     v2 = callInfo[3] + " " + callInfo[2] + " " + callValue
-    tmp1list.append((v0,v1,v2))
+    tmp1list.append((sourceLoc, functionSig, v2))
 
 # sort results by filename:lineno
 def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index dcfaca68b635..77595942c545 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5533,8 +5533,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong         nId,
 
 
 void SvxMSDffManager::ExchangeInShapeOrder( SdrObject*   pOldObject,
-                                            sal_uLong        nTxBx,
-                                            SwFlyFrameFormat* pFly,
+                                            sal_uLong    nTxBx,
                                             SdrObject*   pObject) const
 {
     sal_uInt16 nShpCnt = m_pShapeOrders->size();
@@ -5544,7 +5543,7 @@ void SvxMSDffManager::ExchangeInShapeOrder( SdrObject*   pOldObject,
 
         if( rOrder.pObj == pOldObject )
         {
-            rOrder.pFly      = pFly;
+            rOrder.pFly      = nullptr;
             rOrder.pObj      = pObject;
             rOrder.nTxBxComp = nTxBx;
         }
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 4c26597f7608..d6c39055973a 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -64,7 +64,7 @@ private:
     static sal_uInt16       WriteSlotParamArray( SvIdlDataBase & rBase,
                                             SvSlotElementList & rSlotList,
                                             SvStream & rOutStm );
-    static sal_uInt16       WriteSlots( const OString& rShellName, sal_uInt16 nCount,
+    static sal_uInt16       WriteSlots( const OString& rShellName,
                                     SvSlotElementList & rSlotList,
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm );
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index bc64658800b1..efa7f17bef5b 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -150,7 +150,7 @@ sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
 }
 
 sal_uInt16 SvMetaClass::WriteSlots( const OString& rShellName,
-                                sal_uInt16 nCount, SvSlotElementList & rSlotList,
+                                SvSlotElementList & rSlotList,
                                 SvIdlDataBase & rBase,
                                 SvStream & rOutStm )
 {
@@ -158,7 +158,7 @@ sal_uInt16 SvMetaClass::WriteSlots( const OString& rShellName,
     for ( size_t i = 0, n = rSlotList.size(); i < n; ++i )
     {
         SvMetaSlot * pAttr = rSlotList[ i ];
-        nSCount = nSCount + pAttr->WriteSlotMap( rShellName, nCount + nSCount,
+        nSCount = nSCount + pAttr->WriteSlotMap( rShellName, nSCount,
                                         rSlotList, i, rBase,
                                         rOutStm );
     }
@@ -320,7 +320,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
     rOutStm.WriteChar( '{' ) << endl;
 
     // write all attributes
-    WriteSlots( GetName(), 0, aSlotList, rBase, rOutStm );
+    WriteSlots( GetName(), aSlotList, rBase, rOutStm );
     if( nSlotCount )
         Back2Delimiter( rOutStm );
     else
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 60ab190a7a8a..a885972f6c5e 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -90,7 +90,7 @@ protected:
 public:
     SBX_DECL_PERSIST_NODATA(SBXID_VALUE,1);
     SbxValue();
-    SbxValue( SbxDataType, void* = nullptr );
+    SbxValue( SbxDataType );
     SbxValue( const SbxValue& );
     SbxValue& operator=( const SbxValue& );
     virtual void Clear() override;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 9b5ccd60de94..396f88e30f1b 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -694,7 +694,6 @@ public:
 
     void ExchangeInShapeOrder(SdrObject*    pOldObject,
                               sal_uLong     nTxBx,
-                              SwFlyFrameFormat*  pFly,
                               SdrObject*    pObject) const;
 
     void RemoveFromShapeOrder( SdrObject* pObject ) const;
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 1367e2e22d1d..4748dd10ae2d 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -184,8 +184,7 @@ public:
                             const Theme* pTheme,
                             const css::uno::Reference< css::drawing::XShapes >& rxShapes,
                             basegfx::B2DHomMatrix& aTransformation,
-                            const css::awt::Rectangle* pShapeRect = nullptr,
-                            ShapeIdMap* pShapeMap = nullptr );
+                            const css::awt::Rectangle* pShapeRect = nullptr );
 
     void                setXShape( const css::uno::Reference< css::drawing::XShape >& rXShape )
                             { mxShape = rXShape; };
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 1e86437daf67..2e952d3ba9e5 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -181,6 +181,7 @@ public:
 
     /** Reads a Unicode character array (may be compressed) and returns the
         string.
+        NUL characters are replaced by question marks (default).
 
         @param nChars
             Number of 8-bit or 16-bit characters to read from the stream.
@@ -188,12 +189,8 @@ public:
         @param bCompressed
             True = Character array is compressed (stored as 8-bit characters).
             False = Character array is not compressed (stored as 16-bit characters).
-
-        @param bAllowNulChars
-            True = NUL characters are inserted into the imported string.
-            False = NUL characters are replaced by question marks (default).
      */
-    OUString     readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars = false );
+    OUString     readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed );
 
     /** Copies bytes from the current position to the passed output stream.
      */
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 66ab0d0d0f4d..472c649b839f 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -970,8 +970,7 @@ public:
     explicit            EmbeddedForm(
                             const css::uno::Reference< css::frame::XModel >& rxDocModel,
                             const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage,
-                            const GraphicHelper& rGraphicHelper,
-                            bool bDefaultColorBgr = true );
+                            const GraphicHelper& rGraphicHelper );
 
     /** Converts the passed control and inserts the control model into the form.
         @return  The API control model, if conversion was successful. */
diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx
index 448b6a3ea4f1..8d96c0e7a277 100644
--- a/include/oox/ole/vbaexport.hxx
+++ b/include/oox/ole/vbaexport.hxx
@@ -120,7 +120,6 @@ public:
     VBAEncryption(const sal_uInt8* pData,
                   const sal_uInt16 nLength,
                   SvStream& rEncryptedData,
-                  sal_uInt8* pSeed,
                   sal_uInt8 nProjKey);
 
     void write();
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index b7bbd4e1e9be..22e1a12f8587 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -175,8 +175,7 @@ private:
     /** Imports the VBA code modules and forms. */
     void                importVba(
                             StorageBase& rVbaPrjStrg,
-                            const GraphicHelper& rGraphicHelper,
-                            bool bDefaultColorBgr );
+                            const GraphicHelper& rGraphicHelper );
 
     /** Attaches VBA macros to objects registered via registerMacroAttacher(). */
     void                attachMacros();
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index 5f147929bdde..5256a6679464 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -65,7 +65,6 @@ public:
             const oox::drawingml::Theme* pTheme,
             const css::uno::Reference< css::drawing::XShapes >& rxShapes,
             basegfx::B2DHomMatrix& aTransformation,
-            const css::awt::Rectangle* pShapeRect = nullptr,
             ::oox::drawingml::ShapeIdMap* pShapeMap = nullptr );
 
     virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) override;
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 2c3ccda0cbfb..29a7d121f0c8 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -221,7 +221,7 @@ friend class UCBStorage;
 protected:
                                 virtual ~UCBStorageStream() override;
 public:
-                                UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, css::uno::Reference< css::ucb::XProgressHandler > const & xProgress );
+                                UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, bool bRepair, css::uno::Reference< css::ucb::XProgressHandler > const & xProgress );
                                 UCBStorageStream( UCBStorageStream_Impl* );
 
     virtual sal_uLong           Read( void * pData, sal_uLong nSize ) override;
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 7b38053ced4b..4ab1d05e69b7 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -378,8 +378,7 @@ protected:
 
                     SfxMultiFixRecordWriter( sal_uInt8 nRecordType,
                                              SvStream *pStream,
-                                             sal_uInt16 nTag,
-                                             sal_uInt8 nCurVer );
+                                             sal_uInt16 nTag );
 
 public:
     inline          ~SfxMultiFixRecordWriter();
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 076f6737ef7d..de273d8ae552 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -469,8 +469,6 @@ public:
                                 const Point& rPt,
                                 const Size& rSz,
                                 long nExtraData = 0L,
-                                const GraphicAttr* pAttr = nullptr,
-                                GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD,
                                 OutputDevice* pFirstFrameOutDev = nullptr
                             );
 
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 47e4dc9c6b37..b860df6c9237 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -61,7 +61,7 @@ private:
 
 protected:
     bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
-        sal_Int16 nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject);
+        sal_Int16 nMinMov, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject);
 
     void ShowCreateObj(/*OutputDevice* pOut, bool bFull*/);
     void HideCreateObj(/*OutputDevice* pOut, bool bFull*/);
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index a2bd788e4a70..f528d0bde7cf 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -189,7 +189,7 @@ protected:
     bool                IsFormatting() const { return mbIsFormatting; }
     void                UpdateViews( TextView* pCurView = nullptr );
 
-    void                ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = nullptr, TextSelection const* pSelection = nullptr );
+    void                ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pSelection = nullptr );
 
     bool                IsFormatted() const { return mbFormatted; }
 
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 55e429178e1b..3fbe3515bd1b 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -321,14 +321,13 @@ void Shape::addChildren( ::oox::core::XmlFilterBase& rFilterBase,
                          const Theme* pTheme,
                          const Reference< XShapes >& rxShapes,
                          basegfx::B2DHomMatrix& aTransformation,
-                         const awt::Rectangle* pShapeRect,
-                         ShapeIdMap* pShapeMap )
+                         const awt::Rectangle* pShapeRect )
 {
     addChildren(rFilterBase, *this, pTheme, rxShapes,
                 pShapeRect ?
                  *pShapeRect :
                  awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ),
-                pShapeMap, aTransformation);
+                nullptr, aTransformation);
 }
 
 struct ActionLockGuard
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 65de093af611..e3f300a604df 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -95,12 +95,12 @@ OUString BinaryInputStream::readUnicodeArray( sal_Int32 nChars, bool bAllowNulCh
     return aStringBuffer.makeStringAndClear();
 }
 
-OUString BinaryInputStream::readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars )
+OUString BinaryInputStream::readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed )
 {
     return bCompressed ?
          // ISO-8859-1 maps all byte values 0xHH to the same Unicode code point U+00HH
-        readCharArrayUC( nChars, RTL_TEXTENCODING_ISO_8859_1, bAllowNulChars ) :
-        readUnicodeArray( nChars, bAllowNulChars );
+        readCharArrayUC( nChars, RTL_TEXTENCODING_ISO_8859_1 ) :
+        readUnicodeArray( nChars );
 }
 
 void BinaryInputStream::copyToStream( BinaryOutputStream& rOutStrm )
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 92a9aa1c6851..69ab00395709 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2674,8 +2674,8 @@ void EmbeddedControl::convertFromProperties( const Reference< XControlModel >& r
 }
 
 EmbeddedForm::EmbeddedForm( const Reference< XModel >& rxDocModel,
-        const Reference< XDrawPage >& rxDrawPage, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
-    maControlConv( rxDocModel, rGraphicHelper, bDefaultColorBgr ),
+        const Reference< XDrawPage >& rxDrawPage, const GraphicHelper& rGraphicHelper ) :
+    maControlConv( rxDocModel, rGraphicHelper, true/*bDefaultColorBgr*/ ),
     mxModelFactory( rxDocModel, UNO_QUERY ),
     mxFormsSupp( rxDrawPage, UNO_QUERY )
 {
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index 7272757754a8..dec660eccd96 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -395,7 +395,7 @@ void VBACompression::write()
 // section 2.4.3
 #if VBA_ENCRYPTION
 
-VBAEncryption::VBAEncryption(const sal_uInt8* pData, const sal_uInt16 length, SvStream& rEncryptedData, sal_uInt8* pSeed, sal_uInt8 nProjKey)
+VBAEncryption::VBAEncryption(const sal_uInt8* pData, const sal_uInt16 length, SvStream& rEncryptedData, sal_uInt8 nProjKey)
     :mpData(pData)
     ,mnLength(length)
     ,mrEncryptedData(rEncryptedData)
@@ -404,16 +404,13 @@ VBAEncryption::VBAEncryption(const sal_uInt8* pData, const sal_uInt16 length, Sv
     ,mnEncryptedByte2(0)
     ,mnProjKey(nProjKey)
     ,mnIgnoredLength(0)
-    ,mnSeed(pSeed ? *pSeed : 0x00)
+    ,mnSeed(0x00)
     ,mnVersionEnc(0)
 {
-    if (!pSeed)
-    {
-        std::random_device rd;
-        std::mt19937 gen(rd());
-        std::uniform_int_distribution<> dis(0, 255);
-        mnSeed = dis(gen);
-    }
+    std::random_device rd;
+    std::mt19937 gen(rd());
+    std::uniform_int_distribution<> dis(0, 255);
+    mnSeed = dis(gen);
 }
 
 void VBAEncryption::writeSeed()
@@ -915,7 +912,7 @@ void exportPROJECTStream(SvStream& rStrm, const css::uno::Reference<css::contain
     aProtectedStream.WriteUInt32(0x00000000);
     const sal_uInt8* pData = static_cast<const sal_uInt8*>(aProtectedStream.GetData());
     sal_uInt8 nProjKey = VBAEncryption::calculateProjKey(aProjectID);
-    VBAEncryption aProtectionState(pData, 4, rStrm, nullptr, nProjKey);
+    VBAEncryption aProtectionState(pData, 4, rStrm, nProjKey);
     aProtectionState.write();
     exportString(rStrm, "\"\r\n");
 #else
@@ -928,7 +925,7 @@ void exportPROJECTStream(SvStream& rStrm, const css::uno::Reference<css::contain
     aProtectedStream.Seek(0);
     aProtectedStream.WriteUInt8(0x00);
     pData = static_cast<const sal_uInt8*>(aProtectedStream.GetData());
-    VBAEncryption aProjectPassword(pData, 1, rStrm, nullptr, nProjKey);
+    VBAEncryption aProjectPassword(pData, 1, rStrm, nProjKey);
     aProjectPassword.write();
     exportString(rStrm, "\"\r\n");
 #else
@@ -941,7 +938,7 @@ void exportPROJECTStream(SvStream& rStrm, const css::uno::Reference<css::contain
     aProtectedStream.Seek(0);
     aProtectedStream.WriteUInt8(0xFF);
     pData = static_cast<const sal_uInt8*>(aProtectedStream.GetData());
-    VBAEncryption aVisibilityState(pData, 1, rStrm, nullptr, nProjKey);
+    VBAEncryption aVisibilityState(pData, 1, rStrm, nProjKey);
     aVisibilityState.write();
     exportString(rStrm, "\"\r\n\r\n");
 #else
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 0642a8a5324e..54711172fa98 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -174,7 +174,7 @@ void VbaProject::importVbaProject( StorageBase& rVbaPrjStrg, const GraphicHelper
     {
         // load the code modules and forms
         if( isImportVba() )
-            importVba( rVbaPrjStrg, rGraphicHelper, true/*bDefaultColorBgr*/ );
+            importVba( rVbaPrjStrg, rGraphicHelper );
         // copy entire storage into model
         if( isExportVba() )
             copyStorage( rVbaPrjStrg );
@@ -249,10 +249,10 @@ Reference< XNameContainer > const & VbaProject::createDialogLibrary()
     return mxDialogLib;
 }
 
-void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr )
+void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGraphicHelper )
 {
     readVbaModules( rVbaPrjStrg );
-    importModulesAndForms(rVbaPrjStrg, rGraphicHelper, bDefaultColorBgr );
+    importModulesAndForms(rVbaPrjStrg, rGraphicHelper );
 }
 
 void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg )
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index a1600c259665..71f6428ff596 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -114,7 +114,6 @@ void PPTShape::addShape(
         const oox::drawingml::Theme* pTheme,
         const Reference< XShapes >& rxShapes,
         basegfx::B2DHomMatrix& aTransformation,
-        const awt::Rectangle* pShapeRect,
         ::oox::drawingml::ShapeIdMap* pShapeMap )
 {
     SAL_INFO("oox.ppt","add shape id: " << msId << " location: " << ((meShapeLocation == Master) ? "master" : ((meShapeLocation == Slide) ? "slide" : ((meShapeLocation == Layout) ? "layout" : "other"))) << " subtype: " << mnSubType << " service: " << msServiceName);
@@ -333,7 +332,7 @@ void PPTShape::addShape(
             } else
                 setMasterTextListStyle( aMasterTextListStyle );
 
-            Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, bClearText, mpPlaceholder.get() != nullptr, aTransformation, getFillProperties() ) );
+            Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, nullptr, bClearText, mpPlaceholder.get() != nullptr, aTransformation, getFillProperties() ) );
             if (!rSlidePersist.isMasterPage() && rSlidePersist.getPage().is() && ((sal_Int32)mnSubType == XML_title))
              {
                 try
@@ -369,7 +368,7 @@ void PPTShape::addShape(
             // if this is a group shape, we have to add also each child shape
             Reference<XShapes> xShapes(xShape, UNO_QUERY);
             if (xShapes.is())
-                addChildren( rFilterBase, *this, pTheme, xShapes, pShapeRect ? *pShapeRect : awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap, aTransformation );
+                addChildren( rFilterBase, *this, pTheme, xShapes, awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap, aTransformation );
         }
     }
     catch (const Exception&)
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 37ff18324420..ec7932548824 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -145,7 +145,7 @@ void SlidePersist::createXShapes( XmlFilterBase& rFilterBase )
             PPTShape* pPPTShape = dynamic_cast< PPTShape* >( (*aChildIter).get() );
             basegfx::B2DHomMatrix aTransformation;
             if ( pPPTShape )
-                pPPTShape->addShape( rFilterBase, *this, getTheme().get(), xShapes, aTransformation, nullptr, &getShapeMap() );
+                pPPTShape->addShape( rFilterBase, *this, getTheme().get(), xShapes, aTransformation, &getShapeMap() );
             else
                 (*aChildIter)->addShape( rFilterBase, getTheme().get(), xShapes, aTransformation, maShapesPtr->getFillProperties(), nullptr, &getShapeMap() );
         }
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index bac2f19e94a9..67624fe21c56 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -154,10 +154,8 @@ namespace rptui
         void            notifySizeChanged();
 
         /** unmark all objects on the views without the given one.
-        *
-        * @param _pSectionView The view where the objects should not be unmarked.
         */
-        void            unmarkAllObjects(OSectionView* _pSectionView);
+        void            unmarkAllObjects();
 
         /** triggers the property browser with the report component or section
             @param  _xReportComponent
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index df46e6f63dfd..81baa8897acc 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -91,7 +91,7 @@ namespace rptui
         */
         TSectionsMap::iterator getIteratorAtPos(sal_uInt16 _nPos);
         void collectRectangles(TRectangleMap& _rMap);
-        static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize);
+        static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,Rectangle& _rBound,Rectangle& _rResize);
         void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet);
 
         OViewsWindow(OViewsWindow&) = delete;
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 8e8b725c9463..b1bcc1429459 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -288,10 +288,10 @@ void OReportWindow::SelectAll(const sal_uInt16 _nObjectType)
     m_aViewsWindow->SelectAll(_nObjectType);
 }
 
-void OReportWindow::unmarkAllObjects(OSectionView* _pSectionView)
+void OReportWindow::unmarkAllObjects()
 {
 
-    m_aViewsWindow->unmarkAllObjects(_pSectionView);
+    m_aViewsWindow->unmarkAllObjects(nullptr);
 }
 
 void OReportWindow::showProperties(const uno::Reference< report::XSection>& _xReportComponent)
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 2a685ca96651..bf159fb2a77b 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -267,7 +267,7 @@ void OScrollWindowHelper::SelectAll(const sal_uInt16 _nObjectType)
 
 void OScrollWindowHelper::unmarkAllObjects()
 {
-    m_aReportWindow->unmarkAllObjects(nullptr);
+    m_aReportWindow->unmarkAllObjects();
 }
 
 sal_Int32 OScrollWindowHelper::getMaxMarkerWidth() const
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index f45718bfba26..561676a843cd 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -682,7 +682,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles)
     }
 }
 
-void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection, bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize)
+void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection, Rectangle& _rBound, Rectangle& _rResize)
 {
     bool bOnlyOnce = false;
     TRectangleMap::const_iterator aRectIter = _rSortRectangles.begin();
@@ -739,10 +739,7 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,
             }
             else
             {
-                if (_bBoundRects)
-                    _rBound.Union(aRectIter->second.second->GetMarkedObjBoundRect());
-                else
-                    _rBound.Union(aRectIter->second.second->GetMarkedObjRect());
+                _rBound.Union(aRectIter->second.second->GetMarkedObjRect());
             }
         }
     }
@@ -780,7 +777,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
 
     Rectangle aBound;
     Rectangle aResize;
-    collectBoundResizeRect(aSortRectangles,_nControlModification,_bAlignAtSection,false,aBound,aResize);
+    collectBoundResizeRect(aSortRectangles,_nControlModification,_bAlignAtSection,aBound,aResize);
 
     bool bMove = true;
 
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index ed028e3651a9..ef0295bf18c5 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -115,7 +115,7 @@ public:
 class RscTupel : public RscClass
 {
 public:
-    RscTupel( Atom nId, sal_uInt32 nTypId, RscTop * pSuper );
+    RscTupel( Atom nId, sal_uInt32 nTypId );
     RSCINST         GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
                                  const RSCINST & rInitInst ) override;
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 2843c6ca397b..d7f58d4c78e9 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -106,8 +106,7 @@ public:
 class RscContWriteSrc : public RscBaseCont
 {
 public:
-                    RscContWriteSrc( Atom nId, sal_uInt32 nTypId,
-                                     RscTop * pSuper = nullptr );
+                    RscContWriteSrc( Atom nId, sal_uInt32 nTypId );
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
                               RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
 };
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 80ef6aba60bf..279be92cbcf1 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -211,7 +211,7 @@ public:
 
                     RscFile();
                     ~RscFile();
-    void            InsertDependFile( sal_uLong lDepFile, size_t lPos );
+    void            InsertDependFile( sal_uLong lDepFile );
     bool            Depend( sal_uLong lDepend, sal_uLong lFree );
     void            SetIncFlag(){ bIncFile = true; };
     bool            IsIncFile(){  return bIncFile; };
@@ -256,9 +256,9 @@ public:
                          const RscExpression * pExpDec );
 
     RscDefine * NewDef( Index lKey, const OString& rDefName,
-                        sal_Int32 lId, sal_uLong lPos );
+                        sal_Int32 lId );
     RscDefine * NewDef( Index lKey, const OString& rDefName,
-                        RscExpression *, sal_uLong lPos );
+                        RscExpression * );
 
            // deletes all defines defined in this file
     void        DeleteFileContext( Index lKey );
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 6c1ee886a2a5..c397ae4ff823 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -380,7 +380,7 @@ RscTupel * RscTypCont::InitGeometry()
 
     // Clientvariablen einfuegen
     pTupel = new RscTupel( pHS->getID( "TupelDeltaSystem" ),
-                                RSC_NOTYPE, nullptr );
+                                RSC_NOTYPE );
     nId = aNmTb.Put( "X", VARNAME );
     pTupel->SetVariable( nId, &aShort );
     nId = aNmTb.Put( "Y", VARNAME );
@@ -420,7 +420,7 @@ RscTupel * RscTypCont::InitStringTupel()
     Atom        nId;
 
     // Clientvariablen einfuegen
-    pTupel = new RscTupel( pHS->getID( "CharsTupel" ), RSC_NOTYPE, nullptr );
+    pTupel = new RscTupel( pHS->getID( "CharsTupel" ), RSC_NOTYPE );
     nId = aNmTb.Put( "FILTER", VARNAME );
     pTupel->SetVariable( nId, &aString );
     nId = aNmTb.Put( "MASK", VARNAME );
@@ -435,7 +435,7 @@ RscTupel * RscTypCont::InitStringLongTupel()
     Atom        nId;
 
     // Clientvariablen einfuegen
-    pTupel = new RscTupel( pHS->getID( "CharsLongTupel" ), RSC_NOTYPE, nullptr );
+    pTupel = new RscTupel( pHS->getID( "CharsLongTupel" ), RSC_NOTYPE );
     nId = aNmTb.Put( "ItemText", VARNAME );
     pTupel->SetVariable( nId, &aString );
     nId = aNmTb.Put( "ItemId", VARNAME );
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 1a665c1664d7..a1a32320f77b 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -386,13 +386,13 @@ void IncludeParser( RscFileInst * pFileInst )
                 {
                     lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string,
                                                          aYYSType.string );
-                    pFName->InsertDependFile( lKey, ULONG_MAX );
+                    pFName->InsertDependFile( lKey );
                 }
                 else if( INCLUDE_STRING == nToken )
                 {
                     lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string,
                                                          OString() );
-                    pFName->InsertDependFile( lKey, ULONG_MAX );
+                    pFName->InsertDependFile( lKey );
                 }
             }
         }
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index 43272f2fc8c8..bf020892ed76 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -382,7 +382,7 @@ resource_definition
       {
           if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
                                      rtl::OString( $3 ),
-                                     $4.GetLong(), ULONG_MAX ) )
+                                     $4.GetLong() ) )
               bError = true;
       }
       else if( $4.IsDefinition() )
@@ -397,7 +397,7 @@ resource_definition
           pExpr = new RscExpression( aExpType, '+', $4 );
 
           if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
-                                     rtl::OString( $3 ), pExpr, ULONG_MAX ) )
+                                     rtl::OString( $3 ), pExpr ) )
           {
               bError =true;
           }
@@ -405,8 +405,7 @@ resource_definition
       else if( $4.IsExpression() )
       {
           if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
-                                     rtl::OString( $3 ), $4.aExp.pExp,
-                                     ULONG_MAX ) )
+                                     rtl::OString( $3 ), $4.aExp.pExp ) )
           {
               bError = true;
           }
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 366d6836b068..a5f9e4f59e91 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -832,8 +832,8 @@ ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
     return aError;
 }
 
-RscTupel::RscTupel( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
-    : RscClass( nId, nTypeId, pSuper )
+RscTupel::RscTupel( Atom nId, sal_uInt32 nTypeId )
+    : RscClass( nId, nTypeId, nullptr )
 {
 }
 
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index c6c50dd8b0e6..a48767089f0e 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.cxx
@@ -719,9 +719,8 @@ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
     return aError;
 }
 
-RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId,
-                                  RscTop * pSuper )
-    : RscBaseCont( nId, nTypeId, pSuper, true )
+RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId )
+    : RscBaseCont( nId, nTypeId, nullptr, true )
 {
 }
 
@@ -748,7 +747,7 @@ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 RscCont::RscCont( Atom nId, sal_uInt32 nTypeId )
-    : RscContWriteSrc( nId, nTypeId, nullptr )
+    : RscContWriteSrc( nId, nTypeId )
 {
 }
 
@@ -771,7 +770,7 @@ ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
 }
 
 RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId )
-    : RscContWriteSrc( nId, nTypeId, nullptr )
+    : RscContWriteSrc( nId, nTypeId )
 {
 }
 
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index be4ea3ff2477..0d2595bee4ac 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -386,7 +386,7 @@ bool RscFile::Depend( sal_uLong lDepend, sal_uLong lFree )
     return true;
 }
 
-void RscFile::InsertDependFile( sal_uLong lIncFile, size_t lPos )
+void RscFile::InsertDependFile( sal_uLong lIncFile )
 {
     for ( size_t i = 0, n = aDepLst.size(); i < n; ++i )
     {
@@ -395,18 +395,7 @@ void RscFile::InsertDependFile( sal_uLong lIncFile, size_t lPos )
             return;
     }
 
-    // current pointer points to last element
-    if( lPos >= aDepLst.size() )
-    { // the last element must always stay the last one
-        // put dependency before the last position
-        aDepLst.push_back( new RscDepend( lIncFile ) );
-    }
-    else
-    {
-        RscDependList::iterator it = aDepLst.begin();
-        ::std::advance( it, lPos );
-        aDepLst.insert( it, new RscDepend( lIncFile ) );
-    }
+    aDepLst.push_back( new RscDepend( lIncFile ) );
 }
 
 RscDefTree::~RscDefTree()
@@ -559,7 +548,7 @@ bool RscFileTab::TestDef( Index lFileKey, size_t lPos,
 }
 
 RscDefine * RscFileTab::NewDef( Index lFileKey, const OString& rDefName,
-                                sal_Int32 lId, sal_uLong lPos )
+                                sal_Int32 lId )
 {
     RscDefine * pDef = FindDef( rDefName );
 
@@ -569,7 +558,7 @@ RscDefine * RscFileTab::NewDef( Index lFileKey, const OString& rDefName,
 
         if( pFile )
         {
-            pDef = pFile->aDefLst.New( lFileKey, rDefName, lId, lPos );
+            pDef = pFile->aDefLst.New( lFileKey, rDefName, lId, ULONG_MAX );
             aDefTree.Insert( pDef );
         }
     }
@@ -580,20 +569,20 @@ RscDefine * RscFileTab::NewDef( Index lFileKey, const OString& rDefName,
 }
 
 RscDefine * RscFileTab::NewDef( Index lFileKey, const OString& rDefName,
-                                RscExpression * pExp, sal_uLong lPos )
+                                RscExpression * pExp )
 {
     RscDefine * pDef = FindDef( rDefName );
 
     if( !pDef )
     {
         // are macros in expressions defined?
-        if( TestDef( lFileKey, lPos, pExp ) )
+        if( TestDef( lFileKey, ULONG_MAX, pExp ) )
         {
             RscFile * pFile = GetFile( lFileKey );
 
             if( pFile )
             {
-                pDef = pFile->aDefLst.New( lFileKey, rDefName, pExp, lPos );
+                pDef = pFile->aDefLst.New( lFileKey, rDefName, pExp, ULONG_MAX );
                 aDefTree.Insert( pDef );
             }
         }
@@ -633,7 +622,7 @@ RscFileTab::Index RscFileTab::NewCodeFile( const OString& rName )
         pFName->aFileName = rName;
         pFName->aPathName = rName;
         lKey = Insert( pFName );
-        pFName->InsertDependFile( lKey, ULONG_MAX );
+        pFName->InsertDependFile( lKey );
     }
     return lKey;
 }
@@ -649,7 +638,7 @@ RscFileTab::Index RscFileTab::NewIncFile(const OString& rName,
         pFName->aPathName = rPath;
         pFName->SetIncFlag();
         lKey = Insert( pFName );
-        pFName->InsertDependFile( lKey, ULONG_MAX );
+        pFName->InsertDependFile( lKey );
     }
     return lKey;
 }
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 9951c053ff7e..c1f33839e8f5 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -133,15 +133,12 @@ public:
 class CopyToClipContext : public ClipContextBase
 {
     bool mbKeepScenarioFlags:1;
-    bool mbCloneNotes:1;
 
 public:
-    CopyToClipContext() = delete;
-    CopyToClipContext(ScDocument& rDoc, bool bKeepScenarioFlags, bool bCloneNotes);
+    CopyToClipContext(ScDocument& rDoc, bool bKeepScenarioFlags);
     virtual ~CopyToClipContext() override;
 
     bool isKeepScenarioFlags() const;
-    bool isCloneNotes() const;
 };
 
 class CopyToDocContext : public ClipContextBase
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 419d8bde3f23..e4e14329cdbe 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -844,7 +844,7 @@ public:
         const ScSortParam& rSortParam, bool bKeepQuery, bool bUpdateRefs,
         ScProgress* pProgress, sc::ReorderParam* pUndo );
 
-    void Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress );
+    void Reorder( const sc::ReorderParam& rParam );
 
     bool ValidQuery(
         SCROW nRow, const ScQueryParam& rQueryParam, ScRefCellValue* pCell = nullptr,
diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx
index 16084be70c6d..8b0ce0df315b 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -328,8 +328,8 @@ bool CopyFromClipContext::isDateCell( const ScColumn& rCol, SCROW nRow ) const
 }
 
 CopyToClipContext::CopyToClipContext(
-    ScDocument& rDoc, bool bKeepScenarioFlags, bool bCloneNotes) :
-    ClipContextBase(rDoc), mbKeepScenarioFlags(bKeepScenarioFlags), mbCloneNotes(bCloneNotes) {}
+    ScDocument& rDoc, bool bKeepScenarioFlags) :
+    ClipContextBase(rDoc), mbKeepScenarioFlags(bKeepScenarioFlags) {}
 
 CopyToClipContext::~CopyToClipContext() {}
 
@@ -338,11 +338,6 @@ bool CopyToClipContext::isKeepScenarioFlags() const
     return mbKeepScenarioFlags;
 }
 
-bool CopyToClipContext::isCloneNotes() const
-{
-    return mbCloneNotes;
-}
-
 CopyToDocContext::CopyToDocContext(ScDocument& rDoc) :
     ClipContextBase(rDoc), mbStartListening(true) {}
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 95959b9386c4..ea92124982c5 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1027,7 +1027,7 @@ void ScColumn::CopyToClip(
                           rCxt.isKeepScenarioFlags() ? (ScMF::All & ~ScMF::Scenario) : ScMF::All );
 
     {
-        CopyToClipHandler aFunc(*this, rColumn, rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), rCxt.isCloneNotes());
+        CopyToClipHandler aFunc(*this, rColumn, rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), true/*CloneNotes*/);
         sc::ParseBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
     }
 
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 5aa0fcf2e115..eab54acab123 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1408,7 +1408,7 @@ void ScDocument::Reorder( const sc::ReorderParam& rParam )
 
     bool bOldEnableIdle = IsIdleEnabled();
     EnableIdle(false);
-    pTab->Reorder(rParam, nullptr);
+    pTab->Reorder(rParam);
     EnableIdle(bOldEnableIdle);
 }
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 9462a54e9bbf..415c3e647d51 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2183,7 +2183,7 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam,
 
     pClipDoc->ResetClip(this, pMarks);
 
-    sc::CopyToClipContext aCxt(*pClipDoc, bKeepScenarioFlags, true/*bCloneNoteCaptions*/);
+    sc::CopyToClipContext aCxt(*pClipDoc, bKeepScenarioFlags);
     CopyRangeNamesToClip(pClipDoc, aClipRange, pMarks);
 
     for (SCTAB i = 0; i < nEndTab; ++i)
@@ -2285,7 +2285,7 @@ void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1,
         rClipParam.maRanges.Append(ScRange(nCol1, nRow1, 0, nCol2, nRow2, 0));
         pClipDoc->ResetClip( this, nTab );
 
-        sc::CopyToClipContext aCxt(*pClipDoc, false, true);
+        sc::CopyToClipContext aCxt(*pClipDoc, false);
         if (nTab < static_cast<SCTAB>(maTabs.size()) && nTab < static_cast<SCTAB>(pClipDoc->maTabs.size()))
             if (maTabs[nTab] && pClipDoc->maTabs[nTab])
                 maTabs[nTab]->CopyToClip(aCxt, nCol1, nRow1, nCol2, nRow2, pClipDoc->maTabs[nTab]);
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 158686e9fbcf..8cec68efb1b3 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1752,7 +1752,7 @@ void ScTable::Sort(
     DestroySortCollator();
 }
 
-void ScTable::Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress )
+void ScTable::Reorder( const sc::ReorderParam& rParam )
 {
     if (rParam.maOrderIndices.empty())
         return;
@@ -1767,10 +1767,10 @@ void ScTable::Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress )
         pArray->ReorderByRow(rParam.maOrderIndices);
         if (pArray->IsUpdateRefs())
             SortReorderByRowRefUpdate(
-                pArray.get(), rParam.maSortRange.aStart.Col(), rParam.maSortRange.aEnd.Col(), pProgress);
+                pArray.get(), rParam.maSortRange.aStart.Col(), rParam.maSortRange.aEnd.Col(), nullptr);
         else
             SortReorderByRow(
-                pArray.get(), rParam.maSortRange.aStart.Col(), rParam.maSortRange.aEnd.Col(), pProgress);
+                pArray.get(), rParam.maSortRange.aStart.Col(), rParam.maSortRange.aEnd.Col(), nullptr);
     }
     else
     {
@@ -1778,7 +1778,7 @@ void ScTable::Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress )
         pArray->SetOrderIndices(rParam.maOrderIndices);
         SortReorderByColumn(
             pArray.get(), rParam.maSortRange.aStart.Row(), rParam.maSortRange.aEnd.Row(),
-            rParam.mbPattern, pProgress);
+            rParam.mbPattern, nullptr);
     }
 }
 
diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx
index 76ae3a82eec5..cf620d1dccd9 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -128,12 +128,9 @@ public:
         @param rInStream
             The base input stream. Must be seekable. Will be sought to its
             start position.
-
-        @param bContLookup  Automatic CONTINUE lookup on/off.
      */
     explicit            BiffInputStream(
-                            BinaryInputStream& rInStream,
-                            bool bContLookup = true );
+                            BinaryInputStream& rInStream );
 
     // record control ---------------------------------------------------------
 
@@ -222,26 +219,11 @@ public:
 
     // byte strings -----------------------------------------------------------
 
-    /** Reads 8/16 bit string length and character array, and returns the string.
-        @param b16BitLen
-            True = Read 16-bit string length field before the character array.
-            False = Read 8-bit string length field before the character array.
-        @param bAllowNulChars
-            True = NUL characters are inserted into the imported string.
-            False = NUL characters are replaced by question marks (default).
-     */
-    OString      readByteString( bool b16BitLen, bool bAllowNulChars );
-
-    /** Reads 8/16 bit string length and character array, and returns a Unicode string.
-        @param b16BitLen
-            True = Read 16-bit string length field before the character array.
-            False = Read 8-bit string length field before the character array.
+    /** Reads 16 bit string length and character array, and returns a Unicode string.
+        NUL characters are replaced by question marks (default).
         @param eTextEnc  The text encoding used to create the Unicode string.
-        @param bAllowNulChars
-            True = NUL characters are inserted into the imported string.
-            False = NUL characters are replaced by question marks (default).
      */
-    OUString     readByteStringUC( bool b16BitLen, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false );
+    OUString     readByteStringUC( rtl_TextEncoding eTextEnc );
 
 private:
     /** Initializes all members after base stream has been sought to new record. */
@@ -277,8 +259,6 @@ private:
     sal_Int64           mnCurrRecSize;      /// Helper for record size and position.
     sal_Int64           mnComplRecSize;     /// Size of complete record data (with CONTINUEs).
     bool                mbHasComplRec;      /// True = mnComplRecSize is valid.
-
-    bool                mbCont;             /// True = automatic CONTINUE lookup enabled.
 };
 
 } // namespace xls
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 5ec2bfdbe9d7..1582b4c2fa6f 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -58,12 +58,11 @@ public:
     /** Converts the portion and replaces or appends to the passed XText. */
     void                convert(
                             const css::uno::Reference< css::text::XText >& rxText,
-                            const oox::xls::Font* pFont, bool bReplace );
+                            bool bReplace );
     void                convert( ScEditEngineDefaulter& rEE, ESelection& rSelection, const oox::xls::Font* pFont );
 
     void                writeFontProperties(
-        const css::uno::Reference< css::text::XText >& rxText,
-        const oox::xls::Font* pFont ) const;
+                            const css::uno::Reference< css::text::XText >& rxText ) const;
 
 private:
     OUString            maText;         /// Portion text.
diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx
index 6b54834fe2a5..7d9e8a2784cd 100644
--- a/sc/source/filter/oox/biffinputstream.cxx
+++ b/sc/source/filter/oox/biffinputstream.cxx
@@ -151,7 +151,7 @@ void BiffInputRecordBuffer::updateDecoded()
 
 } // namespace prv
 
-BiffInputStream::BiffInputStream( BinaryInputStream& rInStream, bool bContLookup ) :
+BiffInputStream::BiffInputStream( BinaryInputStream& rInStream ) :
     BinaryStreamBase( true ),
     maRecBuffer( rInStream ),
     mnRecHandle( -1 ),
@@ -159,8 +159,7 @@ BiffInputStream::BiffInputStream( BinaryInputStream& rInStream, bool bContLookup
     mnAltContId( BIFF_ID_UNKNOWN ),
     mnCurrRecSize( 0 ),
     mnComplRecSize( 0 ),
-    mbHasComplRec( false ),
-    mbCont( bContLookup )
+    mbHasComplRec( false )
 {
     mbEof = true;   // EOF will be true if stream is not inside a record
 }
@@ -182,7 +181,7 @@ bool BiffInputStream::startNextRecord()
         // ignore record, if identifier and size are zero
         bIsZeroRec = (maRecBuffer.getRecId() == 0) && (maRecBuffer.getRecSize() == 0);
     }
-    while( bValidRec && ((mbCont && isContinueId( maRecBuffer.getRecId() )) || bIsZeroRec) );
+    while( bValidRec && (isContinueId( maRecBuffer.getRecId()) || bIsZeroRec) );
 
     // setup other class members
     setupRecord();
@@ -318,15 +317,10 @@ void BiffInputStream::skip( sal_Int32 nBytes, size_t nAtomSize )
 
 // byte strings ---------------------------------------------------------------
 
-OString BiffInputStream::readByteString( bool b16BitLen, bool bAllowNulChars )
+OUString BiffInputStream::readByteStringUC( rtl_TextEncoding eTextEnc )
 {
-    sal_Int32 nStrLen = b16BitLen ? readuInt16() : readuInt8();
-    return readCharArray( nStrLen, bAllowNulChars );
-}
-
-OUString BiffInputStream::readByteStringUC( bool b16BitLen, rtl_TextEncoding eTextEnc, bool bAllowNulChars )
-{
-    return OStringToOUString( readByteString( b16BitLen, bAllowNulChars ), eTextEnc );
+    sal_Int32 nStrLen = readuInt16();
+    return readCharArrayUC( nStrLen, eTextEnc );
 }
 
 // private --------------------------------------------------------------------
@@ -338,7 +332,7 @@ void BiffInputStream::setupRecord()
     mnRecId = maRecBuffer.getRecId();
     mnAltContId = BIFF_ID_UNKNOWN;
     mnCurrRecSize = mnComplRecSize = maRecBuffer.getRecSize();
-    mbHasComplRec = !mbCont;
+    mbHasComplRec = false;
     mbEof = !isInRecord();
     // enable decoder in new record
     enableDecoder();
@@ -371,7 +365,7 @@ bool BiffInputStream::isContinueId( sal_uInt16 nRecId ) const
 
 bool BiffInputStream::jumpToNextContinue()
 {
-    mbEof = mbEof || !mbCont || !isContinueId( maRecBuffer.getNextRecId() ) || !maRecBuffer.startNextRecord();
+    mbEof = mbEof || !isContinueId( maRecBuffer.getNextRecId() ) || !maRecBuffer.startNextRecord();
     if( !mbEof )
         mnCurrRecSize += maRecBuffer.getRecSize();
     return !mbEof;
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 467b02d8edc2..a9e59cefcd83 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -235,7 +235,7 @@ void PivotCacheItem::readIndex( SequenceInputStream& rStrm )
 
 void PivotCacheItem::readString( BiffInputStream& rStrm, const WorkbookHelper& rHelper )
 {
-    maValue <<= rStrm.readByteStringUC( true, rHelper.getTextEncoding() );
+    maValue <<= rStrm.readByteStringUC( rHelper.getTextEncoding() );
     mnType = XML_s;
 }
 
@@ -634,7 +634,7 @@ void PivotCacheField::importPCDField( BiffInputStream& rStrm )
     maFieldGroupModel.mnBaseField    = rStrm.readuInt16();
     rStrm.skip( 2 );    // number of unique items (either shared or group)
     rStrm >> nGroupItems >> nBaseItems >> nSharedItems;
-    maFieldModel.maName = rStrm.readByteStringUC( true, getTextEncoding() );
+    maFieldModel.maName = rStrm.readByteStringUC( getTextEncoding() );
 
     maFieldModel.mbServerField          = getFlag( nFlags, BIFF_PCDFIELD_SERVERFIELD );
     maFieldModel.mbUniqueList           = !getFlag( nFlags, BIFF_PCDFIELD_NOUNIQUEITEMS );
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index da88e98d7941..4573e743b840 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -80,7 +80,7 @@ void RichStringPortion::finalizeImport()
         mxFont = getStyles().getFont( mnFontId );
 }
 
-void RichStringPortion::convert( const Reference< XText >& rxText, const oox::xls::Font* pFont, bool bReplace )
+void RichStringPortion::convert( const Reference< XText >& rxText, bool bReplace )
 {
     if ( mbConverted )
         return;
@@ -100,15 +100,6 @@ void RichStringPortion::convert( const Reference< XText >& rxText, const oox::xl
             PropertySet aPropSet( xRange );
             mxFont->writeToPropertySet( aPropSet, FONT_PROPTYPE_TEXT );
         }
-
-        /*  Some font attributes cannot be set to cell formatting in Calc but
-            require to use rich formatting, e.g. font escapement. But do not
-            use the passed font if this portion has its own font. */
-        else if( lclNeedsRichTextFormat( pFont ) )
-        {
-            PropertySet aPropSet( xRange );
-            pFont->writeToPropertySet( aPropSet, FONT_PROPTYPE_TEXT );
-        }
     }
 
     mbConverted = true;
@@ -149,15 +140,12 @@ void RichStringPortion::convert( ScEditEngineDefaulter& rEE, ESelection& rSelect
     rEE.QuickSetAttribs( aItemSet, rSelection );
 }
 
-void RichStringPortion::writeFontProperties( const Reference<XText>& rxText, const oox::xls::Font* pFont ) const
+void RichStringPortion::writeFontProperties( const Reference<XText>& rxText ) const
 {
     PropertySet aPropSet(rxText);
 
     if (mxFont.get())
         mxFont->writeToPropertySet(aPropSet, FONT_PROPTYPE_TEXT);
-
-    if (lclNeedsRichTextFormat(pFont))
-        pFont->writeToPropertySet(aPropSet, FONT_PROPTYPE_TEXT);
 }
 
 void FontPortionModel::read( SequenceInputStream& rStrm )
@@ -390,13 +378,13 @@ void RichString::convert( const Reference< XText >& rxText, bool bReplaceOld ) c
         // It's much faster this way.
         RichStringPortion& rPtn = *maTextPortions.front();
         rxText->setString(rPtn.getText());
-        rPtn.writeFontProperties(rxText, nullptr);
+        rPtn.writeFontProperties(rxText);
         return;
     }
 
     for( PortionVector::const_iterator aIt = maTextPortions.begin(), aEnd = maTextPortions.end(); aIt != aEnd; ++aIt )
     {
-        (*aIt)->convert( rxText, nullptr, bReplaceOld );
+        (*aIt)->convert( rxText, bReplaceOld );
         bReplaceOld = false;    // do not replace first portion text with following portions
     }
 }
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 50f50536b33e..59d285f27dbb 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -96,7 +96,7 @@ void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCR
 }
 
 void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPrintFactor,
-                                const ScRange& rBlock, bool bMetaFile )
+                                const ScRange& rBlock )
 {
     if (!pDoc)
         return;
@@ -111,7 +111,7 @@ void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPr
     aViewData.SetScreen( rBlock.aStart.Col(), rBlock.aStart.Row(),
                             rBlock.aEnd.Col(), rBlock.aEnd.Row() );
 
-    ScPrintFunc::DrawToDev( pDoc, pDev, nPrintFactor, aBound, &aViewData, bMetaFile );
+    ScPrintFunc::DrawToDev( pDoc, pDev, nPrintFactor, aBound, &aViewData, false/*bMetaFile*/ );
 }
 
 ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc ) :
@@ -350,7 +350,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
             ScopedVclPtrInstance< VirtualDevice > pVirtDev;
             pVirtDev->SetOutputSizePixel( pVirtDev->LogicToPixel( aMMRect.GetSize(), MAP_100TH_MM ) );
 
-            PaintToDev( pVirtDev, pDoc, 1.0, aBlock, false );
+            PaintToDev( pVirtDev, pDoc, 1.0, aBlock );
 
             pVirtDev->SetMapMode( MapMode( MAP_PIXEL ) );
             Bitmap aBmp = pVirtDev->GetBitmap( Point(), pVirtDev->GetOutputSize() );
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index 45c7d49ac737..350a11f51b51 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -66,7 +66,7 @@ private:
                             ScDocument* pDestDoc,
                             SCCOL nSubX=0, SCROW nSubY=0 );
     static void PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPrintFactor,
-                            const ScRange& rBlock, bool bMetaFile );
+                            const ScRange& rBlock );
     static void GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol );
 
 public:
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index e38d87b48cc7..6ed9dcace102 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -110,8 +110,7 @@ public:
 
     bool startPreview(
         const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage,
-        const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode,
-        vcl::Window* pParent );
+        const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode );
 
     // uno api
 
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index b339a45c412e..7330d79b4fd7 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -185,7 +185,7 @@ bool SlideShow::StartPreview( ViewShellBase& rBase,
 {
     rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) );
     if( xSlideShow.is() )
-        return xSlideShow->startPreview( xDrawPage, xAnimationNode, nullptr );
+        return xSlideShow->startPreview( xDrawPage, xAnimationNode );
 
     return false;
 }
@@ -882,7 +882,7 @@ void SAL_CALL SlideShow::disposing()
     mpDoc = nullptr;
 }
 
-bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, vcl::Window* pParent )
+bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode )
 {
     Sequence< PropertyValue > aArguments(4);
 
@@ -895,12 +895,8 @@ bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Ref
     aArguments[2].Name = "AnimationNode";
     aArguments[2].Value <<= xAnimationNode;
 
-    Reference< XWindow > xParentWindow;
-    if( pParent )
-        xParentWindow = VCLUnoHelper::GetInterface( pParent );
-
     aArguments[3].Name = "ParentWindow";
-    aArguments[3].Value <<= xParentWindow;
+    aArguments[3].Value <<= Reference< XWindow >();
 
     startWithArguments( aArguments );
 
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 9ff07b002498..575ea7174d93 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1342,15 +1342,14 @@ void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString
 }
 
 OUString SfxHelpWindow_Impl::buildHelpURL(const OUString& sFactory        ,
-                                                 const OUString& sContent        ,
-                                                 const OUString& sAnchor         ,
-                                                       bool         bUseQuestionMark)
+                                          const OUString& sContent        ,
+                                          const OUString& sAnchor)
 {
     OUStringBuffer sHelpURL(256);
     sHelpURL.append(HELP_URL);
     sHelpURL.append(sFactory);
     sHelpURL.append(sContent);
-    AppendConfigToken(sHelpURL, bUseQuestionMark);
+    AppendConfigToken(sHelpURL, true/*bUseQuestionMark*/);
     if (!sAnchor.isEmpty())
         sHelpURL.append(sAnchor);
     return sHelpURL.makeStringAndClear();
@@ -2800,8 +2799,7 @@ void SfxHelpWindow_Impl::ShowStartPage()
 {
     OUString sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(),
                                                                 "/start",
-                                                                OUString(),
-                                                                true);
+                                                                OUString());
     loadHelpContent(sHelpURL);
 }
 
@@ -2847,8 +2845,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpWindow_Impl, OpenHdl, Control*, bool)
 
         sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(),
                                                     aEntry,
-                                                    aAnchor,
-                                                    true);
+                                                    aAnchor);
     }
 
     loadHelpContent(sHelpURL);
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index a7b82d417050..29efc2113de4 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -553,9 +553,8 @@ public:
                                        bool         bSuccess);
 
     static OUString     buildHelpURL(const OUString& sFactory        ,
-                                         const OUString& sContent        ,
-                                         const OUString& sAnchor         ,
-                                               bool         bUseQuestionMark);
+                                     const OUString& sContent        ,
+                                     const OUString& sAnchor);
 
     void                loadHelpContent(const OUString& sHelpURL                ,
                                               bool         bAddToHistory = true);
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 66da9470e6e7..cc4119459bf7 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -675,7 +675,7 @@ namespace SfxTemplate
 
 // Constructor
 
-SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window* pW, bool )
+SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window* pW )
     : pBindings(pB)
     , pWindow(pW)
     , pModule(nullptr)
@@ -2223,7 +2223,7 @@ static OUString lcl_GetLabel(uno::Any& rAny)
 }
 
 SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanelControl* pDlgWindow)
-    : SfxCommonTemplateDialog_Impl(pB, pDlgWindow, true)
+    : SfxCommonTemplateDialog_Impl(pB, pDlgWindow)
     , m_pFloat(pDlgWindow)
     , m_aActionTbL(VclPtrInstance<DropToolBox_Impl>(pDlgWindow, this))
     , m_aActionTbR(VclPtrInstance<ToolBox>(pDlgWindow))
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 526078cc7fab..f9f55e79207e 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -283,7 +283,7 @@ protected:
 
 public:
 
-    SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window*, bool );
+    SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window* );
     virtual ~SfxCommonTemplateDialog_Impl() override;
 
     DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index d352537b4222..7ecd607a08d9 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1241,11 +1241,11 @@ void UCBStorageStream_Impl::PrepareCachedForReopen( StreamMode nMode )
     }
 }
 
-UCBStorageStream::UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, Reference< XProgressHandler > const & xProgress )
+UCBStorageStream::UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, bool bRepair, Reference< XProgressHandler > const & xProgress )
 {
     // 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, pKey, bRepair, xProgress );
+    pImp = new UCBStorageStream_Impl( rName, nMode, this, bDirect, nullptr, bRepair, xProgress );
     pImp->AddFirstRef();             // use direct refcounting because in header file only a pointer should be used
     StorageBase::m_nMode = pImp->m_nMode;
 }
@@ -2631,7 +2631,7 @@ BaseStorageStream* UCBStorage::OpenStream( const OUString& rEleName, StreamMode
             OUString aName( pImp->m_aURL );
             aName += "/";
             aName += rEleName;
-            UCBStorageStream* pStream = new UCBStorageStream( aName, nMode, bDirect, nullptr, pImp->m_bRepairPackage, pImp->m_xProgressHandler );
+            UCBStorageStream* pStream = new UCBStorageStream( aName, nMode, bDirect, pImp->m_bRepairPackage, pImp->m_xProgressHandler );
             pStream->SetError( GetError() );
             pStream->pImp->m_aName = rEleName;
             return pStream;
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index 1ee180425748..b52a935e462e 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
@@ -287,15 +287,13 @@ bool SfxSingleRecordReader::FindHeader_Impl(sal_uInt16 nTypes, sal_uInt16 nTag)
  * @param nRecordType  sub class record type
  * @param pStream      Stream to write the record to
  * @param nContentTag  Content type
- * @param nContentVer  Content version
  *
  * Internal method for sub classes
  */
 SfxMultiFixRecordWriter::SfxMultiFixRecordWriter(sal_uInt8  nRecordType,
                                                  SvStream*  pStream,
-                                                 sal_uInt16 nContentTag,
-                                                 sal_uInt8  nContentVer)
-    :  SfxSingleRecordWriter( nRecordType, pStream, nContentTag, nContentVer )
+                                                 sal_uInt16 nContentTag)
+    :  SfxSingleRecordWriter( nRecordType, pStream, nContentTag, 0 )
     , _nContentStartPos(0)
     , _nContentCount(0)
 {
@@ -339,7 +337,7 @@ sal_uInt32 SfxMultiFixRecordWriter::Close()
 SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(sal_uInt8  nRecordType,
                                                  SvStream*  pStream,
                                                  sal_uInt16 nRecordTag)
-:   SfxMultiFixRecordWriter( nRecordType, pStream, nRecordTag, 0 ),
+:   SfxMultiFixRecordWriter( nRecordType, pStream, nRecordTag ),
     _nContentVer( 0 )
 {
 }
@@ -361,8 +359,7 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(sal_uInt8  nRecordType,
  */
 SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(SvStream*  pStream,
                                                  sal_uInt16 nRecordTag)
-:   SfxMultiFixRecordWriter( SFX_REC_TYPE_VARSIZE,
-                             pStream, nRecordTag, 0 ),
+:   SfxMultiFixRecordWriter( SFX_REC_TYPE_VARSIZE, pStream, nRecordTag ),
     _nContentVer( 0 )
 {
 }
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 7552caf077e6..780acab62b26 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -610,7 +610,7 @@ void GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const
 }
 
 bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz,
-                                    long nExtraData, const GraphicAttr* pAttr, GraphicManagerDrawFlags /*nFlags*/,
+                                    long nExtraData,
                                     OutputDevice* pFirstFrameOutDev )
 {
     bool bRet = false;
@@ -619,7 +619,7 @@ bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const
 
     if( !IsSwappedOut() )
     {
-        const GraphicAttr aAttr( pAttr ? *pAttr : GetAttr() );
+        const GraphicAttr aAttr( GetAttr() );
 
         if( mbAnimated )
         {
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 16a8c760e0a9..e3d8259c6f5d 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3178,7 +3178,7 @@ void FmXFormShell::CreateExternalView()
             if ( m_xExternalViewController == getActiveController() )
             {
                 Reference< runtime::XFormController > xAsFormController( m_xExternalViewController, UNO_QUERY );
-                ControllerFeatures aHelper( xAsFormController, nullptr );
+                ControllerFeatures aHelper( xAsFormController );
                 (void)aHelper->commitCurrentControl();
             }
 
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 06172a19821e..b4bd0f3dedb9 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -194,8 +194,8 @@ namespace svx
     }
 
 
-    ControllerFeatures::ControllerFeatures( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback )
-        :m_pInvalidationCallback( _pInvalidationCallback )
+    ControllerFeatures::ControllerFeatures( const Reference< XFormController >& _rxController )
+        :m_pInvalidationCallback( nullptr )
     {
         assign( _rxController );
     }
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index de224754b681..37dfa672c1da 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -92,13 +92,9 @@ namespace svx
             @param _rxController
                 The form controller which the helper should be responsible for. Must not
                 be <NULL/>, and must have a valid model (form).
-
-            @param _pInvalidationCallback
-                the callback for invalidating feature states
         */
         ControllerFeatures(
-            const css::uno::Reference< css::form::runtime::XFormController >& _rxController,
-            IControllerFeatureInvalidation* _pInvalidationCallback
+            const css::uno::Reference< css::form::runtime::XFormController >& _rxController
         );
 
         /// dtor
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 8243f49ea47c..b6a7d568644a 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -381,7 +381,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
 }
 
 bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
-    short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
+    short nMinMov, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
 {
     bool bRet=false;
     UnmarkAllObj();
@@ -389,14 +389,8 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
 
     ImpClearConnectMarker();
 
-    if (pPV!=nullptr)
-    {
-        pCreatePV=pPV;
-    }
-    else
-    {
-        pCreatePV = GetSdrPageView();
-    }
+    pCreatePV = GetSdrPageView();
+
     if (pCreatePV!=nullptr)
     { // otherwise no side registered!
         OUString aLay(maActualLayer);
@@ -519,7 +513,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
 
 bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov)
 {
-    return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,nullptr,Rectangle(), nullptr);
+    return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,Rectangle(), nullptr);
 }
 
 bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject)
@@ -533,13 +527,13 @@ bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov
         nIdent = pPreparedFactoryObject->GetObjIdentifier();
     }
 
-    return ImpBegCreateObj(nInvent, nIdent, rPnt, nullptr, nMinMov, nullptr, Rectangle(), pPreparedFactoryObject);
+    return ImpBegCreateObj(nInvent, nIdent, rPnt, nullptr, nMinMov, Rectangle(), pPreparedFactoryObject);
 }
 
 bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
     OutputDevice* pOut, short nMinMov)
 {
-    return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,nullptr,
+    return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,
         Rectangle(rPnt,Size(rObjSiz.Width()+1,rObjSiz.Height()+1)), nullptr);
 }
 
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index f162b5e0cf70..d43b283383e9 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -127,7 +127,7 @@ public:
 
     /// wrappers for non-const calls at GraphicObject
     void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData, OutputDevice* pFirstFrameOutDev = nullptr)
-    { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, nullptr, GraphicManagerDrawFlags::STANDARD, pFirstFrameOutDev); }
+    { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pFirstFrameOutDev); }
     void StopGraphicAnimation(OutputDevice* pOut, long nExtraData = 0) { maGrfObj.StopAnimation(pOut, nExtraData); }
 
     virtual Size GetTwipSize() const override;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index fa9ce3e79be6..e7358a4ba289 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2836,7 +2836,7 @@ SwFrameFormat* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
                 if (pSdrTextObj != pNewObj)
                 {
                     // Objekt in der Z-Order-Liste ersetzen
-                    m_pMSDffManager->ExchangeInShapeOrder(pSdrTextObj, 0,nullptr, pNewObj);
+                    m_pMSDffManager->ExchangeInShapeOrder(pSdrTextObj, 0, pNewObj);
                     // Objekt jetzt noch loeschen
                     SdrObject::Free( pRecord->pObj );
                     // und das neue Objekt merken.
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 04b5394408a5..f979bf82c0a7 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -683,7 +683,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
                     {
                         if (pOurNewObject != pObject)
                         {
-                            m_pMSDffManager->ExchangeInShapeOrder( pObject, 0, nullptr,
+                            m_pMSDffManager->ExchangeInShapeOrder( pObject, 0,
                                 pOurNewObject );
 
                             // delete and destroy old SdrGrafObj from page
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index e952a2a328e4..fb415b5267ef 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -44,11 +44,6 @@ typedef rtl::Reference< MutableTreeNode > MutableTreeNodeRef;
 typedef std::vector< MutableTreeNodeRef > TreeNodeVector;
 typedef rtl::Reference< MutableTreeDataModel > MutableTreeDataModelRef;
 
-void implThrowIllegalArgumentException() throw( IllegalArgumentException )
-{
-    throw IllegalArgumentException();
-}
-
 class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< XMutableTreeDataModel, XServiceInfo >,
                              public MutexAndBroadcastHelper
 {
@@ -122,7 +117,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
 
-    static MutableTreeNode* getImplementation( const Reference< XTreeNode >& xNode, bool bThrows ) throw (IllegalArgumentException);
+    static MutableTreeNode* getImplementation( const Reference< XTreeNode >& xNode );
     static Reference< XTreeNode > getReference( MutableTreeNode* pNode )
     {
         return Reference< XTreeNode >( pNode );
@@ -283,13 +278,9 @@ void MutableTreeNode::setParent( MutableTreeNode* pParent )
     mpParent = pParent;
 }
 
-MutableTreeNode* MutableTreeNode::getImplementation( const Reference< XTreeNode >& xNode, bool bThrows ) throw (IllegalArgumentException)
+MutableTreeNode* MutableTreeNode::getImplementation( const Reference< XTreeNode >& xNode )
 {
-    MutableTreeNode* pImpl = dynamic_cast< MutableTreeNode* >( xNode.get() );
-    if( bThrows && !pImpl )
-        implThrowIllegalArgumentException();
-
-    return pImpl;
+    return dynamic_cast< MutableTreeNode* >( xNode.get() );
 }
 
 void MutableTreeNode::broadcast_changes()
@@ -478,7 +469,7 @@ sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNod
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
 
-    MutableTreeNodeRef xImpl( MutableTreeNode::getImplementation( xNode, false ) );
+    MutableTreeNodeRef xImpl( MutableTreeNode::getImplementation( xNode ) );
     if( xImpl.is() )
     {
         sal_Int32 nChildCount = maChildren.size();
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 8823d04a1525..00f162ed6e8d 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -171,7 +171,7 @@ struct FactoryInfo
 
         // If you call set-methods - we check for changes of values and mark it.
         // But if you wish to set it without that... you must initialize it!
-        void initInstalled        ( bool               bNewInstalled        ) { bInstalled        = bNewInstalled; }
+        void initInstalled        ()                                       { bInstalled        = true; }
         void initFactory          ( const OUString& sNewFactory          ) { sFactory          = sNewFactory; }
         void initShortName        ( const OUString& sNewShortName        ) { sShortName        = sNewShortName; }
         void initWindowAttributes ( const OUString& sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes; }
@@ -724,7 +724,7 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFa
             pInfo = &(m_lFactories[eFactory]);
             pInfo->free();
 
-            pInfo->initInstalled( true     );
+            pInfo->initInstalled();
             pInfo->initFactory  ( sFactoryName );
 
             if (lValues[nPropertyStart+PROPERTYHANDLE_SHORTNAME] >>= sTemp)
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 2f038ee3cef7..944ffffce8e7 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -198,7 +198,7 @@ private:
     void                    GarbageCollect( long );
     void                    ReleaseFromGarbageCollect();
 
-    void                    ApplyGlyphTransform( int nGlyphFlags, FT_GlyphRec_*, bool ) const;
+    void                    ApplyGlyphTransform( int nGlyphFlags, FT_GlyphRec_* ) const;
     void                    ApplyGSUB( const FontSelectPattern& );
 
     ServerFontLayoutEngine* GetLayoutEngine();
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index c71355780b6e..7fa7b1a2f1e4 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1883,7 +1883,7 @@ void TextEngine::RecalcTextPortion( sal_uInt32 nPara, sal_Int32 nStartPos, sal_I
     }
 }
 
-void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange, TextSelection const* pSelection )
+void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pSelection )
 {
     if ( !GetUpdateMode() )
         return;
@@ -1904,7 +1904,6 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
         pSelStart = !bInvers ? &pSelection->GetStart() : &pSelection->GetEnd();
         pSelEnd = bInvers ? &pSelection->GetStart() : &pSelection->GetEnd();
     }
-    SAL_WARN_IF( pPaintRange && !(pPaintRange->GetStart() < pPaintRange->GetEnd()), "vcl", "ImpPaint: Paint-Range?!" );
 
     const StyleSettings& rStyleSettings = pOutDev->GetSettings().GetStyleSettings();
 
@@ -1917,8 +1916,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
             return;
 
         const long nParaHeight = CalcParaHeight( nPara );
-        if ( ( !pPaintArea || ( ( nY + nParaHeight ) > pPaintArea->Top() ) )
-                && ( !pPaintRange || ( ( nPara >= pPaintRange->GetStart().GetPara() ) && ( nPara <= pPaintRange->GetEnd().GetPara() ) ) ) )
+        if ( !pPaintArea || ( ( nY + nParaHeight ) > pPaintArea->Top() ) )
         {
             // for all lines of the paragraph
             sal_Int32 nIndex = 0;
@@ -1926,10 +1924,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
             {
                 Point aTmpPos( rStartPos.X() + rLine.GetStartX(), nY );
 
-                if ( ( !pPaintArea || ( ( nY + mnCharHeight ) > pPaintArea->Top() ) )
-                    && ( !pPaintRange || (
-                        ( TextPaM( nPara, rLine.GetStart() ) < pPaintRange->GetEnd() ) &&
-                        ( TextPaM( nPara, rLine.GetEnd() ) > pPaintRange->GetStart() ) ) ) )
+                if ( !pPaintArea || ( ( nY + mnCharHeight ) > pPaintArea->Top() ) )
                 {
                     // for all Portions of the line
                     nIndex = rLine.GetStart();
@@ -1946,10 +1941,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
                         aTmpPos.X() = rStartPos.X() + ImpGetOutputOffset( nPara, &rLine, nIndex, nIndex );
 
                         // only print if starting in the visible region
-                        if ( ( ( aTmpPos.X() + nTxtWidth ) >= 0 )
-                            && ( !pPaintRange || (
-                                ( TextPaM( nPara, nIndex ) < pPaintRange->GetEnd() ) &&
-                                    ( TextPaM( nPara, nIndex + pTextPortion->GetLen() ) > pPaintRange->GetStart() ) ) ) )
+                        if ( ( aTmpPos.X() + nTxtWidth ) >= 0 )
                         {
                             switch ( pTextPortion->GetKind() )
                             {
@@ -1966,20 +1958,6 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
                                         sal_Int32 nTmpIndex = nIndex;
                                         sal_Int32 nEnd = nTmpIndex + pTextPortion->GetLen();
                                         Point aPos = aTmpPos;
-                                        if ( pPaintRange )
-                                        {
-                                            // maybe not print all of it
-                                            if ( ( pPaintRange->GetStart().GetPara() == nPara )
-                                                    && ( nTmpIndex < pPaintRange->GetStart().GetIndex() ) )
-                                            {
-                                                nTmpIndex = pPaintRange->GetStart().GetIndex();
-                                            }
-                                            if ( ( pPaintRange->GetEnd().GetPara() == nPara )
-                                                    && ( nEnd > pPaintRange->GetEnd().GetIndex() ) )
-                                            {
-                                                nEnd = pPaintRange->GetEnd().GetIndex();
-                                            }
-                                        }
 
                                         bool bDone = false;
                                         if ( pSelStart )
@@ -2034,7 +2012,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
                                     break;
                                 case PORTIONKIND_TAB:
                                     // for HideSelection() only Range, pSelection = 0.
-                                    if ( pSelStart || pPaintRange )
+                                    if ( pSelStart )
                                     {
                                         const Rectangle aTabArea( aTmpPos, Point( aTmpPos.X()+nTxtWidth, aTmpPos.Y()+mnCharHeight-1 ) );
                                         bool bDone = false;
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index df8414bab346..4893d30eeb53 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -314,7 +314,7 @@ void TextView::ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartP
         }
     }
 
-    mpImpl->mpTextEngine->ImpPaint(&rRenderContext, rStartPos, pPaintArea, nullptr, pSelection);
+    mpImpl->mpTextEngine->ImpPaint(&rRenderContext, rStartPos, pPaintArea, pSelection);
 }
 
 void TextView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index c7c59bb681d7..55df59ef0bab 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -747,8 +747,7 @@ static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyph
         rGlyphId = rFont.GetRawGlyphIndex( rGlyphId );
 }
 
-void ServerFont::ApplyGlyphTransform( int nGlyphFlags,
-    FT_Glyph pGlyphFT, bool bForBitmapProcessing ) const
+void ServerFont::ApplyGlyphTransform( int nGlyphFlags, FT_Glyph pGlyphFT ) const
 {
     int nAngle = GetFontSelData().mnOrientation;
     // shortcut most common case
@@ -802,7 +801,7 @@ void ServerFont::ApplyGlyphTransform( int nGlyphFlags,
         FT_Glyph_Transform( pGlyphFT, nullptr, &aVector );
 
         // orthogonal transforms are better handled by bitmap operations
-        if( bStretched || (bForBitmapProcessing && (nAngle % 900) != 0) )
+        if( bStretched )
         {
             // apply non-orthogonal or stretch transformations
             FT_Glyph_Transform( pGlyphFT, &aMatrix, nullptr );
@@ -942,7 +941,7 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const
     FT_Glyph pGlyphFT;
     FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );
 
-    ApplyGlyphTransform( nGlyphFlags, pGlyphFT, false );
+    ApplyGlyphTransform( nGlyphFlags, pGlyphFT );
     rGD.SetDelta( (pGlyphFT->advance.x + 0x8000) >> 16, -((pGlyphFT->advance.y + 0x8000) >> 16) );
 
     FT_BBox aBbox;
@@ -1285,7 +1284,7 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
     tools::PolyPolygon aToolPolyPolygon;
     PolyArgs aPolyArg( aToolPolyPolygon, nMaxPoints );
 
-    /*int nAngle =*/ ApplyGlyphTransform( nGlyphFlags, pGlyphFT, false );
+    /*int nAngle =*/ ApplyGlyphTransform( nGlyphFlags, pGlyphFT );
 
     FT_Outline_Funcs aFuncs;
     aFuncs.move_to  = &FT_move_to;