loplugin:constantparam

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

compilerplugins/clang/constantparam.bitmask.results

@@ -13,10 +13,13 @@ dbaccess/source/filter/xml/xmlExport.hxx:172
 include/framework/framelistanalyzer.hxx:181
     void framework::FrameListAnalyzer::FrameListAnalyzer(const class com::sun::star::uno::Reference<class com::sun::star::frame::XFramesSupplier> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,enum FrameAnalyzerFlags)
     enum FrameAnalyzerFlags eDetectMode setBits=0x4
-include/svl/itemset.hxx:134
+include/sfx2/objsh.hxx:458
+    void SfxObjectShell::FinishedLoading(enum SfxLoadedFlags)
+    enum SfxLoadedFlags nWhich setBits=0x1
+include/svl/itemset.hxx:188
     void SfxItemSet::PutExtended(const class SfxItemSet &,enum SfxItemState,enum SfxItemState)
     enum SfxItemState eDefaultAs setBits=0x20 clearBits=0xf
-include/svtools/brwbox.hxx:441
+include/svtools/brwbox.hxx:439
     void BrowseBox::InsertDataColumn(unsigned short,const class rtl::OUString &,long,enum HeaderBarItemBits,unsigned short)
     enum HeaderBarItemBits nBits setBits=0x410 clearBits=0x3ac
 include/svtools/wizardmachine.hxx:173
@@ -32,7 +35,7 @@ sc/inc/rangelst.hxx:45
     void ScRangeList::Format(class rtl::OUString &,enum ScRefFlags,class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t) const
     enum ScRefFlags nFlags setBits=0x8000 clearBits=0x7f80
 sc/inc/xmlwrap.hxx:92
-    _Bool ScXMLImportWrapper::Import(enum ImportFlags,unsigned int &)
+    _Bool ScXMLImportWrapper::Import(enum ImportFlags,class ErrCode &)
     enum ImportFlags nMode setBits=0x1
 xmloff/inc/MetaExportComponent.hxx:32
     void XMLMetaExportComponent::XMLMetaExportComponent(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum SvXMLExportFlags)

connectivity/source/drivers/writer/WTable.cxx

@@ -173,15 +173,12 @@ void OWriterTable::fillColumns()
 
 OWriterTable::OWriterTable(sdbcx::OCollection* _pTables, OWriterConnection* _pConnection,
                            const OUString& Name,
-                           const OUString& Type,
-                           const OUString& Description,
-                           const OUString& SchemaName,
-                           const OUString& CatalogName
+                           const OUString& Type
                           ) : OWriterTable_BASE(_pTables,_pConnection,Name,
                                       Type,
-                                      Description,
-                                      SchemaName,
-                                      CatalogName)
+                                      OUString()/*Description*/,
+                                      OUString()/*SchemaName*/,
+                                      OUString()/*CatalogName*/)
     ,m_pWriterConnection(_pConnection)
     ,m_nStartCol(0)
     ,m_nDataCols(0)

connectivity/source/inc/writer/WTable.hxx

@@ -77,10 +77,7 @@ private:
 public:
     OWriterTable(sdbcx::OCollection* _pTables, OWriterConnection* _pConnection,
                  const OUString& Name,
-                 const OUString& Type,
-                 const OUString& Description = OUString(),
-                 const OUString& SchemaName = OUString(),
-                 const OUString& CatalogName = OUString()
+                 const OUString& Type
                 );
 
     virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override;

dbaccess/source/ui/app/AppController.cxx

@@ -1368,7 +1368,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
             case SID_MAIL_SENDDOC:
                 {
                     SfxMailModel aSendMail;
-                    if ( aSendMail.AttachDocument(OUString(),getModel(), OUString()) == SfxMailModel::SEND_MAIL_OK )
+                    if ( aSendMail.AttachDocument(getModel(), OUString()) == SfxMailModel::SEND_MAIL_OK )
                         aSendMail.Send( getFrame() );
                 }
                 break;

dbaccess/source/ui/app/AppControllerGen.cxx

@@ -715,7 +715,7 @@ void OApplicationController::doAction(sal_uInt16 _nId, const ElementOpenMode _eO
                 Reference< XModel > xModel(componentIter->second,UNO_QUERY);
 
                 // Send document as e-Mail using stored/default type
-                eResult = aSendMail.AttachDocument(OUString(),xModel,componentIter->first);
+                eResult = aSendMail.AttachDocument(xModel,componentIter->first);
                 ::comphelper::disposeComponent(xModel);
             }
             catch(const Exception&)

desktop/source/deployment/manager/dp_commandenvironments.cxx

@@ -71,10 +71,10 @@ void BaseCommandEnv::handle(
 {
 }
 
-void BaseCommandEnv::handle_(bool approve, bool abort,
+void BaseCommandEnv::handle_(bool approve,
                              Reference< task::XInteractionRequest> const & xRequest )
 {
-    if (!approve && !abort)
+    if (!approve)
     {
         //not handled so far -> forwarding
         if (m_forwardHandler.is())
@@ -101,15 +101,6 @@ void BaseCommandEnv::handle_(bool approve, bool abort,
                     approve = false;
                 }
             }
-            else if (abort) {
-                Reference< task::XInteractionAbort > xInteractionAbort(
-                    pConts[ pos ], uno::UNO_QUERY );
-                if (xInteractionAbort.is()) {
-                    xInteractionAbort->select();
-                    // don't query again for ongoing continuations:
-                    abort = false;
-                }
-            }
         }
     }
 
@@ -158,7 +149,7 @@ void TmpRepositoryCommandEnv::handle(
         approve = true;
     }
 
-    handle_(approve, false/*abort*/, xRequest);
+    handle_(approve, xRequest);
 }
 
 
@@ -195,7 +186,7 @@ void LicenseCommandEnv::handle(
         }
     }
 
-    handle_(approve, false/*abort*/, xRequest);
+    handle_(approve, xRequest);
 }
 
 
@@ -219,7 +210,7 @@ void NoLicenseCommandEnv::handle(
     {
         approve = true;
     }
-    handle_(approve, false/*abort*/, xRequest);
+    handle_(approve, xRequest);
 }
 
 SilentCheckPrerequisitesCommandEnv::SilentCheckPrerequisitesCommandEnv()
@@ -238,7 +229,7 @@ void SilentCheckPrerequisitesCommandEnv::handle(
 
     if (request >>= licExc)
     {
-        handle_(true, false, xRequest); // approve = true, abort = false
+        handle_(true, xRequest); // approve = true
     }
     else if ((request >>= platformExc)
              || (request >>= depExc))

desktop/source/deployment/manager/dp_commandenvironments.hxx

@@ -37,7 +37,7 @@ class BaseCommandEnv
 protected:
     css::uno::Reference< css::task::XInteractionHandler> m_forwardHandler;
 
-    void handle_(bool approve, bool abort,
+    void handle_(bool approve,
                  css::uno::Reference< css::task::XInteractionRequest> const & xRequest );
 public:
     virtual ~BaseCommandEnv() override;

editeng/source/editeng/editobj.cxx

@@ -433,9 +433,9 @@ bool EditTextObject::operator==( const EditTextObject& rCompare ) const
     return mpImpl->operator==(*rCompare.mpImpl);
 }
 
-bool EditTextObject::Equals( const EditTextObject& rCompare, bool bComparePool ) const
+bool EditTextObject::Equals( const EditTextObject& rCompare ) const
 {
-    return mpImpl->Equals(*rCompare.mpImpl, bComparePool);
+    return mpImpl->Equals(*rCompare.mpImpl, false/*bComparePool*/);
 }
 
 // #i102062#

filter/source/msfilter/msdffimp.cxx

@@ -3940,8 +3940,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons
         {
             // TODO/LATER: in future probably the correct aspect should be provided here
             // #i32596# - pass <nCalledByGroup> to method
-            pRet = ImportOLE( GetPropertyValue( DFF_Prop_pictureId, 0 ), aGraf, rObjData.aBoundRect, aVisArea, rObjData.nCalledByGroup,
-                              embed::Aspects::MSOLE_CONTENT );
+            pRet = ImportOLE( GetPropertyValue( DFF_Prop_pictureId, 0 ), aGraf, rObjData.aBoundRect, aVisArea, rObjData.nCalledByGroup );
         }
         if( !pRet )
         {
@@ -6558,8 +6557,7 @@ SdrObject* SvxMSDffManager::ImportOLE( sal_uInt32 nOLEId,
                                        const Graphic& rGrf,
                                        const tools::Rectangle& rBoundRect,
                                        const tools::Rectangle& rVisArea,
-                                       const int /* _nCalledByGroup */,
-                                       sal_Int64 nAspect ) const
+                                       const int /* _nCalledByGroup */ ) const
 {
     SdrObject* pRet = nullptr;
     OUString sStorageName;
@@ -6569,7 +6567,7 @@ SdrObject* SvxMSDffManager::ImportOLE( sal_uInt32 nOLEId,
     if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg ))
         pRet = CreateSdrOLEFromStorage( sStorageName, xSrcStg, xDstStg,
                                         rGrf, rBoundRect, rVisArea, pStData, nError,
-                                        nSvxMSDffOLEConvFlags, nAspect, maBaseURL);
+                                        nSvxMSDffOLEConvFlags, embed::Aspects::MSOLE_CONTENT, maBaseURL);
     return pRet;
 }
 

filter/source/msfilter/svdfppt.cxx

@@ -1777,8 +1777,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId,
                                            const Graphic& rGraf,
                                            const tools::Rectangle& rBoundRect,
                                            const tools::Rectangle& rVisArea,
-                                           const int /*_nCalledByGroup*/,
-                                           sal_Int64 /*nAspect*/ ) const
+                                           const int /*_nCalledByGroup*/ ) const
 {
     SdrObject* pRet = nullptr;
 

framework/inc/dispatch/closedispatcher.hxx

@@ -168,9 +168,6 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
                     ignores it and open/close other documents, we can't know
                     which state the office has after closing of this frame.
 
-            @param  bAllowSuspend
-                    force calling of XController->suspend().
-
             @param  bCloseAllOtherViewsToo
                     if there are other top level frames, which
                     contains views to the same document then our m_xCloseFrame,
@@ -180,10 +177,9 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
             @return [boolean]
                     sal_True if closing was successfully.
          */
-        bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame                ,
-                                                     bool                                   bAllowSuspend         ,
-                                                     bool                                   bCloseAllOtherViewsToo,
-                                                     bool&                                  bControllerSuspended  );
+        bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame,
+                                           bool                                   bCloseAllOtherViewsToo,
+                                           bool&                                  bControllerSuspended  );
 
         /** @short  close the member m_xCloseFrame.
 

framework/source/dispatch/closedispatcher.cxx

@@ -324,7 +324,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void)
     //    document inside our own frame and decide then again, what has to be done!
     else
     {
-        if (implts_prepareFrameForClosing(m_xCloseFrame, true/*bAllowSuspend*/, bCloseAllViewsToo, bControllerSuspended))
+        if (implts_prepareFrameForClosing(m_xCloseFrame, bCloseAllViewsToo, bControllerSuspended))
         {
             // OK; this frame is empty now.
             // Check the environment again to decide, what is the next step.
@@ -429,10 +429,9 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void)
     }
 }
 
-bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame                ,
-                                                          bool                                   bAllowSuspend         ,
-                                                          bool                                   bCloseAllOtherViewsToo,
-                                                          bool&                                  bControllerSuspended  )
+bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame,
+                                                    bool                                   bCloseAllOtherViewsToo,
+                                                    bool&                                  bControllerSuspended  )
 {
     // Frame already dead ... so this view is closed ... is closed ... is ... .-)
     if (! xFrame.is())
@@ -462,9 +461,7 @@ bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< c
         }
     }
 
-    // If allowed - inform user about modified documents or
-    // still running jobs (e.g. printing).
-    if (bAllowSuspend)
+    // Inform user about modified documents or still running jobs (e.g. printing).
     {
         css::uno::Reference< css::frame::XController > xController = xFrame->getController();
         if (xController.is()) // some views don't uses a controller .-( (e.g. the help window)

include/editeng/editobj.hxx

@@ -131,12 +131,9 @@ public:
 
     bool operator==( const EditTextObject& rCompare ) const;
 
-    /** Compare possibly ignoring SfxItemPool pointer.
-        @param  bComparePool
-                if <FALSE/> ignore SfxItemPool pointer,
-                if <TRUE/> compare also SfxItemPool pointer (identical to operator==())
+    /** Compare, ignoring SfxItemPool pointer.
      */
-    bool Equals( const EditTextObject& rCompare, bool bComparePool ) const;
+    bool Equals( const EditTextObject& rCompare ) const;
 
     // #i102062#
     bool isWrongListEqual(const EditTextObject& rCompare) const;

include/filter/msfilter/msdffimp.hxx

@@ -475,8 +475,7 @@ protected:
                                   const Graphic& rGraf,
                                   const tools::Rectangle& rBoundRect,
                                   const tools::Rectangle& rVisArea,
-                                  const int _nCalledByGroup,
-                                  sal_Int64 nAspect ) const;
+                                  const int _nCalledByGroup ) const;
     static css::uno::Reference < css::embed::XEmbeddedObject > CheckForConvertToSOObj(
                 sal_uInt32 nConvertFlags, SotStorage& rSrcStg,
                 const css::uno::Reference < css::embed::XStorage >& xDestStg,

include/filter/msfilter/svdfppt.hxx

@@ -581,8 +581,7 @@ protected:
                                 const Graphic& rGraf,
                                 const tools::Rectangle& rBoundRect,
                                 const tools::Rectangle& rVisArea,
-                                const int _nCalledByGroup,
-                                sal_Int64 nAspect
+                                const int _nCalledByGroup
                             ) const override;
     SvMemoryStream*         ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const;
     SdrPage*                MakeBlancPage(bool bMaster) const;

include/sfx2/mailmodelapi.hxx

@@ -78,16 +78,13 @@ public:
     /** attaches a document to the current attachment list, can be called more than once.
     *   at the moment there will be a dialog for export executed for every model which is going to be attached.
     *
-    * \param sDocumentType
-        The doc type to export. PDF will be at the moment only a direct export (no dialog).
     * \param xModel
         The current model to attach
     * \param sAttachmentTitle
         The title which will be used as attachment title
     * \return @see error code
     */
-    SendMailResult      AttachDocument( const OUString& sDocumentType,
-                                        const css::uno::Reference< css::uno::XInterface >& xFrameOrModel,
+    SendMailResult      AttachDocument( const css::uno::Reference< css::uno::XInterface >& xFrameOrModel,
                                         const OUString& sAttachmentTitle );
 
     SendMailResult      SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame,

include/svtools/imapobj.hxx

@@ -70,9 +70,9 @@ protected:
 
     // helper methods
     static void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100);
-    void AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const;
+    void AppendCERNURL(OStringBuffer& rBuf) const;
     static void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100);
-    void AppendNCSAURL(OStringBuffer&rBuf, const OUString& rBaseURL) const;
+    void AppendNCSAURL(OStringBuffer&rBuf) const;
 
 public:
 
@@ -90,8 +90,8 @@ public:
     virtual sal_uInt16  GetType() const = 0;
     virtual bool        IsHit( const Point& rPoint ) const = 0;
 
-    void                Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
-    void                Read( SvStream& rIStm, const OUString& rBaseURL );
+    void                Write ( SvStream& rOStm ) const;
+    void                Read( SvStream& rIStm );
 
     const OUString&     GetURL() const { return aURL; }
     void                SetURL( const OUString& rURL ) { aURL = rURL; }

include/svtools/table/tablerenderer.hxx

@@ -95,9 +95,6 @@ namespace svt { namespace table
             @param _bActive
                 <TRUE/> if and only if the column whose column is to be painted
                 contains the active cell.
-            @param _bSelected
-                <TRUE/> if and only if the column whose column is to be painted
-                is selected currently.
             @param _rDevice
                 denotes the device to paint onto
             @param _rArea
@@ -105,7 +102,7 @@ namespace svt { namespace table
             @param _rStyle
                 the style to be used for drawing
         */
-        virtual void    PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected,
+        virtual void    PaintColumnHeader( ColPos _nCol, bool _bActive,
                             OutputDevice& _rDevice, const tools::Rectangle& _rArea,
                             const StyleSettings& _rStyle ) = 0;
 

include/xmloff/txtparae.hxx

@@ -282,7 +282,6 @@ protected:
         bool bProgress,
         bool bExportParagraph = true,
         const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = nullptr,
-        bool bExportLevels = true,
         TextPNS eExtensionNS = TextPNS::ODF);
     void exportParagraph(
         const css::uno::Reference< css::text::XTextContent > & rTextContent,

l10ntools/inc/export.hxx

@@ -123,7 +123,7 @@ public:
         sTitle[ rId ] = rTitle;
         bTitleFirst[ rId ] = true;
     }
-    bool GetText( OString &rReturn, StringType nTyp, const OString &nLangIndex, bool bDel = false );
+    bool GetText( OString &rReturn, const OString &nLangIndex, bool bDel = false );
 
     /**
       Generate QTZ string with ResData

l10ntools/source/cfgmerge.cxx

@@ -470,7 +470,7 @@ void CfgMerge::WorkOnResourceEnd()
                 sCur = aLanguages[ i ];
 
                 OString sContent;
-                pEntrys->GetText( sContent, StringType::Text, sCur , true );
+                pEntrys->GetText( sContent, sCur, true );
                 if (
                     ( !sCur.equalsIgnoreAsciiCase("en-US") ) && !sContent.isEmpty())
                 {

l10ntools/source/helpmerge.cxx

@@ -235,7 +235,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResDa
                 pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
                 if( pEntrys != nullptr)
                 {
-                    pEntrys->GetText( sNewText, StringType::Text, sCur, true );
+                    pEntrys->GetText( sNewText, sCur, true );
                     if (helper::isWellFormedXML(XMLUtil::QuotHTML(sNewText)))
                     {
                         sNewdata = sSourceText.copy(0,nPreSpaces) + sNewText;

l10ntools/source/lngmerge.cxx

@@ -230,7 +230,7 @@ bool LngParser::Merge(
                         if( !sLang.isEmpty() )
                         {
                             OString sNewText;
-                            pEntrys->GetText( sNewText, StringType::Text, sLang, true );
+                            pEntrys->GetText( sNewText, sLang, true );
                             if( sLang == "qtz" )
                                 continue;
 
@@ -268,7 +268,7 @@ bool LngParser::Merge(
                 {
 
                     OString sNewText;
-                    pEntrys->GetText( sNewText, StringType::Text, sCur, true );
+                    pEntrys->GetText( sNewText, sCur, true );
                     if( sCur == "qtz" )
                         continue;
                     if ( !sNewText.isEmpty() && sCur != "x-comment")

l10ntools/source/merge.cxx

@@ -78,32 +78,14 @@ ResData::ResData( const OString &rGId, const OString &rFilename)
 
 
 bool MergeEntrys::GetText( OString &rReturn,
-    StringType nTyp, const OString &nLangIndex, bool bDel )
+    const OString &nLangIndex, bool bDel )
 {
     bool bReturn = true;
-    switch ( nTyp ) {
-        case StringType::Text :
-            rReturn = sText[ nLangIndex ];
-            if ( bDel )
-                sText[ nLangIndex ] = "";
-            bReturn = bTextFirst[ nLangIndex ];
-            bTextFirst[ nLangIndex ] = false;
-            break;
-        case StringType::QuickHelpText :
-            rReturn = sQuickHelpText[ nLangIndex ];
-            if ( bDel )
-                sQuickHelpText[ nLangIndex ] = "";
-            bReturn = bQuickHelpTextFirst[ nLangIndex ];
-            bQuickHelpTextFirst[ nLangIndex ] = false;
-            break;
-        case StringType::Title :
-            rReturn = sTitle[ nLangIndex ];
-            if ( bDel )
-                sTitle[ nLangIndex ] = "";
-            bReturn = bTitleFirst[ nLangIndex ];
-            bTitleFirst[ nLangIndex ] = false;
-            break;
-    }
+    rReturn = sText[ nLangIndex ];
+    if ( bDel )
+        sText[ nLangIndex ] = "";
+    bReturn = bTextFirst[ nLangIndex ];
+    bTextFirst[ nLangIndex ] = false;
     return bReturn;
 }
 

l10ntools/source/propmerge.cxx

@@ -205,7 +205,7 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil
                 MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrys( &aResData );
                 if( pEntrys )
                 {
-                    pEntrys->GetText( sNewText, StringType::Text, m_sLang );
+                    pEntrys->GetText( sNewText, m_sLang );
                 }
             }
             if( !sNewText.isEmpty() )

l10ntools/source/treemerge.cxx

@@ -168,7 +168,7 @@ namespace
                             pMergeDataFile->GetMergeEntrys( &aResData );
                         if( pEntrys )
                         {
-                            pEntrys->GetText( sNewText, StringType::Text, rLang );
+                            pEntrys->GetText( sNewText, rLang );
                         }
                     }
                     else if( rLang == "qtz" )

l10ntools/source/xrmmerge.cxx

@@ -410,8 +410,7 @@ void XRMResMerge::WorkOnDesc(
                 sCur = aLanguages[ n ];
                 OString sContent;
                 if ( !sCur.equalsIgnoreAsciiCase("en-US")  &&
-                    ( pEntrys->GetText(
-                        sContent, StringType::Text, sCur, true )) &&
+                    ( pEntrys->GetText( sContent, sCur, true )) &&
                     !sContent.isEmpty())
                 {
                     OString sText( sContent );
@@ -498,8 +497,7 @@ void XRMResMerge::EndOfText(
                 sCur = aLanguages[ n ];
                 OString sContent;
                 if (!sCur.equalsIgnoreAsciiCase("en-US") &&
-                    ( pEntrys->GetText(
-                        sContent, StringType::Text, sCur, true )) &&
+                    ( pEntrys->GetText( sContent, sCur, true )) &&
                     !sContent.isEmpty() &&
                     helper::isWellFormedXML( sContent ))
                 {

package/inc/ZipPackageStream.hxx

@@ -73,8 +73,9 @@ private:
 
     /// Check that m_xStream implements io::XSeekable and return it
     css::uno::Reference< css::io::XInputStream > const & GetOwnSeekStream();
+    /// get raw data using unbuffered stream
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData( const bool bUseBufferedStream = true );
+    css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData();
 
 public:
     bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}

package/source/zippackage/ZipPackageStream.cxx

@@ -572,7 +572,7 @@ bool ZipPackageStream::saveChild(
 
     if ( !bUseNonSeekableAccess )
     {
-        xStream = getRawData( false );
+        xStream = getRawData();
 
         if ( !xStream.is() )
         {
@@ -708,7 +708,7 @@ bool ZipPackageStream::saveChild(
         // to get a new version of it as we can't seek backwards.
         if ( IsPackageMember() )
         {
-            xStream = getRawData( false );
+            xStream = getRawData();
             if ( !xStream.is() )
             {
                 // Make sure that we actually _got_ a new one !
@@ -937,13 +937,13 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput
     m_nStreamMode = PACKAGE_STREAM_DETECT;
 }
 
-uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData( const bool bUseBufferedStream )
+uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
 {
     try
     {
         if ( IsPackageMember() )
         {
-            return m_rZipPackage.getZipFile().getRawData( aEntry, GetEncryptionData(), m_bIsEncrypted, m_rZipPackage.GetSharedMutexRef(), bUseBufferedStream );
+            return m_rZipPackage.getZipFile().getRawData( aEntry, GetEncryptionData(), m_bIsEncrypted, m_rZipPackage.GetSharedMutexRef(), false/*bUseBufferedStream*/ );
         }
         else if ( GetOwnSeekStream().is() )
         {

sc/inc/scabstdlg.hxx

@@ -517,7 +517,6 @@ public:
     virtual VclPtr<AbstractScImportOptionsDlg> CreateScImportOptionsDlg ( bool                    bAscii,
                                                                     const ScImportOptions*  pOptions,
                                                                     const OUString*         pStrTitle = nullptr,
-                                                                    bool                    bMultiByte = false,
                                                                     bool                    bOnlyDbtoolsEncodings = false,
                                                                     bool                    bImport = true ) = 0;
 

sc/source/core/data/column.cxx

@@ -874,7 +874,6 @@ class CopyToClipHandler
     ScColumn& mrDestCol;
     sc::ColumnBlockPosition maDestPos;
     sc::ColumnBlockPosition* mpDestPos;
-    bool mbCopyNotes;
 
     void setDefaultAttrsToDest(size_t nRow, size_t nSize)
     {
@@ -884,8 +883,8 @@ class CopyToClipHandler
     }
 
 public:
-    CopyToClipHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, sc::ColumnBlockPosition* pDestPos, bool bCopyNotes) :
-        mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos), mbCopyNotes(bCopyNotes)
+    CopyToClipHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, sc::ColumnBlockPosition* pDestPos) :
+        mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos)
     {
         if (mpDestPos)
             maDestPos = *mpDestPos;
@@ -989,8 +988,7 @@ public:
         if (bSet)
             setDefaultAttrsToDest(nTopRow, nDataSize);
 
-        if (mbCopyNotes)
-            mrSrcCol.DuplicateNotes(nTopRow, nDataSize, mrDestCol, maDestPos, false);
+        mrSrcCol.DuplicateNotes(nTopRow, nDataSize, mrDestCol, maDestPos, false);
     }
 };
 
@@ -1028,7 +1026,7 @@ void ScColumn::CopyToClip(
                           rCxt.isKeepScenarioFlags() ? (ScMF::All & ~ScMF::Scenario) : ScMF::All );
 
     {
-        CopyToClipHandler aFunc(*this, rColumn, rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), true/*CloneNotes*/);
+        CopyToClipHandler aFunc(*this, rColumn, rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol));
         sc::ParseBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
     }
 
@@ -1750,7 +1748,7 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const
     sc::SingleColumnSpanSet::SpansType aRanges;
     aRangeSet.getSpans(aRanges);
 
-    CopyToClipHandler aFunc(*this, rDestCol, nullptr, true/*bCopyNotes*/);
+    CopyToClipHandler aFunc(*this, rDestCol, nullptr);
     sc::CellStoreType::const_iterator itPos = maCells.begin();
     sc::SingleColumnSpanSet::SpansType::const_iterator it = aRanges.begin(), itEnd = aRanges.end();
     for (; it != itEnd; ++it)

sc/source/core/data/global.cxx

@@ -786,7 +786,7 @@ bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
         return true;
 
     if ( pObj1 && pObj2 )
-        return pObj1->Equals( *pObj2, false);
+        return pObj1->Equals( *pObj2);
 
     return false;
 }

sc/source/ui/attrdlg/scdlgfact.cxx

@@ -863,11 +863,10 @@ VclPtr<AbstractScImportOptionsDlg> ScAbstractDialogFactory_Impl::CreateScImportO
                                                                     bool                    bAscii,
                                                                     const ScImportOptions*  pOptions,
                                                                     const OUString*         pStrTitle,
-                                                                    bool                    bMultiByte,
                                                                     bool                    bOnlyDbtoolsEncodings,
                                                                     bool                    bImport )
 {
-    VclPtr<ScImportOptionsDlg> pDlg = VclPtr<ScImportOptionsDlg>::Create( nullptr, bAscii, pOptions,pStrTitle, bMultiByte,bOnlyDbtoolsEncodings, bImport );
+    VclPtr<ScImportOptionsDlg> pDlg = VclPtr<ScImportOptionsDlg>::Create( nullptr, bAscii, pOptions,pStrTitle, true/*bMultiByte*/,bOnlyDbtoolsEncodings, bImport );
     return VclPtr<AbstractScImportOptionsDlg_Impl>::Create( pDlg );
 }
 

sc/source/ui/attrdlg/scdlgfact.hxx

@@ -534,7 +534,6 @@ public:
     virtual VclPtr<AbstractScImportOptionsDlg> CreateScImportOptionsDlg ( bool                    bAscii,
                                                                     const ScImportOptions*  pOptions,
                                                                     const OUString*         pStrTitle = nullptr,
-                                                                    bool                    bMultiByte = false,
                                                                     bool                    bOnlyDbtoolsEncodings = false,
                                                                     bool                    bImport = true ) override;
     virtual VclPtr<SfxAbstractTabDialog> CreateScAttrDlg( vcl::Window*          pParent,

sc/source/ui/inc/undodat.hxx

@@ -430,7 +430,6 @@ public:
                    SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
                    const ScMarkData& rMark,
                    ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-                   InsertDeleteFlags nNewFlags,
                    ScRefUndoData* pRefData);
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -443,7 +442,6 @@ private:
     std::unique_ptr<ScMarkData> mxMarkData;
     std::unique_ptr<ScDocument> xUndoDoc;
     std::unique_ptr<ScDocument> xRedoDoc;
-    InsertDeleteFlags nFlags;
     std::unique_ptr<ScRefUndoData> xRefUndoData;
     std::unique_ptr<ScRefUndoData> xRefRedoData;
     sal_uLong       nStartChangeAction;

sc/source/ui/undo/undodat.cxx

@@ -1719,13 +1719,11 @@ ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell,
                                 SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
                                 const ScMarkData& rMark,
                                 ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-                                InsertDeleteFlags nNewFlags,
                                 ScRefUndoData* pRefData )
     : ScBlockUndo(pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE)
     , mxMarkData(new ScMarkData(rMark))
     , xUndoDoc(pNewUndoDoc)
     , xRedoDoc(pNewRedoDoc)
-    , nFlags(nNewFlags)
     , xRefUndoData(pRefData)
     , bRedoFilled(false)
 {
@@ -1749,12 +1747,7 @@ OUString ScUndoDataForm::GetComment() const
 
 void ScUndoDataForm::SetChangeTrack()
 {
-    ScChangeTrack* pChangeTrack = pDocShell->GetDocument().GetChangeTrack();
-    if ( pChangeTrack && (nFlags & InsertDeleteFlags::CONTENTS) )
-        pChangeTrack->AppendContentRange(aBlockRange