[Libreoffice-commits] core.git: sw/inc sw/source

Noel Grandin noel.grandin at collabora.co.uk
Mon May 8 06:31:52 UTC 2017


 sw/inc/calbck.hxx                    |    4 ++--
 sw/inc/calc.hxx                      |    2 +-
 sw/inc/crsrsh.hxx                    |    2 +-
 sw/inc/doc.hxx                       |    2 +-
 sw/inc/pam.hxx                       |    2 +-
 sw/source/core/access/acccontext.cxx |    9 +++------
 sw/source/core/access/acccontext.hxx |    3 +--
 sw/source/core/access/accpara.cxx    |   17 +++++++----------
 sw/source/core/access/accpara.hxx    |    5 +----
 sw/source/core/attr/calbck.cxx       |    8 ++++----
 sw/source/core/bastyp/calc.cxx       |    2 +-
 sw/source/core/crsr/crsrsh.cxx       |    4 ++--
 sw/source/core/crsr/pam.cxx          |    2 +-
 sw/source/core/doc/doc.cxx           |    1 -
 sw/source/core/doc/docftn.cxx        |    2 +-
 sw/source/core/doc/lineinfo.cxx      |    4 ++--
 sw/source/core/doc/number.cxx        |    2 +-
 sw/source/core/docnode/section.cxx   |    2 +-
 sw/source/core/fields/cellfml.cxx    |    4 ++--
 sw/source/core/table/swtable.cxx     |    2 +-
 sw/source/core/undo/unattr.cxx       |    2 +-
 sw/source/uibase/uiview/view.cxx     |    2 +-
 sw/source/uibase/uno/unotxdoc.cxx    |    2 +-
 23 files changed, 37 insertions(+), 48 deletions(-)

New commits:
commit 90f94f399e20945d53b20ab3eb1bc29bb7774135
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri May 5 14:14:38 2017 +0200

    loplugin:checkunusedparams in sw(part1)
    
    Change-Id: I4847b0f96033016e020212fb8d7331309db25b55
    Reviewed-on: https://gerrit.libreoffice.org/37287
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 872de593bc2f..a6f07772c045 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -123,7 +123,7 @@ public:
 
     // in case an SwModify object is destroyed that itself is registered in another SwModify,
     // its SwClient objects can decide to get registered to the latter instead by calling this method
-    void CheckRegistration( const SfxPoolItem *pOldValue, const SfxPoolItem *pNewValue );
+    void CheckRegistration( const SfxPoolItem *pOldValue );
 
     // controlled access to Modify method
     // mba: this is still considered a hack and it should be fixed; the name makes grep-ing easier
@@ -221,7 +221,7 @@ private:
     virtual void Modify( const SfxPoolItem* pOldValue, const SfxPoolItem *pNewValue ) override
     {
         if( pNewValue && pNewValue->Which() == RES_OBJECTDYING )
-            CheckRegistration(pOldValue,pNewValue);
+            CheckRegistration(pOldValue);
         else if( m_pToTell )
             m_pToTell->ModifyNotification(pOldValue, pNewValue);
     }
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 4bc00cc6bac4..9e7b3c817d08 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -183,7 +183,7 @@ public:
 
     SwSbxValue  Calculate( const OUString &rStr );
     OUString    GetStrResult( const SwSbxValue& rValue );
-    OUString    GetStrResult( double, bool bRound = true );
+    OUString    GetStrResult( double );
 
     SwCalcExp*  VarInsert( const OUString& r );
     SwCalcExp*  VarLook( const OUString &rStr, bool bIns = false );
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 951b39f7194b..26b33a3df3c2 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -465,7 +465,7 @@ public:
 
     // Cursor is placed in something that is protected or selection contains
     // something that is protected.
-    bool HasReadonlySel(bool bAnnotationMode = false) const;
+    bool HasReadonlySel() const;
 
     // Can the cursor be set to read only ranges?
     bool IsReadOnlyAvailable() const { return m_bSetCursorInReadOnly; }
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f75ed2775890..464661358f9e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -889,7 +889,7 @@ public:
      evaluating the respective settings (see implementation) */
     static void CalculatePagesForPrinting( const SwRootFrame& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
             sal_Int32 nDocPageCount );
-    static void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+    static void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions,
             sal_Int32 nDocPageCount );
     static void CalculatePagePairsForProspectPrinting( const SwRootFrame& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions,
             sal_Int32 nDocPageCount );
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index d6f636626190..7bda3a7cbe9a 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -288,7 +288,7 @@ public:
 
     /** Is in something protected (readonly) or selection contains
        something protected. */
-    bool HasReadonlySel( bool bFormView, bool bAnnotationMode = false ) const;
+    bool HasReadonlySel( bool bFormView ) const;
 
     bool ContainsPosition(const SwPosition & rPos) const
     {
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index a40303b866bb..4f728e38c36e 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -231,8 +231,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrame *pFrame,
                             xAccImpl->ViewForwarderChanged();
                             break;
                         case Action::SCROLLED_IN:
-                            ScrolledInShape( rLower.GetDrawObject(),
-                                             xAccImpl.get() );
+                            ScrolledInShape( xAccImpl.get() );
                             break;
                         case Action::SCROLLED_OUT:
                             {
@@ -1001,8 +1000,7 @@ void SwAccessibleContext::DisposeShape( const SdrObject *pObj,
     xAccImpl->dispose();
 }
 
-void SwAccessibleContext::ScrolledInShape( const SdrObject* ,
-                                ::accessibility::AccessibleShape *pAccImpl )
+void SwAccessibleContext::ScrolledInShape( ::accessibility::AccessibleShape *pAccImpl )
 {
     if(nullptr == pAccImpl)
     {
@@ -1206,8 +1204,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
                 // #i37790#
                 if ( xAccImpl.is() )
                 {
-                    ScrolledInShape( rChildFrameOrObj.GetDrawObject(),
-                                     xAccImpl.get() );
+                    ScrolledInShape( xAccImpl.get() );
                 }
                 else
                 {
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 1d4808bf34da..4f19e24f7f78 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -161,8 +161,7 @@ protected:
 
     void DisposeShape( const SdrObject *pObj,
                                 ::accessibility::AccessibleShape *pAccImpl );
-    void ScrolledInShape( const SdrObject *pObj,
-                                ::accessibility::AccessibleShape *pAccImpl );
+    void ScrolledInShape( ::accessibility::AccessibleShape *pAccImpl );
 
     virtual void InvalidateContent_( bool bVisibleDataFired );
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index c9849e8b5d4b..86fe38c63871 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -702,7 +702,7 @@ SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase()
 }
 
 //the function is to check whether the position is in a redline range.
-const SwRangeRedline* SwAccessibleParagraph::GetRedlineAtIndex( sal_Int32 )
+const SwRangeRedline* SwAccessibleParagraph::GetRedlineAtIndex()
 {
     const SwRangeRedline* pRedline = nullptr;
     SwPaM* pCrSr = GetCursor( true );
@@ -727,7 +727,6 @@ const SwRangeRedline* SwAccessibleParagraph::GetRedlineAtIndex( sal_Int32 )
 
 bool SwAccessibleParagraph::GetCharBoundary(
     i18n::Boundary& rBound,
-    const OUString&,
     sal_Int32 nPos )
 {
     if( GetPortionData().FillBoundaryIFDateField( rBound,  nPos) )
@@ -802,7 +801,6 @@ bool SwAccessibleParagraph::GetParagraphBoundary(
 
 bool SwAccessibleParagraph::GetAttributeBoundary(
     i18n::Boundary& rBound,
-    const OUString&,
     sal_Int32 nPos )
 {
     GetPortionData().GetAttributeBoundary( rBound, nPos );
@@ -866,7 +864,7 @@ bool SwAccessibleParagraph::GetTextBoundary(
             break;
 
         case AccessibleTextType::CHARACTER:
-            bRet = GetCharBoundary( rBound, rText, nPos );
+            bRet = GetCharBoundary( rBound, nPos );
             break;
 
         case AccessibleTextType::LINE:
@@ -878,7 +876,7 @@ bool SwAccessibleParagraph::GetTextBoundary(
             break;
 
         case AccessibleTextType::ATTRIBUTE_RUN:
-            bRet = GetAttributeBoundary( rBound, rText, nPos );
+            bRet = GetAttributeBoundary( rBound, nPos );
             break;
 
         case AccessibleTextType::GLYPH:
@@ -1616,7 +1614,7 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
             aSupplementalNames = getSupplementalAttributeNames();
 
         tAccParaPropValMap aSupplementalAttrSeq;
-        _getSupplementalAttributesImpl( nIndex, aSupplementalNames, aSupplementalAttrSeq );
+        _getSupplementalAttributesImpl( aSupplementalNames, aSupplementalAttrSeq );
 
         aValues.resize( aValues.size() + aSupplementalAttrSeq.size() );
 
@@ -2020,7 +2018,6 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getRunAttributes(
 }
 
 void SwAccessibleParagraph::_getSupplementalAttributesImpl(
-        const sal_Int32,
         const uno::Sequence< OUString >& aRequestedAttributes,
         tAccParaPropValMap& rSupplementalAttrSeq )
 {
@@ -2087,7 +2084,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
 {
     PropertyValue ChangeAttr, ChangeAttrColor;
 
-    const SwRangeRedline* pRedline = GetRedlineAtIndex( nIndex );
+    const SwRangeRedline* pRedline = GetRedlineAtIndex();
     if ( pRedline )
     {
 
@@ -3547,11 +3544,11 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getNumberOfLineWithCaret()
 }
 
 // #i108125#
-void SwAccessibleParagraph::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwAccessibleParagraph::Modify( const SfxPoolItem* pOld, const SfxPoolItem* /*pNew*/ )
 {
     mpParaChangeTrackInfo->reset();
 
-    CheckRegistration( pOld, pNew );
+    CheckRegistration( pOld );
 }
 
 bool SwAccessibleParagraph::GetSelectionAtIndex(
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 685a35d15ca1..fe98a51666f7 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -137,7 +137,7 @@ class SwAccessibleParagraph :
         }
     }
 
-    const SwRangeRedline* GetRedlineAtIndex( sal_Int32 nPos );
+    const SwRangeRedline* GetRedlineAtIndex();
     OUString GetFieldTypeNameAtIndex(sal_Int32 nIndex);
 
     // #i63870#
@@ -151,7 +151,6 @@ class SwAccessibleParagraph :
             tAccParaPropValMap& rRunAttrSeq );
 
     void _getSupplementalAttributesImpl(
-            const sal_Int32 nIndex,
             const css::uno::Sequence< OUString >& aRequestedAttributes,
             tAccParaPropValMap& rSupplementalAttrSeq );
 
@@ -199,7 +198,6 @@ protected:
     //helpers for word boundaries
 
     bool GetCharBoundary( css::i18n::Boundary& rBound,
-                              const OUString& rText,
                               sal_Int32 nPos );
     bool GetWordBoundary( css::i18n::Boundary& rBound,
                               const OUString& rText,
@@ -214,7 +212,6 @@ protected:
                                    const OUString& rText,
                                    sal_Int32 nPos );
     bool GetAttributeBoundary( css::i18n::Boundary& rBound,
-                                   const OUString& rText,
                                    sal_Int32 nPos );
     bool GetGlyphBoundary( css::i18n::Boundary& rBound,
                                const OUString& rText,
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 18a795a141c4..a2e4fb9b9c71 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -36,7 +36,7 @@ SwClient::~SwClient()
         m_pRegisteredIn->Remove( this );
 }
 
-void SwClient::CheckRegistration( const SfxPoolItem* pOld, const SfxPoolItem* )
+void SwClient::CheckRegistration( const SfxPoolItem* pOld )
 {
     DBG_TESTSOLARMUTEX();
     // this method only handles notification about dying SwModify objects
@@ -68,9 +68,9 @@ void SwClient::SwClientNotify(const SwModify&, const SfxHint& rHint)
     }
 };
 
-void SwClient::Modify(SfxPoolItem const*const pOldValue, SfxPoolItem const*const pNewValue)
+void SwClient::Modify(SfxPoolItem const*const pOldValue, SfxPoolItem const*const /*pNewValue*/)
 {
-    CheckRegistration( pOldValue, pNewValue );
+    CheckRegistration( pOldValue );
 }
 
 void SwModify::SetInDocDTOR()
@@ -102,7 +102,7 @@ SwModify::~SwModify()
     // remove all clients that have not done themselves
     // mba: possibly a hotfix for forgotten base class calls?!
     while( m_pWriterListeners )
-        static_cast<SwClient*>(m_pWriterListeners)->CheckRegistration( &aDyObject, &aDyObject );
+        static_cast<SwClient*>(m_pWriterListeners)->CheckRegistration( &aDyObject );
 }
 
 void SwModify::NotifyClients( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 35882054a097..b04106f0bee4 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -403,7 +403,7 @@ OUString SwCalc::GetStrResult( const SwSbxValue& rVal )
     return GetStrResult( rVal.GetDouble() );
 }
 
-OUString SwCalc::GetStrResult( double nValue, bool )
+OUString SwCalc::GetStrResult( double nValue )
 {
     if( nValue >= DBL_MAX )
         switch( m_eError )
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 9fbf2f3ab497..1ebdcd656669 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3044,7 +3044,7 @@ void SwCursorShell::SetReadOnlyAvailable( bool bFlag )
     }
 }
 
-bool SwCursorShell::HasReadonlySel(bool bAnnotationMode) const
+bool SwCursorShell::HasReadonlySel() const
 {
     bool bRet = false;
     // If protected area is to be ignored, then selections are never read-only.
@@ -3061,7 +3061,7 @@ bool SwCursorShell::HasReadonlySel(bool bAnnotationMode) const
         {
             for(const SwPaM& rCursor : m_pCurrentCursor->GetRingContainer())
             {
-                if( rCursor.HasReadonlySel( GetViewOptions()->IsFormView(), bAnnotationMode ) )
+                if( rCursor.HasReadonlySel( GetViewOptions()->IsFormView() ) )
                 {
                     bRet = true;
                     break;
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 7c58f1665391..bdcc3101066a 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -564,7 +564,7 @@ static const SwFrame* lcl_FindEditInReadonlyFrame( const SwFrame& rFrame )
 }
 
 /// is in protected section or selection surrounds something protected
-bool SwPaM::HasReadonlySel( bool bFormView, bool /*bAnnotationMode*/ ) const
+bool SwPaM::HasReadonlySel( bool bFormView ) const
 {
     bool bRet = false;
 
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 06fc61b466fb..6cc69f7818ec 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -768,7 +768,6 @@ void SwDoc::CalculatePagesForPrinting(
 void SwDoc::UpdatePagesForPrintingWithPostItData(
     /* out */ SwRenderData &rData,
     const SwPrintUIOptions &rOptions,
-    bool /*bIsPDFExport*/,
     sal_Int32 nDocPageCount )
 {
 
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index d2896ac69ad3..afafe83ac769 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -207,7 +207,7 @@ void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         }
     }
     else
-        CheckRegistration( pOld, pNew );
+        CheckRegistration( pOld );
 }
 
 SwFootnoteInfo& SwFootnoteInfo::operator=(const SwFootnoteInfo& rInfo)
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index 5da00dc03773..e63b385e1a37 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -117,9 +117,9 @@ void SwLineNumberInfo::SetCharFormat( SwCharFormat *pChFormat )
     pChFormat->Add( this );
 }
 
-void SwLineNumberInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwLineNumberInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* /*pNew*/ )
 {
-    CheckRegistration( pOld, pNew );
+    CheckRegistration( pOld );
     SwDoc *pDoc = static_cast<SwCharFormat*>(GetRegisteredIn())->GetDoc();
     SwRootFrame* pRoot = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
     if( pRoot )
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index f414b3a6a226..eabe4cc731ee 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -298,7 +298,7 @@ void SwNumFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     if( pFormat && !pFormat->GetDoc()->IsInDtor() )
         UpdateNumNodes( const_cast<SwDoc*>(pFormat->GetDoc()) );
     else
-        CheckRegistration( pOld, pNew );
+        CheckRegistration( pOld );
 }
 
 OUString SwNumFormat::GetCharFormatName() const
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index a0420f45ba96..cb3e24a58f95 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -515,7 +515,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         break;
 
     default:
-        CheckRegistration( pOld, pNew );
+        CheckRegistration( pOld );
         break;
     }
 
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 0c0d96c9bb25..3b4906e5a390 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -354,7 +354,7 @@ void SwTableFormula::MakeFormula_( const SwTable& rTable, OUString& rNewStr,
                     rNewStr += OUStringLiteral1(cListDelim);
                 bDelim = true;
                 rNewStr += pCalcPara->rCalc.GetStrResult(
-                            pTableBox->GetValue( *pCalcPara ), false );
+                            pTableBox->GetValue( *pCalcPara ) );
             }
         }
         rNewStr += ")";
@@ -367,7 +367,7 @@ void SwTableFormula::MakeFormula_( const SwTable& rTable, OUString& rNewStr,
         {
             rNewStr += "(";
             rNewStr += pCalcPara->rCalc.GetStrResult(
-                            pSttBox->GetValue( *pCalcPara ), false );
+                            pSttBox->GetValue( *pCalcPara ) );
             rNewStr += ")";
         }
     }
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 7fb5b66c8c93..96d58d982162 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -364,7 +364,7 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
         pNewSize = static_cast<const SwFormatFrameSize*>(pNew);
     }
     else
-        CheckRegistration( pOld, pNew );
+        CheckRegistration( pOld );
 
     if (pOldSize && pNewSize && !m_bModifyLocked)
         AdjustWidths( pOldSize->GetWidth(), pNewSize->GetWidth() );
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index e0503c7a4840..96dbd48c54ec 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -69,7 +69,7 @@ void SwUndoFormatAttrHelper::Modify( const SfxPoolItem* pOld, const SfxPoolItem*
 {
     if( pOld ) {
         if ( pOld->Which() == RES_OBJECTDYING ) {
-            CheckRegistration( pOld, pNew );
+            CheckRegistration( pOld );
         } else if ( pNew ) {
             if( POOLATTR_END >= pOld->Which() ) {
                 if ( GetUndo() ) {
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index c2b2d9ea72e9..5383c26d0a36 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -624,7 +624,7 @@ void SwView::CheckReadonlySelection()
     SfxDisableFlags nDisableFlags = SfxDisableFlags::NONE;
     SfxDispatcher &rDis = GetDispatcher();
 
-    if( m_pWrtShell->HasReadonlySel(m_bAnnotationMode) &&
+    if( m_pWrtShell->HasReadonlySel() &&
         ( !m_pWrtShell->GetDrawView() ||
             !m_pWrtShell->GetDrawView()->GetMarkedObjectList().GetMarkCount() ))
         nDisableFlags |= SfxDisableFlags::SwOnProtectedCursor;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index e2f1cf7d9aac..316054ad2d1e 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2604,7 +2604,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             if (nPostItMode != SwPostItMode::NONE)
             {
                 SwDoc::UpdatePagesForPrintingWithPostItData( *m_pRenderData,
-                        *m_pPrintUIOptions, bIsPDFExport, nPageCount );
+                        *m_pPrintUIOptions, nPageCount );
             }
 
             nRet = m_pRenderData->GetPagesToPrint().size();


More information about the Libreoffice-commits mailing list