diff options
34 files changed, 60 insertions, 78 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index b0f2a512f4c0..64b5a6dc3854 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -810,9 +810,9 @@ EditPaM EditEngine::GetPaM(const Point& aDocPos, bool bSmart) } EditSelection EditEngine::SelectWord( - const EditSelection& rCurSelection, sal_Int16 nWordType, bool bAcceptStartOfWord) + const EditSelection& rCurSelection, sal_Int16 nWordType) { - return pImpEditEngine->SelectWord(rCurSelection, nWordType, bAcceptStartOfWord); + return pImpEditEngine->SelectWord(rCurSelection, nWordType); } long EditEngine::GetXPos( @@ -2407,7 +2407,7 @@ css::uno::Reference< css::datatransfer::XTransferable > void EditEngine::DrawingText( const Point&, const OUString&, sal_Int32, sal_Int32, const long*, const SvxFont&, sal_Int32 /*nPara*/, sal_uInt8 /*nRightToLeft*/, - const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, bool, + const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, const css::lang::Locale*, const Color&, const Color&) { diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index ccc4e0f6661b..25efa4fb2901 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -730,7 +730,7 @@ bool EdtAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, return bRet; } -LanguageType EdtAutoCorrDoc::GetLanguage( sal_Int32 nPos, bool ) const +LanguageType EdtAutoCorrDoc::GetLanguage( sal_Int32 nPos ) const { return mpEditEngine->GetLanguage( EditPaM( pCurNode, nPos+1 ) ); } diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index 2cd6b5be14b4..6ce576858999 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -146,7 +146,7 @@ public: virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, SvxAutoCorrect& rACorrect, OUString* pPara ) override; - virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara = false ) const override; + virtual LanguageType GetLanguage( sal_Int32 nPos ) const override; sal_Int32 GetCursor() const { return nCursor; } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index dac9f8b3ab18..ac74c7c88547 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3347,7 +3347,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aTmpFont, n, rTextPortion.GetRightToLeft(), aWrongSpellVector.size() ? &aWrongSpellVector : nullptr, pFieldData, - bEndOfLine, bEndOfParagraph, false, // support for EOL/EOP TEXT comments + bEndOfLine, bEndOfParagraph, // support for EOL/EOP TEXT comments &aLocale, aOverlineColor, aTextLineColor); @@ -3595,7 +3595,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aTmpFont, n, 0, nullptr, nullptr, - bEndOfLine, bEndOfParagraph, false, + bEndOfLine, bEndOfParagraph, nullptr, aOverlineColor, aTextLineColor); @@ -3652,7 +3652,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aTmpFont, n, 0, nullptr, nullptr, - false, true, false, // support for EOL/EOP TEXT comments + false, true, // support for EOL/EOP TEXT comments nullptr, aOverlineColor, aTextLineColor); diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 0c9f0c52b9d7..9abc38f5da29 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -90,7 +90,7 @@ Color SvxBorderLine::threeDMediumColor( Color aMain ) } SvxBorderLine::SvxBorderLine( const Color *pCol, long nWidth, - SvxBorderStyle nStyle, bool bUseLeftTop, + SvxBorderStyle nStyle, Color (*pColorOutFn)( Color ), Color (*pColorInFn)( Color ), Color (*pColorGapFn)( Color ) ) : m_nWidth( nWidth ) @@ -99,7 +99,7 @@ SvxBorderLine::SvxBorderLine( const Color *pCol, long nWidth, , m_nMult( 1 ) , m_nDiv( 1 ) , m_nStyle( nStyle ) -, m_bUseLeftTop( bUseLeftTop ) +, m_bUseLeftTop( false ) , m_pColorOutFn( pColorOutFn ) , m_pColorInFn( pColorInFn ) , m_pColorGapFn( pColorGapFn ) diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 8881c08dc095..ce565ee80094 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -144,23 +144,22 @@ SvxSpellWrapper::~SvxSpellWrapper() --------------------------------------------------------------------*/ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, - const bool bStart, const bool bIsAllRight, - const bool bOther, const bool bRevAllow ) : + const bool bStart, const bool bIsAllRight ) : pWin ( pWn ), mpTextObj ( nullptr), - bOtherCntnt ( bOther ), + bOtherCntnt ( false ), bDialog ( false ), bHyphen ( false ), - bStartChk ( bOther ), - bRevAllowed ( bRevAllow ), + bStartChk ( false ), + bRevAllowed ( true ), bAllRight ( bIsAllRight ) { Reference< linguistic2::XLinguProperties > xProp( SvxGetLinguPropertySet() ); bool bWrapReverse = xProp.is() && xProp->getIsWrapReverse(); - bReverse = bRevAllow && bWrapReverse; - bStartDone = bOther || ( !bReverse && bStart ); - bEndDone = bReverse && bStart && !bOther; + bReverse = bWrapReverse; + bStartDone = !bReverse && bStart; + bEndDone = bReverse && bStart; } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 156f6a9766c2..8dc6aefaad4b 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -178,7 +178,7 @@ void SvxAutoCorrDoc::SaveCpltSttWord( sal_uLong, sal_Int32, const OUString&, { } -LanguageType SvxAutoCorrDoc::GetLanguage( sal_Int32, bool ) const +LanguageType SvxAutoCorrDoc::GetLanguage( sal_Int32 ) const { return LANGUAGE_SYSTEM; } diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index 575bb5eee323..84866840157b 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -152,13 +152,12 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText const SvxFieldData* pFieldData, bool bEndOfLine, bool bEndOfParagraph, - bool bEndOfBullet, const css::lang::Locale* pLocale, const Color& rOverlineColor, const Color& rTextLineColor) { pOwner->DrawingText(rStartPos,rText,nTextStart,nTextLen,pDXArray,rFont,nPara,nRightToLeft, - pWrongSpellVector, pFieldData, bEndOfLine, bEndOfParagraph, bEndOfBullet, pLocale, rOverlineColor, rTextLineColor); + pWrongSpellVector, pFieldData, bEndOfLine, bEndOfParagraph, false/*bEndOfBullet*/, pLocale, rOverlineColor, rTextLineColor); } void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index 04e44c2bcdff..f165e3220d86 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -51,7 +51,6 @@ public: const SvxFieldData* pFieldData, bool bEndOfLine, bool bEndOfParagraph, - bool bEndOfBullet, const css::lang::Locale* pLocale, const Color& rOverlineColor, const Color& rTextLineColor) override; diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index ffefab17fd8e..cd855b7a03c5 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -374,21 +374,16 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara ) pEditView->ShowCursor(); } -sal_Int32 OutlinerView::Select( Paragraph* pParagraph, bool bSelect, - bool bWithChildren ) +sal_Int32 OutlinerView::Select( Paragraph* pParagraph, bool bSelect ) { sal_Int32 nPara = pOwner->pParaList->GetAbsPos( pParagraph ); sal_Int32 nEnd = 0; if ( bSelect ) nEnd = SAL_MAX_INT32; - sal_Int32 nChildCount = 0; - if ( bWithChildren ) - nChildCount = pOwner->pParaList->GetChildCount( pParagraph ); - - ESelection aSel( nPara, 0, nPara + nChildCount, nEnd ); + ESelection aSel( nPara, 0, nPara, nEnd ); pEditView->SetSelection( aSel ); - return nChildCount+1; + return 1; } @@ -1387,13 +1382,13 @@ void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallback pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg ); } -sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs ) +sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ) { sal_Int32 nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount(); ESelection aOldSel = pEditView->GetSelection(); aOldSel.Adjust(); - sal_uLong nRet = pEditView->Read( rInput, rBaseURL, eFormat, bSelect, pHTTPHeaderAttrs ); + sal_uLong nRet = pEditView->Read( rInput, rBaseURL, eFormat, false/*bSelect*/, pHTTPHeaderAttrs ); long nParaDiff = pEditView->GetEditEngine()->GetParagraphCount() - nOldParaCount; sal_Int32 nChangesStart = aOldSel.nStartPara; diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index d03c2ce4f685..b4b9d79ab6c3 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -59,8 +59,7 @@ static rtl_TextEncoding lcl_GetDefaultTextEncodingForRTF() // -------------- Methods -------------------- SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn, - uno::Reference<document::XDocumentProperties> i_xDocProps, - bool const bReadNewDoc ) + uno::Reference<document::XDocumentProperties> i_xDocProps ) : SvRTFParser( rIn, 5 ) , aPlainMap(rPool) , aPardMap(rPool) @@ -69,7 +68,7 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn, , m_xDocProps( i_xDocProps ) , pRTFDefaults( nullptr ) , nDfltFont( 0) - , bNewDoc( bReadNewDoc ) + , bNewDoc( true ) , bNewGroup( false) , bIsSetDfltTab( false) , bChkStyleAttr( false ) diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 5126b6d29927..b1ee919221d5 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -528,7 +528,7 @@ void SvxAccessibleTextAdapter::SetParaAttribs( sal_Int32 nPara, const SfxItemSet mpTextForwarder->SetParaAttribs( nPara, rSet ); } -void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , bool , sal_uInt16 ) +void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , sal_uInt16 ) { } diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 793f979a55fa..03b290c988bd 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -112,9 +112,9 @@ void SvxEditEngineForwarder::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rEditEngine.SetParaAttribs( nPara, rSet ); } -void SvxEditEngineForwarder::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) +void SvxEditEngineForwarder::RemoveAttribs( const ESelection& rSelection, sal_uInt16 nWhich ) { - rEditEngine.RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich ); + rEditEngine.RemoveAttribs( rSelection, false/*bRemoveParaAttribs*/, nWhich ); } SfxItemPool* SvxEditEngineForwarder::GetPool() const diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index d3be942fe710..9646a98d1ee7 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -180,9 +180,9 @@ void SvxOutlinerForwarder::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rS const_cast<SfxItemSet*>(&rSet)->SetParent( pOldParent ); } -void SvxOutlinerForwarder::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) +void SvxOutlinerForwarder::RemoveAttribs( const ESelection& rSelection, sal_uInt16 nWhich ) { - rOutliner.RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich ); + rOutliner.RemoveAttribs( rSelection, false/*bRemoveParaAttribs*/, nWhich ); } SfxItemPool* SvxOutlinerForwarder::GetPool() const diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 181ff4a4d9ff..9b253bc30d16 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2185,7 +2185,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( // set properties for the new text portion ESelection aSel( nPara, nStart, nPara, nEnd ); - pTextForwarder->RemoveAttribs( aSel, false, 0 ); + pTextForwarder->RemoveAttribs( aSel, 0 ); pEditSource->UpdateData(); SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() ); @@ -2415,7 +2415,7 @@ void SvxDummyTextSource::SetParaAttribs( sal_Int32, const SfxItemSet& ) { } -void SvxDummyTextSource::RemoveAttribs( const ESelection& , bool , sal_uInt16 ) +void SvxDummyTextSource::RemoveAttribs( const ESelection& , sal_uInt16 ) { } diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index c2b993c00867..d72cdab18bda 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -71,7 +71,6 @@ namespace editeng { SvxBorderLine( const Color *pCol = nullptr, long nWidth = 0, SvxBorderStyle nStyle = css::table::BorderLineStyle::SOLID, - bool bUseLeftTop = false, Color (*pColorOutFn)( Color ) = &darkColor, Color (*pColorInFn)( Color ) = &darkColor, Color (*pColorGapFn)( Color ) = nullptr ); diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index eec5b29048aa..3f9fe0ca33b4 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -181,8 +181,7 @@ private: EDITENG_DLLPRIVATE EditSelection SelectWord( const EditSelection& rCurSelection, - sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES, - bool bAcceptStartOfWord = true); + sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES); EDITENG_DLLPRIVATE long GetXPos( const ParaPortion* pParaPortion, const EditLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false) const; @@ -486,7 +485,6 @@ public: const SvxFieldData* pFieldData, bool bEndOfLine, bool bEndOfParagraph, - bool bEndOfBullet, const css::lang::Locale* pLocale, const Color& rOverlineColor, const Color& rTextLineColor); diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index ac3f0aaf0390..7060ca4d51d2 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -247,9 +247,7 @@ public: void CreateSelectionList (std::vector<Paragraph*> &aSelList) ; // Retruns the number of selected paragraphs - sal_Int32 Select( Paragraph* pParagraph, - bool bSelect = true, - bool bWChildren = true); + sal_Int32 Select( Paragraph* pParagraph, bool bSelect = true); OUString GetSelected() const; void SelectRange( sal_Int32 nFirst, sal_Int32 nCount ); @@ -259,7 +257,7 @@ public: void AdjustHeight( long nDY ); - sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr ); + sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr ); void InsertText( const OUString& rNew, bool bSelect = false ); void InsertText( const OutlinerParaObject& rParaObj ); diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 77df49accf34..1edc42c4e81a 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -74,8 +74,7 @@ private: public: SvxSpellWrapper( vcl::Window* pWn, - const bool bStart = false, const bool bIsAllRight = false, - const bool bOther = false, const bool bRevAllow = true ); + const bool bStart = false, const bool bIsAllRight = false ); SvxSpellWrapper( vcl::Window* pWn, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphenator, const bool bStart = false, const bool bOther = false ); diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 15558a490be8..ebe53e4cd883 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -112,7 +112,7 @@ public: sal_Unicode cChar ); // which language at the position? - virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara = false ) const; + virtual LanguageType GetLanguage( sal_Int32 nPos ) const; }; diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index a7c8d8095cef..081eaf7e5af5 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -289,8 +289,7 @@ protected: SvxRTFParser( SfxItemPool& rAttrPool, SvStream& rIn, - css::uno::Reference< css::document::XDocumentProperties> i_xDocProps, - bool bReadNewDoc = true ); + css::uno::Reference< css::document::XDocumentProperties> i_xDocProps ); virtual ~SvxRTFParser(); void SetNewDoc( bool bFlag ) { bNewDoc = bFlag; } diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index 7f129c367c24..2737f4dcb769 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -39,7 +39,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const override; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const override; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) override; - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) override; + virtual void RemoveAttribs( const ESelection& rSelection, sal_uInt16 nWhich ) override; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const override; sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index 9af69b325a9f..d558be6f6f67 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -145,7 +145,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const = 0; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const = 0; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) = 0; - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0; + virtual void RemoveAttribs( const ESelection& rSelection, sal_uInt16 nWhich ) = 0; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const = 0; virtual SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const = 0; diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx index e6d7c0f719ac..7108d5e20c9d 100644 --- a/include/editeng/unofored.hxx +++ b/include/editeng/unofored.hxx @@ -41,7 +41,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const override; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const override; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) override; - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) override; + virtual void RemoveAttribs( const ESelection& rSelection, sal_uInt16 nWhich ) override; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const override; virtual SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const override; diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx index dae74b2378c0..f12958654278 100644 --- a/include/editeng/unoforou.hxx +++ b/include/editeng/unoforou.hxx @@ -59,7 +59,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const override; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const override; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) override; - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) override; + virtual void RemoveAttribs( const ESelection& rSelection, sal_uInt16 nWhich ) override; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const override; virtual SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const override; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 00493de55cbd..73d285156b11 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -182,7 +182,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const override; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const override; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) override; - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) override; + virtual void RemoveAttribs( const ESelection& rSelection, sal_uInt16 nWhich ) override; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const override; SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const override; diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 714348725f1e..240cc741a713 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -1987,7 +1987,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) { // handled together because both need the cell border information for decisions Color aCol = 0; - editeng::SvxBorderLine aLine(nullptr,0,0,false); + editeng::SvxBorderLine aLine(nullptr,0,0); bool bCol = false; bool bColDisable = false, bStyleDisable = false; SvxBoxItem aBoxItem(ATTR_BORDER); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 3e1f12c38b90..69e5fe26a75d 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1139,12 +1139,12 @@ void OutlineView::FillOutliner() // place cursor at the start Paragraph* pFirstPara = mrOutliner.GetParagraph( 0 ); - mpOutlinerView[0]->Select( pFirstPara, true, false ); - mpOutlinerView[0]->Select( pFirstPara, false, false ); + mpOutlinerView[0]->Select( pFirstPara ); + mpOutlinerView[0]->Select( pFirstPara, false ); // select title of slide that was selected if (pTitleToSelect) - mpOutlinerView[0]->Select(pTitleToSelect, true, false); + mpOutlinerView[0]->Select(pTitleToSelect); SetLinks(); @@ -1263,7 +1263,7 @@ void OutlineView::SetActualPage( SdPage* pActual ) // if we found a paragraph, select its text at the outliner view Paragraph* pPara = GetParagraphForPage( mrOutliner, pActual ); if( pPara ) - mpOutlinerView[0]->Select( pPara, true, false ); + mpOutlinerView[0]->Select( pPara ); } } diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index cb013755c1f7..2403cbc646ac 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1408,7 +1408,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) { // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read( *xStm, OUString(), EE_FORMAT_BIN, false, mpDocSh->GetHeaderAttributes() ); + pOLV->Read( *xStm, OUString(), EE_FORMAT_BIN, mpDocSh->GetHeaderAttributes() ); bReturn = true; } } @@ -1443,7 +1443,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) { // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read( *xStm, OUString(), EE_FORMAT_RTF, false, mpDocSh->GetHeaderAttributes() ); + pOLV->Read( *xStm, OUString(), EE_FORMAT_RTF, mpDocSh->GetHeaderAttributes() ); bReturn = true; } } diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 06a46ef7479e..17e8624e1ca2 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -1029,11 +1029,11 @@ SfxItemPool* SmTextForwarder::GetPool() const return pEditEngine ? pEditEngine->GetEmptyItemSet().GetPool() : nullptr; } -void SmTextForwarder::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) +void SmTextForwarder::RemoveAttribs( const ESelection& rSelection, sal_uInt16 nWhich ) { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); if (pEditEngine) - pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich ); + pEditEngine->RemoveAttribs( rSelection, false/*bRemoveParaAttribs*/, nWhich ); } void SmTextForwarder::GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 8072a5a677d8..eafb18a1b930 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -196,7 +196,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const override; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const override; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) override; - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) override; + virtual void RemoveAttribs( const ESelection& rSelection, sal_uInt16 nWhich ) override; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const override; virtual SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const override; diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 3bfb1e860a01..ef531ffec3e6 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -100,7 +100,7 @@ namespace accessibility } SfxItemSet GetParaAttribs( sal_Int32 /*nPara*/ ) const override { return GetAttribs(ESelection()); } void SetParaAttribs( sal_Int32 /*nPara*/, const SfxItemSet& /*rSet*/ ) override {} - void RemoveAttribs( const ESelection& /*rSelection*/, bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ) override {} + void RemoveAttribs( const ESelection& /*rSelection*/, sal_uInt16 /*nWhich*/ ) override {} void GetPortions( sal_Int32 /*nPara*/, std::vector<sal_Int32>& /*rList*/ ) const override {} SfxItemState GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const override { return SfxItemState::UNKNOWN; } diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 3874940a29e5..998bbb9f4479 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -311,7 +311,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, if( nEndPos == rSttPos ) return bRet; - LanguageType eLang = GetLanguage(nEndPos, false); + LanguageType eLang = GetLanguage(nEndPos); if(LANGUAGE_SYSTEM == eLang) eLang = GetAppLanguage(); LanguageTag aLanguageTag( eLang); @@ -410,18 +410,16 @@ void SwAutoCorrDoc::SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos, sal_Unicode cChar ) { sal_uLong nNode = pIdx ? pIdx->GetIndex() : rCursor.GetPoint()->nNode.GetIndex(); - LanguageType eLang = GetLanguage(nPos, false); + LanguageType eLang = GetLanguage(nPos); rEditSh.GetDoc()->SetAutoCorrExceptWord( new SwAutoCorrExceptWord( nFlag, nNode, nPos, rExceptWord, cChar, eLang )); } -LanguageType SwAutoCorrDoc::GetLanguage( sal_Int32 nPos, bool bPrevPara ) const +LanguageType SwAutoCorrDoc::GetLanguage( sal_Int32 nPos ) const { LanguageType eRet = LANGUAGE_SYSTEM; - SwTextNode* pNd = (( bPrevPara && pIdx ) - ? *pIdx - : rCursor.GetPoint()->nNode ).GetNode().GetTextNode(); + SwTextNode* pNd = rCursor.GetPoint()->nNode.GetNode().GetTextNode(); if( pNd ) eRet = pNd->GetLang( nPos ); diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index 50bc87ca43c0..0b2606d81d0a 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -84,7 +84,7 @@ public: // Afterwards the words can be added into exception list if needed. virtual void SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos, const OUString& rExceptWord, sal_Unicode cChar ) override; - virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const override; + virtual LanguageType GetLanguage( sal_Int32 nPos ) const override; }; class SwAutoCorrExceptWord |