diff options
176 files changed, 437 insertions, 735 deletions
diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx index 18fddaea9fd1..7f515e7a6296 100644 --- a/sw/inc/IDocumentDeviceAccess.hxx +++ b/sw/inc/IDocumentDeviceAccess.hxx @@ -73,13 +73,10 @@ public: @param pVd [in] the new virtual device. - @param bDeleteOld - [in] if set, the old virtual device will be deleted. - - @param bCallVirDevDataChanged - [in] if set, triggers all necessary invalidations. + The old virtual device will be deleted. + Triggers all necessary invalidations. */ - virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged ) = 0; + virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd ) = 0; /** Returns the current reference device diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx index 6868fa9d700e..e0e1679814ac 100644 --- a/sw/inc/IDocumentListItems.hxx +++ b/sw/inc/IDocumentListItems.hxx @@ -34,9 +34,7 @@ public: virtual void addListItem( const SwNodeNum& rNodeNum ) = 0; virtual void removeListItem( const SwNodeNum& rNodeNum ) = 0; - virtual OUString getListItemText( const SwNodeNum& rNodeNum, - const bool bWithNumber = true, - const bool bWithSpacesForLevel = false ) const = 0; + virtual OUString getListItemText( const SwNodeNum& rNodeNum ) const = 0; /** get vector of all list items, which are numbered */ diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx deleted file mode 100644 index 97ec004df2ee..000000000000 --- a/sw/inc/crsskip.hxx +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SW_INC_CRSSKIP_HXX -#define INCLUDED_SW_INC_CRSSKIP_HXX - -#include <tools/solar.h> - -// define for cursor travelling normally in western text cells and chars do -// the same, but in complex text cell skip over legatures and char skip -// into it. -// These defines exist only to cut off the dependencies to I18N project. -const sal_uInt16 CRSR_SKIP_CHARS = 0; -const sal_uInt16 CRSR_SKIP_CELLS = 1; -const sal_uInt16 CRSR_SKIP_HIDDEN = 2; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index b50f73473ce2..9bfcf18d898e 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -349,8 +349,7 @@ public: inline bool IsInMerge() const { return bInMerge; } void ExecuteFormLetter(SwWrtShell& rSh, - const css::uno::Sequence< css::beans::PropertyValue>& rProperties, - bool bWithDataSourceBrowser = false); + const css::uno::Sequence< css::beans::PropertyValue>& rProperties); static void InsertText(SwWrtShell& rSh, const css::uno::Sequence< css::beans::PropertyValue>& rProperties); @@ -380,7 +379,7 @@ public: bool GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage, OUString &rResult, double *pNumber); bool FillCalcWithMergeData(SvNumberFormatter *pDocFormatter, - sal_uInt16 nLanguage, bool asString, SwCalc &aCalc); + sal_uInt16 nLanguage, SwCalc &aCalc); bool ToNextMergeRecord(); bool ToNextRecord(const OUString& rDataSource, const OUString& rTableOrQuery); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 8fd8fa06fd3e..7f6ed41f03bb 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -365,8 +365,8 @@ public: void UpdateFields( SwField & ); ///< One single field. - size_t GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const; - SwFieldType* GetFieldType(size_t nField, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const; + size_t GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX) const; + SwFieldType* GetFieldType(size_t nField, sal_uInt16 nResId = USHRT_MAX) const; SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName) const; void RemoveFieldType(size_t nField); @@ -539,7 +539,6 @@ public: in case a list style is found, <sListId> holds the list id, to which the text node belongs, which applies the found list style. */ const SwNumRule * SearchNumRule(const bool bNum, - const bool bOutline, int nNonEmptyAllowed, OUString& sListId ); @@ -716,7 +715,7 @@ public: Can Merge checks if Prev or Next are possible. If pointer pChkNxtPrv is passed possible direction is given. */ bool CanMergeTable( bool bWithPrev = true, bool* pChkNxtPrv = nullptr ) const; - bool MergeTable( bool bWithPrev = true, sal_uInt16 nMode = 0 ); + bool MergeTable( bool bWithPrev = true ); /// Set up InsertDB as table Undo. void AppendUndoForInsertFromDB( bool bIsTable ); diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 295b934d3094..e11eba207bfb 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -263,7 +263,7 @@ public: bool Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt, bool bIsMove = false, bool bSelectInsert = true ); - void SelectFlyFrame( SwFlyFrame& rFrame, bool bNew = false ); + void SelectFlyFrame( SwFlyFrame& rFrame ); /// Is selected frame within another frame? const SwFrameFormat* IsFlyInFly(); diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index b31d1fc6db5d..7e3e9152736d 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -113,8 +113,7 @@ public: // If a Paragraph Style is assigned to list level N of the Outline Style, // then its outline level - AttrOutlineLevel - is set to N+1 void AssignToListLevelOfOutlineStyle(const int nAssignedListLevel); - void DeleteAssignmentToListLevelOfOutlineStyle(const bool bResetOutlineLevel - = true); + void DeleteAssignmentToListLevelOfOutlineStyle(); /** Override to recognize changes on the <SwNumRuleItem> and register/unregister the paragragh style at the corresponding <SwNumRule> instance. */ diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 5711d332ba96..1bc85cb52a16 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -144,7 +144,7 @@ public: ~SwHTMLTableLayoutColumn() {} inline void MergeCellWidthOption( sal_uInt16 nWidth, bool bPrc ); - inline void SetWidthOption( sal_uInt16 nWidth, bool bRelWidth, bool bTest ); + inline void SetWidthOption( sal_uInt16 nWidth ); sal_uInt16 GetWidthOption() const { return nWidthOption; } bool IsRelWidthOption() const { return bRelWidthOption; } @@ -319,7 +319,7 @@ public: bool Resize( sal_uInt16 nAbsAvail, bool bRecalc=false, bool bForce=false, sal_uLong nDelay=0 ); - void BordersChanged( sal_uInt16 nAbsAvail, bool bRecalc=false ); + void BordersChanged( sal_uInt16 nAbsAvail ); /** Calculate available width. This works only if a layout or a SwViewShell exists. Otherwise returns 0. @@ -417,17 +417,10 @@ inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( sal_uInt16 nCol ) return m_aColumns[nCol]; } -inline void SwHTMLTableLayoutColumn::SetWidthOption( - sal_uInt16 nWidth, bool bRelWidth, bool bTest ) +inline void SwHTMLTableLayoutColumn::SetWidthOption( sal_uInt16 nWidth ) { - if( bTest && bRelWidthOption==bRelWidth ) - { - if( nWidth > nWidthOption ) - nWidthOption = nWidth; - } - else - nWidthOption = nWidth; - bRelWidthOption = bRelWidth; + nWidthOption = nWidth; + bRelWidthOption = true; } inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol, sal_uInt16 nCol ) diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index fd00b7ce7df6..8a7bee5e8d3b 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -407,8 +407,7 @@ public: /** @return the real size of the frame or an empty rectangle if no layout exists. Needed for export filters. */ SwRect FindLayoutRect( const bool bPrtArea = false, - const Point* pPoint = nullptr, - const bool bCalcFrame = false ) const; + const Point* pPoint = nullptr ) const; SwRect FindPageFrameRect() const; /** Method creates all views of document for given node. The content diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 2f4fdfdd80ee..f6c8ec9321b4 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -147,8 +147,7 @@ public: /// add parameter <eDefaultNumberFormatPositionAndSpaceMode> SwNumRule( const OUString& rNm, const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode, - SwNumRuleType = NUM_RULE, - bool bAutoFlg = true ); + SwNumRuleType = NUM_RULE ); SwNumRule( const SwNumRule& ); ~SwNumRule(); @@ -165,8 +164,7 @@ public: void Set( sal_uInt16 i, const SwNumFormat* ); void Set( sal_uInt16 i, const SwNumFormat& ); - OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true, - bool bOnlyArabic = false ) const; + OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true ) const; /** - add optional parameter <_nRestrictToThisLevel> in order to restrict returned string to this level. */ OUString MakeNumString( const SwNumberTree::tNumberVector & rNumVector, diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index 1362733410db..30601771276b 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -267,17 +267,11 @@ public: input parameter - window size in which the preview will be displayed and for which the scaling will be calculated. - @param _bCalcScale - input parameter - control, if method should calculate the needed - scaling for the proposed preview layout for the given window size - and sets the scaling at the output device and the view options. - @return boolean, indicating, if preview layout is successful initialized. */ bool Init( const sal_uInt16 _nCols, const sal_uInt16 _nRows, - const Size& _rPxWinSize, - const bool _bCalcScale + const Size& _rPxWinSize ); /** method to adjust page preview layout to document changes diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index a78036f9354f..53ad3c2c500e 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -263,7 +263,6 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/weak.hxx> #include <crsrsh.hxx> -#include <crsskip.hxx> #include <crstate.hxx> #include <dbfld.hxx> #include <dbmgr.hxx> diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 373429b4782b..64cc025ec73e 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -125,9 +125,8 @@ class SwAnnotationItem: public SwSidebarItem public: SwAnnotationItem( SwFormatField& rFormatField, - const bool aShow, const bool aFocus) - : SwSidebarItem( aShow, aFocus ) + : SwSidebarItem( true/*aShow*/, aFocus ) , mrFormatField( rFormatField ) { } diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 36c85706d9af..9e9efca69eb5 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -357,7 +357,6 @@ public: virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, - sal_uInt8 nDialogMode, const OUString *pCollName = nullptr, bool bDraw = false, const OString& sDefPage = OString() ) = 0; @@ -371,7 +370,7 @@ public: bool bSetAutoFormat = true, const SwTableAutoFormat* pSelFormat = nullptr ) = 0; virtual SfxAbstractDialog * CreateSwBorderDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) = 0; - virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0; + virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, int nResId ) = 0; virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) = 0; virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool, diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 941f2a052f6e..742821dbdd4a 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -56,6 +56,15 @@ namespace nsSwCursorSelOverFlags const SwCursorSelOverFlags SELOVER_CHANGEPOS = 0x08; } +// define for cursor travelling normally in western text cells and chars do +// the same, but in complex text cell skip over ligatures and char skip +// into it. +// These defines exist only to cut off the dependencies to I18N project. +const sal_uInt16 CRSR_SKIP_CHARS = 0; +const sal_uInt16 CRSR_SKIP_CELLS = 1; +const sal_uInt16 CRSR_SKIP_HIDDEN = 2; + + class SW_DLLPUBLIC SwCursor : public SwPaM { friend class SwCursorSaveState; @@ -85,7 +94,7 @@ protected: public: // single argument ctors shall be explicit. - SwCursor( const SwPosition &rPos, SwPaM* pRing, bool bColumnSel ); + SwCursor( const SwPosition &rPos, SwPaM* pRing ); virtual ~SwCursor(); /// this takes a second parameter, which indicates the Ring that @@ -164,10 +173,8 @@ public: bool SttEndDoc( bool bSttDoc ); bool GoPrevNextCell( bool bNext, sal_uInt16 nCnt ); - bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual, bool bSkipHidden ) - { return LeftRight( true, nCnt, nMode, bAllowVisual, bSkipHidden, false ); } - bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual, bool bSkipHidden ) - { return LeftRight( false, nCnt, nMode, bAllowVisual, bSkipHidden, false ); } + bool Left( sal_uInt16 nCnt ) { return LeftRight( true, nCnt, CRSR_SKIP_CHARS, false/*bAllowVisual*/, false/*bSkipHidden*/, false ); } + bool Right( sal_uInt16 nCnt ) { return LeftRight( false, nCnt, CRSR_SKIP_CHARS, false/*bAllowVisual*/, false/*bSkipHidden*/, false ); } bool GoNextCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( true, nCnt ); } bool GoPrevCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( false, nCnt ); } virtual bool GotoTable( const OUString& rName ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index fd3928622e09..4909ccbc751e 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -441,8 +441,7 @@ public: // Search next/previous box with content. SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =nullptr, bool bOvrTableLns=true ) const; - SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =nullptr, - bool bOvrTableLns=true ) const; + SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =nullptr ) const; // Return name of this box. It is determined dynamically and // is calculated from the position in the lines/boxes/table. OUString GetName() const; diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx index 6ab4f0c1a06d..ee4a3ba06297 100644 --- a/sw/inc/txatritr.hxx +++ b/sw/inc/txatritr.hxx @@ -76,9 +76,8 @@ class SwLanguageIterator : public SwTextAttrIterator { public: SwLanguageIterator( const SwTextNode& rTextNode, sal_Int32 nStart = 0, - sal_uInt16 nWhich = RES_CHRATR_LANGUAGE, - bool bUseGetWhichOfScript = true ) - : SwTextAttrIterator( rTextNode, nWhich, nStart, bUseGetWhichOfScript ) + sal_uInt16 nWhich = RES_CHRATR_LANGUAGE ) + : SwTextAttrIterator( rTextNode, nWhich, nStart, true/*bUseGetWhichOfScript*/ ) {} sal_uInt16 GetLanguage() const diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 838c8b22b236..ae253f977ac1 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -624,8 +624,7 @@ public: //public fuer D&D int InsertGraphic( const OUString &rPath, const OUString &rFilter, bool bLink = true, GraphicFilter *pFlt = nullptr, - Graphic* pPreviewGrf = nullptr, - bool bRule = false ); + Graphic* pPreviewGrf = nullptr ); void ExecuteScan( SfxRequest& rReq ); diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index d616eb021a0e..3c8833a90567 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -1067,7 +1067,7 @@ void SwDocTest::randomTest() for( int i = 0; i < 2000; i++ ) { SwPaM aPam(m_pDoc->GetNodes()); - SwCursor aCrs(getRandomPosition(m_pDoc, i/20), nullptr, false); + SwCursor aCrs(getRandomPosition(m_pDoc, i/20), nullptr); aCrs.SetMark(); switch (getRand (i < 50 ? 3 : 6)) { diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index cf0afae7bf1b..933982dada4d 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -22,7 +22,6 @@ #include <editeng/editview.hxx> #include <editeng/outliner.hxx> #include <svl/srchitem.hxx> -#include <crsskip.hxx> #include <drawdoc.hxx> #include <ndtxt.hxx> #include <wrtsh.hxx> diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 64b22096a9f5..068322859076 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -15,7 +15,6 @@ #include <swmodeltestbase.hxx> #include <ndtxt.hxx> #include <wrtsh.hxx> -#include <crsskip.hxx> #include <shellio.hxx> #include <expfld.hxx> #include <drawdoc.hxx> @@ -365,7 +364,7 @@ void SwUiWriterTest::testBookmarkCopy() IDocumentMarkAccess & rIDMA(*pDoc->getIDocumentMarkAccess()); IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations()); SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1); - SwCursor aPaM(SwPosition(aIdx), nullptr, false); + SwCursor aPaM(SwPosition(aIdx), nullptr); rIDCO.InsertString(aPaM, "foo"); rIDCO.SplitNode(*aPaM.GetPoint(), false); rIDCO.InsertString(aPaM, "bar"); diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index ce2d3c5f6ec5..70ee4cc305fc 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -53,7 +53,6 @@ #include <unoport.hxx> #include <doc.hxx> #include <IDocumentRedlineAccess.hxx> -#include <crsskip.hxx> #include <txtatr.hxx> #include <acchyperlink.hxx> #include <acchypertextdata.hxx> diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 5ced1dea67fb..5d5ee5fff8ca 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -115,11 +115,9 @@ public: inline Int32Set_Impl::const_iterator GetRowIter( sal_Int32 nRow ) const; inline Int32Set_Impl::const_iterator GetColumnIter( sal_Int32 nCol ) const; - const SwFrame *GetCell( sal_Int32 nRow, sal_Int32 nColumn, bool bExact, - SwAccessibleTable *pThis ) const + const SwFrame *GetCell( sal_Int32 nRow, sal_Int32 nColumn, SwAccessibleTable *pThis ) const throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception); - const SwFrame *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop, - bool bExact ) const; + const SwFrame *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop ) const; inline sal_Int32 GetRowCount() const; inline sal_Int32 GetColumnCount() const; bool CompareExtents( const SwAccessibleTableData_Impl& r ) const; @@ -416,7 +414,7 @@ void SwAccessibleTableData_Impl::GetSelection( } const SwFrame *SwAccessibleTableData_Impl::GetCell( - sal_Int32 nRow, sal_Int32 nColumn, bool, + sal_Int32 nRow, sal_Int32 nColumn, SwAccessibleTable *pThis ) const throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -424,7 +422,7 @@ const SwFrame *SwAccessibleTableData_Impl::GetCell( Int32Set_Impl::const_iterator aSttCol( GetColumnIter( nColumn ) ); Int32Set_Impl::const_iterator aSttRow( GetRowIter( nRow ) ); - const SwFrame *pCellFrame = GetCellAtPos( *aSttCol, *aSttRow, false ); + const SwFrame *pCellFrame = GetCellAtPos( *aSttCol, *aSttRow ); return pCellFrame; } @@ -464,12 +462,12 @@ void SwAccessibleTableData_Impl::GetSelection( } const SwFrame *SwAccessibleTableData_Impl::GetCellAtPos( - sal_Int32 nLeft, sal_Int32 nTop, bool bExact ) const + sal_Int32 nLeft, sal_Int32 nTop ) const { Point aPos( mpTabFrame->Frame().Pos() ); aPos.Move( nLeft, nTop ); const SwFrame *pRet = nullptr; - FindCell( aPos, mpTabFrame, bExact, pRet ); + FindCell( aPos, mpTabFrame, false/*bExact*/, pRet ); return pRet; } @@ -1026,8 +1024,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt( GetTableData().GetColumnIter( nColumn ) ); Int32Set_Impl::const_iterator aSttRow( GetTableData().GetRowIter( nRow ) ); - const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow, - false ); + const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow ); if( pCellFrame ) { sal_Int32 nBottom = pCellFrame->Frame().Bottom(); @@ -1058,8 +1055,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt( GetTableData().GetColumnIter( nColumn ) ); Int32Set_Impl::const_iterator aSttRow( GetTableData().GetRowIter( nRow ) ); - const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow, - false ); + const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow ); if( pCellFrame ) { sal_Int32 nRight = pCellFrame->Frame().Right(); @@ -1210,7 +1206,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt( CHECK_FOR_DEFUNC( XAccessibleTable ) const SwFrame *pCellFrame = - GetTableData().GetCell( nRow, nColumn, false, this ); + GetTableData().GetCell( nRow, nColumn, this ); if( pCellFrame ) xRet = GetMap()->GetContext( pCellFrame ); @@ -1242,7 +1238,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected( CHECK_FOR_DEFUNC( XAccessibleTable ) const SwFrame *pFrame = - GetTableData().GetCell( nRow, nColumn, false, this ); + GetTableData().GetCell( nRow, nColumn, this ); if( pFrame && pFrame->IsCellFrame() ) { const SwSelBoxes *pSelBoxes = GetSelBoxes(); @@ -1268,7 +1264,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex( CHECK_FOR_DEFUNC( XAccessibleTable ) - SwAccessibleChild aCell( GetTableData().GetCell( nRow, nColumn, false, this )); + SwAccessibleChild aCell( GetTableData().GetCell( nRow, nColumn, this )); if ( aCell.IsValid() ) { nRet = GetChildIndex( *(GetMap()), aCell ); @@ -1446,10 +1442,10 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil { Int32Set_Impl::const_iterator aSttCol( GetTableData().GetColumnIter( 0 ) ); Int32Set_Impl::const_iterator aSttRow( GetTableData().GetRowIter( 1 ) ); - const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow, false ); + const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow ); Int32Set_Impl::const_iterator aSttCol2( pNewTableData->GetColumnIter( 0 ) ); Int32Set_Impl::const_iterator aSttRow2( pNewTableData->GetRowIter( 0 ) ); - const SwFrame *pCellFrame2 = pNewTableData->GetCellAtPos( *aSttCol2, *aSttRow2, false ); + const SwFrame *pCellFrame2 = pNewTableData->GetCellAtPos( *aSttCol2, *aSttRow2 ); if(pCellFrame == pCellFrame2) { diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 7e57d314efed..d36818faf860 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -2299,7 +2299,7 @@ bool SwCursorShell::SelectNxtPrvHyperlink( bool bNext ) SwFlyFrame* pFly = pFndFormat->GetFrame(&aPt); if( pFly ) { - static_cast<SwFEShell*>(this)->SelectFlyFrame( *pFly, true ); + static_cast<SwFEShell*>(this)->SelectFlyFrame( *pFly ); MakeSelVisible(); bRet = true; } diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 82c077f9e87c..1534e2e86cc3 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -42,7 +42,6 @@ #include <ndtxt.hxx> #include <pamtyp.hxx> #include <swundo.hxx> -#include <crsskip.hxx> #include <boost/optional.hpp> #include <memory> diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index ef74593df1ae..270c527fa5e4 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -31,12 +31,12 @@ #include <fmtcntnt.hxx> #include <frmatr.hxx> #include <swtable.hxx> -#include <crsskip.hxx> #include <flyfrm.hxx> #include <fmteiro.hxx> #include <section.hxx> #include <sectfrm.hxx> #include <ndtxt.hxx> +#include <swcrsr.hxx> #include <IMark.hxx> #include <DocumentSettingManager.hxx> diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index edd72bfc9965..23d60e6e8ee9 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -45,7 +45,6 @@ #include <viewsh.hxx> #include <frmatr.hxx> #include <breakit.hxx> -#include <crsskip.hxx> #include <vcl/msgbox.hxx> #include <mdiexp.hxx> #include <statstr.hrc> @@ -115,12 +114,12 @@ struct _PercentHdl } }; -SwCursor::SwCursor( const SwPosition &rPos, SwPaM* pRing, bool bColumnSel ) +SwCursor::SwCursor( const SwPosition &rPos, SwPaM* pRing ) : SwPaM( rPos, pRing ) , m_pSavePos(nullptr) , m_nRowSpanOffset(0) , m_nCursorBidiLevel(0) - , m_bColumnSelection(bColumnSel) + , m_bColumnSelection(false) { } @@ -146,7 +145,7 @@ SwCursor::~SwCursor() SwCursor* SwCursor::Create( SwPaM* pRing ) const { - return new SwCursor( *GetPoint(), pRing, false ); + return new SwCursor( *GetPoint(), pRing ); } bool SwCursor::IsReadOnlyAvailable() const @@ -1224,7 +1223,7 @@ bool SwCursor::IsStartEndSentence( bool bEnd ) const if( !bRet ) { - SwCursor aCursor(*GetPoint(), nullptr, false); + SwCursor aCursor(*GetPoint(), nullptr); SwPosition aOrigPos = *aCursor.GetPoint(); aCursor.GoSentence( bEnd ? SwCursor::END_SENT : SwCursor::START_SENT ); bRet = aOrigPos == *aCursor.GetPoint(); @@ -2110,7 +2109,7 @@ void SwCursor::RestoreSavePos() } SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing ) - : SwCursor( rPos, pRing, false ) + : SwCursor( rPos, pRing ) { m_bParked = false; m_bChanged = false; diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index e25b3348f288..2ce2f00813cc 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -540,7 +540,7 @@ void SwSelPaintRects::Get1PixelInLogic( const SwViewShell& rSh, SwShellCursor::SwShellCursor( const SwCursorShell& rCShell, const SwPosition &rPos ) - : SwCursor(rPos,nullptr,false) + : SwCursor(rPos,nullptr) , SwSelPaintRects(rCShell) , m_pInitialPoint(SwPaM::GetPoint()) {} @@ -550,7 +550,7 @@ SwShellCursor::SwShellCursor( const SwPosition &rPos, const Point& rPtPos, SwPaM* pRing ) - : SwCursor(rPos, pRing, false) + : SwCursor(rPos, pRing) , SwSelPaintRects(rCShell) , m_MarkPt(rPtPos) , m_PointPt(rPtPos) @@ -715,14 +715,14 @@ bool SwShellCursor::IsAtValidPos( bool bPoint ) const SwShellTableCursor::SwShellTableCursor( const SwCursorShell& rCursorSh, const SwPosition& rPos ) - : SwCursor(rPos,nullptr,false), SwShellCursor(rCursorSh, rPos), SwTableCursor(rPos) + : SwCursor(rPos,nullptr), SwShellCursor(rCursorSh, rPos), SwTableCursor(rPos) { } SwShellTableCursor::SwShellTableCursor( const SwCursorShell& rCursorSh, const SwPosition& rMkPos, const Point& rMkPt, const SwPosition& rPtPos, const Point& rPtPt ) - : SwCursor(rPtPos,nullptr,false), SwShellCursor(rCursorSh, rPtPos), SwTableCursor(rPtPos) + : SwCursor(rPtPos,nullptr), SwShellCursor(rCursorSh, rPtPos), SwTableCursor(rPtPos) { SetMark(); *GetMark() = rMkPos; diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index f67d2b68608c..38b57b942a32 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -106,14 +106,13 @@ VirtualDevice* DocumentDeviceManager::getVirtualDevice(/*[in]*/ bool bCreate ) c return pRet; } -void DocumentDeviceManager::setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool ) +void DocumentDeviceManager::setVirtualDevice(/*[in]*/ VirtualDevice* pVd ) { assert ( !pVd->isDisposed() ); if ( mpVirDev.get() != pVd ) { - if ( bDeleteOld ) - mpVirDev.disposeAndClear(); + mpVirDev.disposeAndClear(); mpVirDev = pVd; if ( m_rDoc.getIDocumentDrawModelAccess().GetDrawModel() && m_rDoc.GetDocumentSettingManager().get( DocumentSettingId::USE_VIRTUAL_DEVICE ) ) @@ -276,7 +275,7 @@ VirtualDevice& DocumentDeviceManager::CreateVirtualDevice_() const aMapMode.SetMapUnit( MAP_TWIP ); pNewVir->SetMapMode( aMapMode ); - const_cast<DocumentDeviceManager*>(this)->setVirtualDevice( pNewVir, true, true ); + const_cast<DocumentDeviceManager*>(this)->setVirtualDevice( pNewVir ); return *mpVirDev; } diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 8d50969ff193..e071f6f8f839 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -895,7 +895,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp SvtSysLocale aSysLocale; const LocaleDataWrapper* pLclData = aSysLocale.GetLocaleDataPtr(); const long nLang = pLclData->getLanguageTag().getLanguageType(); - bool bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, true, aCalc ); + bool bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, aCalc ); #endif // Make sure we don't hide all sections, which would lead to a crash. First, count how many of them do we have. @@ -992,7 +992,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp { UpdateDBNumFields( *const_cast<SwDBNameInfField*>(static_cast<const SwDBNameInfField*>(pField)), aCalc ); if( bCanFill ) - bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, true, aCalc ); + bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, aCalc ); } #endif break; diff --git a/sw/source/core/doc/DocumentListItemsManager.cxx b/sw/source/core/doc/DocumentListItemsManager.cxx index 7e95b174958e..c40f1f1a94fb 100644 --- a/sw/source/core/doc/DocumentListItemsManager.cxx +++ b/sw/source/core/doc/DocumentListItemsManager.cxx @@ -66,13 +66,11 @@ void DocumentListItemsManager::removeListItem( const SwNodeNum& rNodeNum ) } } -OUString DocumentListItemsManager::getListItemText( const SwNodeNum& rNodeNum, - const bool bWithNumber, - const bool bWithSpacesForLevel ) const +OUString DocumentListItemsManager::getListItemText( const SwNodeNum& rNodeNum ) const { return rNodeNum.GetTextNode() - ? rNodeNum.GetTextNode()->GetExpandText( 0, -1, bWithNumber, - bWithNumber, bWithSpacesForLevel ) + ? rNodeNum.GetTextNode()->GetExpandText( 0, -1, true/*bWithNumber*/, + true/*bWithNumber*/, true/*bWithSpacesForLevel*/ ) : OUString(); } diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index d75eb64ec2ea..544f45ac1fc7 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -742,7 +742,7 @@ namespace sw { namespace mark { if ( pSaveBkmk ) { - pSaveBkmk->push_back( SaveBookmark( true, true, *pMark, rStt, pSttIdx ) ); + pSaveBkmk->push_back( SaveBookmark( *pMark, rStt, pSttIdx ) ); } vMarksToDelete.push_back(ppMark); } @@ -1192,16 +1192,14 @@ const IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const { return static_cast< IDocumentMarkAccess* >(mpMarkManager.get()); } SaveBookmark::SaveBookmark( - bool bSavePos, - bool bSaveOtherPos, const IMark& rBkmk, const SwNodeIndex & rMvPos, const SwIndex* pIdx) : m_aName(rBkmk.GetName()) , m_aShortName() , m_aCode() - , m_bSavePos(bSavePos) - , m_bSaveOtherPos(bSaveOtherPos) + , m_bSavePos(true) + , m_bSaveOtherPos(true) , m_eOrigBkmType(IDocumentMarkAccess::GetType(rBkmk)) { const IBookmark* const pBookmark = dynamic_cast< const IBookmark* >(&rBkmk); diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 4a5abec3e4cf..9160825fd90a 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -166,8 +166,8 @@ class CompareFrameFormatText : public CompareData { const SwNodeIndex &m_rIndex; public: - CompareFrameFormatText(SwDoc &rD, const SwNodeIndex &rIndex, bool bRecordDiff=true) - : CompareData(rD, bRecordDiff) + CompareFrameFormatText(SwDoc &rD, const SwNodeIndex &rIndex) + : CompareData(rD, true/*bRecordDiff*/) , m_rIndex(rIndex) { } diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 7dc26e149a43..fe173a69568a 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -557,7 +557,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, { SwIndex aStartIndex( dynamic_cast< SwTextNode* >( pNd ), nBeginGrammarCheck ); SwPosition aStart( *pNd, aStartIndex ); - SwCursor aCursor(aStart, nullptr, false); + SwCursor aCursor(aStart, nullptr); SwPosition aOrigPos = *aCursor.GetPoint(); aCursor.GoSentence( SwCursor::START_SENT ); if( aOrigPos != *aCursor.GetPoint() ) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 2f456e4549eb..770e91ce5165 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1314,7 +1314,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam ) aRegH.RegisterInModify( pTNd, *pTNd ); if( pUndo ) - pUndo->AddNode( *pTNd, false ); + pUndo->AddNode( *pTNd ); // directly set list style attribute is reset, otherwise empty // list style is applied diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index d90cfd6281e0..1fc9a2a80309 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -36,7 +36,7 @@ #include <pam.hxx> #include <swundo.hxx> #include <breakit.hxx> -#include <crsskip.hxx> +#include <swcrsr.hxx> using namespace ::com::sun::star::i18n; diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 887175809dbe..2eb305a5aa6b 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -692,7 +692,7 @@ static const SwTextNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl // then find the "Anchor" (Body) position Point aPt; SwNode2Layout aNode2Layout( *pNd, pNd->GetIndex() ); - const SwFrame* pFrame = aNode2Layout.GetFrame( &aPt, nullptr, false ); + const SwFrame* pFrame = aNode2Layout.GetFrame( &aPt, nullptr ); if( pFrame ) { diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 04a067fbd15b..464418873842 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -668,14 +668,10 @@ void SwTextFormatColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLe } } -void SwTextFormatColl::DeleteAssignmentToListLevelOfOutlineStyle( - const bool bResetOutlineLevel) +void SwTextFormatColl::DeleteAssignmentToListLevelOfOutlineStyle() { mbAssignedToOutlineStyle = false; - if (bResetOutlineLevel) - { - ResetFormatAttr(RES_PARATR_OUTLINELEVEL); - } + ResetFormatAttr(RES_PARATR_OUTLINELEVEL); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index e18e74d60744..89e618e802a0 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -974,7 +974,7 @@ void SwHTMLTableLayout::AutoLayoutPass1() if( nRel+nColWidth > 100 ) { nColWidth = 100 - nRel; - pColumn->SetWidthOption( nColWidth, true, false ); + pColumn->SetWidthOption( nColWidth ); } nRelMax += pColumn->GetMax(); nRel = nRel + nColWidth; @@ -1008,7 +1008,7 @@ void SwHTMLTableLayout::AutoLayoutPass1() // the next column gets the rest sal_uInt16 nColWidth = (sal_uInt16)((pColumn->GetMax() * nRelLeft) / nFixMax); - pColumn->SetWidthOption( nColWidth, true, false ); + pColumn->SetWidthOption( nColWidth ); } } } @@ -1817,11 +1817,11 @@ bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc, return true; } -void SwHTMLTableLayout::BordersChanged( sal_uInt16 nAbsAvail, bool bRecalc ) +void SwHTMLTableLayout::BordersChanged( sal_uInt16 nAbsAvail ) { m_bBordersChanged = true; - Resize( nAbsAvail, bRecalc ); + Resize( nAbsAvail, true/*bRecalc*/ ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index bf53bcde0e87..19d7a792fa3c 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -336,8 +336,7 @@ static void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror ) } /** Calculate the Bitmap's position and the size within the passed rectangle */ -void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* pOrigRect, - bool ) const +void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* pOrigRect ) const { // Currently only used for scaling, cropping and mirroring the contour of graphics! // Everything else is handled by GraphicObject diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index f3372869c76e..6ab9acca5ece 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -372,8 +372,7 @@ const SwFormatVertOrient* SwNumFormat::GetGraphicOrientation() const SwNumRule::SwNumRule( const OUString& rNm, const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode, - SwNumRuleType eType, - bool bAutoFlg ) + SwNumRuleType eType ) : maTextNodeList(), maParagraphStyleList(), mpNumRuleMap(nullptr), @@ -382,7 +381,7 @@ SwNumRule::SwNumRule( const OUString& rNm, mnPoolFormatId( USHRT_MAX ), mnPoolHelpId( USHRT_MAX ), mnPoolHlpFileId( UCHAR_MAX ), - mbAutoRuleFlag( bAutoFlg ), + mbAutoRuleFlag( true ), mbInvalidRuleFlag( true ), mbContinusNum( false ), mbAbsSpaces( false ), @@ -631,12 +630,10 @@ void SwNumRule::Set( sal_uInt16 i, const SwNumFormat* pNumFormat ) } } -OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, bool bInclStrings, - bool bOnlyArabic ) const +OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, bool bInclStrings ) const { if (rNum.IsCounted()) - return MakeNumString(rNum.GetNumberVector(), - bInclStrings, bOnlyArabic); + return MakeNumString(rNum.GetNumberVector(), bInclStrings); return OUString(); } diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index f6e3a40fa840..3049790d4a83 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -1372,12 +1372,12 @@ struct _InsULPara SwTableBox* pLeftBox; - _InsULPara( SwTableNode* pTNd, bool bUpperLower, bool bUpper, + _InsULPara( SwTableNode* pTNd, SwTableBox* pLeft, SwTableLine* pLine=nullptr, SwTableBox* pBox=nullptr ) : pTableNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ), pLeftBox( pLeft ) - { bUL_LR = bUpperLower; bUL = bUpper; } + { bUL_LR = true; bUL = true; } void SetLeft( SwTableBox* pBox=nullptr ) { bUL_LR = false; bUL = true; if( pBox ) pInsBox = pBox; } @@ -1613,7 +1613,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes, // This contains all Lines that are above the selected Area, // thus they form a Upper/Lower Line - _InsULPara aPara( pTableNd, true, true, pLeftBox, pInsLine ); + _InsULPara aPara( pTableNd, pLeftBox, pInsLine ); // Move the overlapping upper/lower Lines of the selected Area for (auto & it : pFndBox->GetLines().front()->GetBoxes()) @@ -2324,12 +2324,11 @@ SwTableBox* SwTableBox::FindNextBox( const SwTable& rTable, // Find the next Box with content from this Line SwTableBox* SwTableBox::FindPreviousBox( const SwTable& rTable, - const SwTableBox* pSrchBox, bool bOvrTableLns ) const + const SwTableBox* pSrchBox ) const { if( !pSrchBox && GetTabLines().empty() ) return const_cast<SwTableBox*>(this); - return GetUpper()->FindPreviousBox( rTable, pSrchBox ? pSrchBox : this, - bOvrTableLns ); + return GetUpper()->FindPreviousBox( rTable, pSrchBox ? pSrchBox : this ); } static void lcl_BoxSetHeadCondColl( const SwTableBox* pBox ) diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 813dad939947..45f9bfb526b8 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2590,7 +2590,7 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* , if ( pContent && pContent->IsTextFrame() ) { const SwPosition aPos( *static_cast<const SwTextFrame*>(pContent)->GetTextNode() ); - const SwCursor aTmpCursor( aPos, nullptr, false ); + const SwCursor aTmpCursor( aPos, nullptr ); ::GetTableSel( aTmpCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_COL ); } @@ -2884,7 +2884,7 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* aNew.SetHeightSizeType( ATT_MIN_SIZE ); // This position must not be in an overlapped box const SwPosition aPos( *static_cast<const SwTextFrame*>(pContent)->GetTextNode() ); - const SwCursor aTmpCursor( aPos, nullptr, false ); + const SwCursor aTmpCursor( aPos, nullptr ); SetRowHeight( aTmpCursor, aNew ); // For the new table model we're done, for the old one // there might be another (sub)row to adjust... @@ -4225,7 +4225,7 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos ) SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : nullptr ); aRegH.RegisterInModify( pTextNode , *pTextNode ); if ( pUndo ) - pUndo->AddNode( *pTextNode , false ); + pUndo->AddNode( *pTextNode ); SfxStringItem * pNewItem = static_cast<SfxStringItem*>(pFormatItem->Clone()); pNewItem->SetValue(OUString()); rSet.Put( *pNewItem ); diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 1a53db7fdb3b..f48472133f61 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -804,7 +804,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ) SwTabFrame* pTabFrame = pFrame->ImplFindTabFrame(); pTableLayout->BordersChanged( - pTableLayout->GetBrowseWidthByTabFrame( *pTabFrame ), true ); + pTableLayout->GetBrowseWidthByTabFrame( *pTabFrame ) ); } SwTableFormatCmp::Delete( aFormatCmp ); ::ClearFEShellTabCols(); @@ -899,7 +899,7 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor, SwTabFrame* pTabFrame = pFrame->ImplFindTabFrame(); pTableLayout->BordersChanged( - pTableLayout->GetBrowseWidthByTabFrame( *pTabFrame ), true ); + pTableLayout->GetBrowseWidthByTabFrame( *pTabFrame ) ); } ::ClearFEShellTabCols(); getIDocumentState().SetModified(); diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index fc8dcf5c94da..0dff01656efb 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -54,7 +54,6 @@ #include <pagedesc.hxx> #include <fmtpdsc.hxx> #include <breakit.hxx> -#include <crsskip.hxx> #include <SwStyleNameMapper.hxx> #include <scriptinfo.hxx> #include <rootfrm.hxx> @@ -67,6 +66,7 @@ #include <calbck.hxx> #include "ndole.hxx" #include <memory> +#include <swcrsr.hxx> using namespace ::com::sun::star::i18n; @@ -1112,12 +1112,11 @@ SwContentFrame *SwContentNode::getLayoutFrame( const SwRootFrame* _pRoot, pPoint, pPos, bCalcFrame )); } -SwRect SwContentNode::FindLayoutRect( const bool bPrtArea, const Point* pPoint, - const bool bCalcFrame ) const +SwRect SwContentNode::FindLayoutRect( const bool bPrtArea, const Point* pPoint ) const { SwRect aRet; SwContentFrame* pFrame = static_cast<SwContentFrame*>( ::GetFrameOfModify( nullptr, *const_cast<SwModify*>(static_cast<SwModify const *>(this)), - FRM_CNTNT, pPoint, nullptr, bCalcFrame ) ); + FRM_CNTNT, pPoint ) ); if( pFrame ) aRet = bPrtArea ? pFrame->Prt() : pFrame->Frame(); return aRet; diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index d73858662279..2665aa39c305 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -452,10 +452,9 @@ SwNode2Layout::~SwNode2Layout() } SwFrame* SwNode2Layout::GetFrame( const Point* pDocPos, - const SwPosition *pPos, - const bool bCalcFrame ) const + const SwPosition *pPos ) const { - return pImpl->GetFrame( pDocPos, pPos, bCalcFrame ); + return pImpl->GetFrame( pDocPos, pPos, false/*bCalcFrame*/ ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index c4843969d31d..7f7d3739548a 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -37,7 +37,6 @@ #include <breakit.hxx> #include <txtfld.hxx> #include <fmtfld.hxx> -#include <crsskip.hxx> #include <txtfrm.hxx> #include <scriptinfo.hxx> #include <svl/ctloptions.hxx> diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index 0d54fe0ea35b..70b13d35eb98 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -178,7 +178,7 @@ bool SwEditShell::Copy( SwEditShell* pDestShell ) // by simulated cursor movements from the given first insert position if( nMove ) { - SwCursor aCursor( *pPos, nullptr, false); + SwCursor aCursor( *pPos, nullptr); if( aCursor.UpDown( false, nMove, nullptr, 0 ) ) { pInsertPos.reset( new SwPosition( *aCursor.GetPoint() ) ); diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index cfc69628eb5d..273840b14e44 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -42,22 +42,13 @@ #include <IDocumentContentOperations.hxx> /// count field types with a ResId, if 0 count all -size_t SwEditShell::GetFieldTypeCount(sal_uInt16 nResId, bool bUsed ) const +size_t SwEditShell::GetFieldTypeCount(sal_uInt16 nResId ) const { const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes(); if(nResId == USHRT_MAX) { - if(!bUsed) - return static_cast<sal_uInt16>(pFieldTypes->size()); - - size_t nUsed = 0; - for ( const auto pFieldType : *pFieldTypes ) - { - if(IsUsed(*pFieldType)) - nUsed++; - } - return nUsed; + return static_cast<sal_uInt16>(pFieldTypes->size()); } // all types with the same ResId @@ -72,26 +63,13 @@ size_t SwEditShell::GetFieldTypeCount(sal_uInt16 nResId, bool bUsed ) const } /// get field types with a ResId, if 0 get all -SwFieldType* SwEditShell::GetFieldType(size_t nField, sal_uInt16 nResId, bool bUsed ) const +SwFieldType* SwEditShell::GetFieldType(size_t nField, sal_uInt16 nResId ) const { const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes(); if(nResId == USHRT_MAX && nField < pFieldTypes->size()) { - if(!bUsed) - return (*pFieldTypes)[nField]; - - size_t nUsed = 0; - for ( const auto pFieldType : *pFieldTypes ) - { - if(IsUsed(*pFieldType)) - { - if(nUsed == nField) - return pFieldType; - nUsed++; - } - } - return nullptr; + return (*pFieldTypes)[nField]; } size_t nIdx = 0; @@ -100,12 +78,9 @@ SwFieldType* SwEditShell::GetFieldType(size_t nField, sal_uInt16 nResId, bool bU // same ResId -> increment index if(pFieldType->Which() == nResId) { - if (!bUsed || IsUsed(*pFieldType)) - { - if(nIdx == nField) - return pFieldType; - nIdx++; - } + if(nIdx == nField) + return pFieldType; + nIdx++; } } return nullptr; diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 03bafcc913d2..a92c6764d911 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -53,7 +53,6 @@ #include <txtfrm.hxx> #include <rootfrm.hxx> #include <extinput.hxx> -#include <crsskip.hxx> #include <scriptinfo.hxx> #include <unocrsrhelper.hxx> #include <section.hxx> diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index f052fb6e9f27..c4e59c7083c5 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -50,7 +50,6 @@ #include <mdiexp.hxx> #include <statstr.hrc> #include <cntfrm.hxx> -#include <crsskip.hxx> #include <splargs.hxx> #include <redline.hxx> #include <docary.hxx> diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 27c0c04d4be2..b5bb25a42101 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -856,12 +856,11 @@ sal_uInt16 SwEditShell::GetNodeNumStart( SwPaM* pPaM ) const } const SwNumRule * SwEditShell::SearchNumRule( const bool bNum, - const bool bOutline, int nNonEmptyAllowed, OUString& sListId ) { return GetDoc()->SearchNumRule( *(GetCursor()->Start()), - false/*bForward*/, bNum, bOutline, nNonEmptyAllowed, + false/*bForward*/, bNum, false/*bOutline*/, nNonEmptyAllowed, sListId ); } diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx index 5d0113a16a3a..fe5b50ad23b4 100644 --- a/sw/source/core/edit/edtab.cxx +++ b/sw/source/core/edit/edtab.cxx @@ -447,7 +447,7 @@ bool SwEditShell::SplitTable( sal_uInt16 eMode ) return bRet; } -bool SwEditShell::MergeTable( bool bWithPrev, sal_uInt16 nMode ) +bool SwEditShell::MergeTable( bool bWithPrev ) { bool bRet = false; SwPaM *pCursor = GetCursor(); @@ -456,7 +456,7 @@ bool SwEditShell::MergeTable( bool bWithPrev, sal_uInt16 nMode ) StartAllAction(); GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, nullptr); - bRet = GetDoc()->MergeTable( *pCursor->GetPoint(), bWithPrev, nMode ); + bRet = GetDoc()->MergeTable( *pCursor->GetPoint(), bWithPrev ); GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, nullptr); ClearFEShellTabCols(); diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index ed40e7c450b2..a446e73b708e 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -78,7 +78,7 @@ void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext) pPageFrame->InvalidateFlyLayout(); pPageFrame->InvalidateContent(); - static_cast<SwFEShell*>(this)->SelectFlyFrame(*pFly, true); + static_cast<SwFEShell*>(this)->SelectFlyFrame(*pFly); } } } diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 2a99fa227f00..6040898f875f 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -563,7 +563,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, { //JP 12.05.98: should this be in SelectFlyFrame??? pDestShell->Imp()->GetDrawView()->UnmarkAll(); - pDestShell->SelectFlyFrame( *pFlyFrame, true ); + pDestShell->SelectFlyFrame( *pFlyFrame ); } } @@ -761,7 +761,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc ) { // Now we have to look for insertion positions... if( !nMove ) // Annotate the last given insert position aStartPos = aInsertPos; - SwCursor aCursor( aStartPos, nullptr, false); + SwCursor aCursor( aStartPos, nullptr); // Check if we find another insert position by moving // down the last given position if( aCursor.UpDown( false, ++nMove, nullptr, 0 ) ) @@ -998,7 +998,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc ) SwFlyFrame* pFlyFrame = static_cast<SwFlyFrameFormat*>(pNew)-> GetFrame( &aPt ); if( pFlyFrame ) - SelectFlyFrame( *pFlyFrame, true ); + SelectFlyFrame( *pFlyFrame ); // always pick the first FlyFrame only; the others // were copied to the clipboard via Fly in Fly break; diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 82f103de4930..0367dd701cf5 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -220,7 +220,7 @@ bool sw_ChkAndSetNewAnchor( return ::lcl_FindAnchorPos( *pDoc, rFly.Frame().Pos(), rFly, rSet ); } -void SwFEShell::SelectFlyFrame( SwFlyFrame& rFrame, bool bNew ) +void SwFEShell::SelectFlyFrame( SwFlyFrame& rFrame ) { SET_CURR_SHELL( this ); @@ -232,7 +232,7 @@ void SwFEShell::SelectFlyFrame( SwFlyFrame& rFrame, bool bNew ) // The frames should not be selected by the document position, because // it should have been selected! SwViewShellImp *pImpl = Imp(); - if( GetWin() && (bNew || !pImpl->GetDrawView()->AreObjectsMarked()) ) + if( GetWin() ) { OSL_ENSURE( rFrame.IsFlyFrame(), "SelectFlyFrame will einen Fly" ); @@ -750,7 +750,7 @@ const SwFrameFormat *SwFEShell::NewFlyFrame( const SfxItemSet& rSet, bool bAnchV { SwFlyFrame* pFrame = pRet->GetFrame( &aPt ); if( pFrame ) - SelectFlyFrame( *pFrame, true ); + SelectFlyFrame( *pFrame ); else { GetLayout()->SetAssertFlyPages(); @@ -839,7 +839,7 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName, pPageFrame->InvalidateFlyLayout(); pPageFrame->InvalidateContent(); - SelectFlyFrame( *pFrame, true ); + SelectFlyFrame( *pFrame ); } else GetLayout()->SetAssertFlyPages(); @@ -869,7 +869,7 @@ SwFlyFrameFormat* SwFEShell::InsertObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrame* pFrame = pFormat->GetFrame( &aPt ); if( pFrame ) - SelectFlyFrame( *pFrame, true ); + SelectFlyFrame( *pFrame ); else GetLayout()->SetAssertFlyPages(); } @@ -1052,7 +1052,7 @@ bool SwFEShell::SetFlyFrameAttr( SfxItemSet& rSet ) bRet = true; SwFlyFrame* pFrame = pFlyFormat->GetFrame( &aPt ); if( pFrame ) - SelectFlyFrame( *pFrame, true ); + SelectFlyFrame( *pFrame ); else GetLayout()->SetAssertFlyPages(); } @@ -1194,7 +1194,7 @@ void SwFEShell::SetFrameFormat( SwFrameFormat *pNewFormat, bool bKeepOrient, Poi { SwFlyFrame* pFrame = pFlyFormat->GetFrame( &aPt ); if( pFrame ) - SelectFlyFrame( *pFrame, true ); + SelectFlyFrame( *pFrame ); else GetLayout()->SetAssertFlyPages(); } diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 29bf8088c473..a6e4b8db2b36 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -132,7 +132,7 @@ void SwFEShell::ParkCursorInTab() /* Set cursor to end of selection to ensure IsLastCellInRow works properly. */ { - SwCursor aTmpCursor( aEndPos, nullptr, false ); + SwCursor aTmpCursor( aEndPos, nullptr ); *pSwCursor = aTmpCursor; } @@ -146,13 +146,13 @@ void SwFEShell::ParkCursorInTab() it to the next cell. */ { - SwCursor aTmpCursor( aStartPos, nullptr, false ); + SwCursor aTmpCursor( aStartPos, nullptr ); *pSwCursor = aTmpCursor; } if (! pSwCursor->GoPrevCell()) { - SwCursor aTmpCursor( aEndPos, nullptr, false ); + SwCursor aTmpCursor( aEndPos, nullptr ); *pSwCursor = aTmpCursor; pSwCursor->GoNextCell(); } @@ -164,13 +164,13 @@ void SwFEShell::ParkCursorInTab() to the previous cell. */ { - SwCursor aTmpCursor( aEndPos, nullptr, false ); + SwCursor aTmpCursor( aEndPos, nullptr ); *pSwCursor = aTmpCursor; } if (! pSwCursor->GoNextCell()) { - SwCursor aTmpCursor( aStartPos, nullptr, false ); + SwCursor aTmpCursor( aStartPos, nullptr ); *pSwCursor = aTmpCursor; pSwCursor->GoPrevCell(); } diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index b67b1fedb84c..35bf7b50aaf9 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -502,7 +502,7 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rText, con { const Point aPt(GetCursorDocPos()); if (SwFlyFrame* pFrame = pFlyFormat->GetFrame(&aPt)) - SelectFlyFrame(*pFrame, true); + SelectFlyFrame(*pFrame); } EndUndo(); EndAllActionAndCall(); diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx index 25a049c3dfb2..a4991ec00483 100644 --- a/sw/source/core/inc/DocumentDeviceManager.hxx +++ b/sw/source/core/inc/DocumentDeviceManager.hxx @@ -47,7 +47,7 @@ public: VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const override; - void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool ) override; + void setVirtualDevice(/*[in]*/ VirtualDevice* pVd ) override; OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const override; diff --git a/sw/source/core/inc/DocumentListItemsManager.hxx b/sw/source/core/inc/DocumentListItemsManager.hxx index c08c19e5318e..34e9fcc99437 100644 --- a/sw/source/core/inc/DocumentListItemsManager.hxx +++ b/sw/source/core/inc/DocumentListItemsManager.hxx @@ -37,9 +37,7 @@ public: void addListItem( const SwNodeNum& rNodeNum ) override; void removeListItem( const SwNodeNum& rNodeNum ) override; - OUString getListItemText( const SwNodeNum& rNodeNum, - const bool bWithNumber = true, - const bool bWithSpacesForLevel = false ) const override; + OUString getListItemText( const SwNodeNum& rNodeNum ) const override; void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const override; diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index 5b5b7164d32e..1d0a1fc33aeb 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -76,7 +76,7 @@ public: virtual void RedoImpl( ::sw::UndoRedoContext & ) override; virtual void RepeatImpl( ::sw::RepeatContext & ) override; - void AddNode( const SwTextNode& rNd, bool bResetLRSpace ); + void AddNode( const SwTextNode& rNd ); SwHistory* GetHistory() { return pHistory; } }; diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index d33ea5582c8e..8ddc89ffd404 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -57,7 +57,7 @@ public: SwCellFrame* GetPreviousCell() const; // used for rowspan stuff: - const SwCellFrame& FindStartEndOfRowSpanCell( bool bStart, bool bCurrentTab ) const; + const SwCellFrame& FindStartEndOfRowSpanCell( bool bStart ) const; long GetLayoutRowSpan() const; DECL_FIXEDMEMPOOL_NEWDEL(SwCellFrame) diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 60ac54efcbdf..49fe70729742 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -397,7 +397,7 @@ class SwOrderIter const bool m_bFlysOnly; public: - SwOrderIter( const SwPageFrame *pPage, bool bFlysOnly = true ); + SwOrderIter( const SwPageFrame *pPage ); void Current( const SdrObject *pNew ) { m_pCurrent = pNew; } const SdrObject *operator()() const { return m_pCurrent; } diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index 566ca5490ee7..64e91e4cf514 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -60,7 +60,7 @@ protected: virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; - long CalcRel( const SwFormatFrameSize &rSz, bool bWidth ) const; + long CalcRel( const SwFormatFrameSize &rSz ) const; public: // --> #i28701# diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index 36db7b08cc15..63227421d649 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -46,8 +46,7 @@ namespace sw { namespace mark class SaveBookmark { public: - SaveBookmark(bool bSavePos, - bool bSaveOtherPos, + SaveBookmark( const ::sw::mark::IMark& rBkmk, const SwNodeIndex& rMvPos, const SwIndex* pIdx =nullptr); diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx index 292fd7b6fbca..7fb2fcd3570e 100644 --- a/sw/source/core/inc/node2lay.hxx +++ b/sw/source/core/inc/node2lay.hxx @@ -67,9 +67,7 @@ public: SwLayoutFrame* UpperFrame( SwFrame* &rpFrame, const SwNode& rNode ); void RestoreUpperFrames( SwNodes& rNds, sal_uLong nStt, sal_uLong nEnd ); - SwFrame *GetFrame( const Point* pDocPos = nullptr, - const SwPosition *pPos = nullptr, - const bool bCalcFrame = true ) const; + SwFrame *GetFrame( const Point* pDocPos, const SwPosition *pPos ) const; }; #endif diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index ddd7ba9c81f8..6ed54dbeb716 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -53,7 +53,7 @@ public: virtual bool GetCursorOfst(SwPosition* pPos, Point& aPoint, SwCursorMoveState* = nullptr, bool bTestBackground = false) const override; - void GetGrfArea( SwRect &rRect, SwRect * = nullptr, bool bMirror = true ) const; + void GetGrfArea( SwRect &rRect, SwRect * = nullptr ) const; bool IsTransparent() const; diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index e902fb627981..1b5a0087a168 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -338,7 +338,7 @@ class SwHistory public: typedef std::vector<SwHistoryHint*>::iterator SwpHstry_iterator; - SwHistory( sal_uInt16 nInitSz = 0 ); + SwHistory(); ~SwHistory(); // delete History diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx index 3a08805707af..f5de71cd684c 100644 --- a/sw/source/core/inc/txtfly.hxx +++ b/sw/source/core/inc/txtfly.hxx @@ -146,7 +146,7 @@ class SwTextFly \param[in] rPortion Scope: document global. */ - SwRect _GetFrame( const SwRect &rPortion, bool bTop ) const; + SwRect _GetFrame( const SwRect &rPortion ) const; SwAnchoredObjList* InitAnchoredObjList(); @@ -356,7 +356,7 @@ inline void SwTextFly::SetNextTop( long nNew ) const inline SwRect SwTextFly::GetFrame( const SwRect &rRect ) const { - return bOn ? _GetFrame( rRect, true/*bTop*/ ) : SwRect(); + return bOn ? _GetFrame( rRect ) : SwRect(); } inline void SwTextFly::SetIgnoreCurrentFrame( bool bNew ) diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 23ad78c17677..316d97498a2d 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -1529,7 +1529,7 @@ SwCellFrame* SwCellFrame::GetFollowCell() const if ( !pRow->GetNext() ) { - pThisCell = &pThisCell->FindStartEndOfRowSpanCell( false, true ); + pThisCell = &pThisCell->FindStartEndOfRowSpanCell( false ); pRow = pThisCell->GetUpper(); } } @@ -1576,7 +1576,7 @@ SwCellFrame* SwCellFrame::GetPreviousCell() const if ( pMasterRow ) pRet = lcl_FindCorrespondingCellFrame( *static_cast<const SwRowFrame*>(pRow), *this, *pMasterRow, false ); if ( pRet && pRet->GetTabBox()->getRowSpan() < 1 ) - pRet = &const_cast<SwCellFrame&>(pRet->FindStartEndOfRowSpanCell( true, true )); + pRet = &const_cast<SwCellFrame&>(pRet->FindStartEndOfRowSpanCell( true )); } } } @@ -1585,7 +1585,7 @@ SwCellFrame* SwCellFrame::GetPreviousCell() const } // --> NEW TABLES -const SwCellFrame& SwCellFrame::FindStartEndOfRowSpanCell( bool bStart, bool bCurrentTableOnly ) const +const SwCellFrame& SwCellFrame::FindStartEndOfRowSpanCell( bool bStart ) const { const SwCellFrame* pRet = nullptr; @@ -1604,31 +1604,28 @@ const SwCellFrame& SwCellFrame::FindStartEndOfRowSpanCell( bool bStart, bool bCu const SwTable* pTable = pTableFrame->GetTable(); sal_uInt16 nMax = USHRT_MAX; - if ( bCurrentTableOnly ) - { - const SwFrame* pCurrentRow = GetUpper(); - const bool bDoNotEnterHeadline = bStart && pTableFrame->IsFollow() && + const SwFrame* pCurrentRow = GetUpper(); + const bool bDoNotEnterHeadline = bStart && pTableFrame->IsFollow() && !pTableFrame->IsInHeadline( *pCurrentRow ); - // check how many rows we are allowed to go up or down until we reach the end of - // the current table frame: - nMax = 0; - while ( bStart ? pCurrentRow->GetPrev() : pCurrentRow->GetNext() ) + // check how many rows we are allowed to go up or down until we reach the end of + // the current table frame: + nMax = 0; + while ( bStart ? pCurrentRow->GetPrev() : pCurrentRow->GetNext() ) + { + if ( bStart ) { - if ( bStart ) - { - // do not enter a repeated headline: - if ( bDoNotEnterHeadline && pTableFrame->IsFollow() && - pTableFrame->IsInHeadline( *pCurrentRow->GetPrev() ) ) - break; + // do not enter a repeated headline: + if ( bDoNotEnterHeadline && pTableFrame->IsFollow() && + pTableFrame->IsInHeadline( *pCurrentRow->GetPrev() ) ) + break; - pCurrentRow = pCurrentRow->GetPrev(); - } - else - pCurrentRow = pCurrentRow->GetNext(); - - ++nMax; + pCurrentRow = pCurrentRow->GetPrev(); } + else + pCurrentRow = pCurrentRow->GetNext(); + + ++nMax; } // By passing the nMax value for Find*OfRowSpan (in case of bCurrentTableOnly @@ -1646,23 +1643,10 @@ const SwCellFrame& SwCellFrame::FindStartEndOfRowSpanCell( bool bStart, bool bCu { const SwTabFrame* pMasterTable = static_cast<const SwTabFrame*>(pMasterCell->GetUpper()->GetUpper()); - if ( bCurrentTableOnly ) + if ( pMasterTable == pTableFrame ) { - if ( pMasterTable == pTableFrame ) - { - pRet = pMasterCell; - break; - } - } - else - { - if ( pMasterTable == pTableFrame || - ( (bStart && pMasterTable->IsAnFollow(pTableFrame)) || - (!bStart && pTableFrame->IsAnFollow(pMasterTable)) ) ) - { - pRet = pMasterCell; - break; - } + pRet = pMasterCell; + break; } } } diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 42070f9bc39a..603c3f4d6b2c 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2497,7 +2497,7 @@ bool SwFlyFrame::GetContour( tools::PolyPolygon& rContour, SwRect aClip; SwRect aOrig; Lower()->Calc(pRenderContext); - static_cast<const SwNoTextFrame*>(Lower())->GetGrfArea( aClip, &aOrig, false ); + static_cast<const SwNoTextFrame*>(Lower())->GetGrfArea( aClip, &aOrig ); // OD 16.04.2003 #i13147# - copy method code <SvxContourDlg::ScaleContour(..)> // in order to avoid that graphic has to be loaded for contour scale. //SvxContourDlg::ScaleContour( rContour, aGrf, MAP_TWIP, aOrig.SSize() ); diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 5d53ab3de131..25ef901bce30 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2225,10 +2225,10 @@ SwBorderAttrs *SwBorderAttrAccess::Get() return static_cast<SwBorderAttrs*>(SwCacheAccess::Get()); } -SwOrderIter::SwOrderIter( const SwPageFrame *pPg, bool bFlys ) : +SwOrderIter::SwOrderIter( const SwPageFrame *pPg ) : m_pPage( pPg ), m_pCurrent( nullptr ), - m_bFlysOnly( bFlys ) + m_bFlysOnly( true ) { } diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index e7625d938feb..71b642d415ad 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -154,7 +154,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, { bSuccess = false; _InvalidatePrevObjs( _rAnchoredObj ); - _InvalidateFollowObjs( _rAnchoredObj, true ); + _InvalidateFollowObjs( _rAnchoredObj ); } // format anchor text frame, if wrapping style influence of the object @@ -211,7 +211,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, mrAnchorTextFrame.InvalidatePos(); bSuccess = false; _InvalidatePrevObjs( _rAnchoredObj ); - _InvalidateFollowObjs( _rAnchoredObj, true ); + _InvalidateFollowObjs( _rAnchoredObj ); } else { @@ -267,7 +267,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, // Invalidate object and following objects for the restart of the // layout process - _InvalidateFollowObjs( _rAnchoredObj, true ); + _InvalidateFollowObjs( _rAnchoredObj ); } else { @@ -395,7 +395,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() mrAnchorTextFrame.InvalidatePos(); bSuccess = false; _InvalidatePrevObjs( *pObj ); - _InvalidateFollowObjs( *pObj, true ); + _InvalidateFollowObjs( *pObj ); } else { @@ -436,7 +436,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() // Invalidate object and following objects for the restart of the // layout process - _InvalidateFollowObjs( *pObj, true ); + _InvalidateFollowObjs( *pObj ); } else { @@ -491,13 +491,9 @@ void SwObjectFormatterTextFrame::_InvalidatePrevObjs( SwAnchoredObject& _rAnchor } } -void SwObjectFormatterTextFrame::_InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj, - const bool _bInclObj ) +void SwObjectFormatterTextFrame::_InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj ) { - if ( _bInclObj ) - { - _rAnchoredObj.InvalidateObjPosForConsiderWrapInfluence(); - } + _rAnchoredObj.InvalidateObjPosForConsiderWrapInfluence(); const SwSortedObjs* pObjs = GetPageFrame().GetSortedObjs(); if ( pObjs ) diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx index 8220e60b92c3..6932457f286e 100644 --- a/sw/source/core/layout/objectformattertxtfrm.hxx +++ b/sw/source/core/layout/objectformattertxtfrm.hxx @@ -56,13 +56,8 @@ class SwObjectFormatterTextFrame : public SwObjectFormatter @param _rAnchoredObj reference to anchored object - objects, anchored after this one will be invalidated. - - @param _bInclObj - boolean indicates, if given anchored object <_rAnchoredObj> also have - to be invalidated. */ - void _InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj, - const bool _bInclObj ); + void _InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj ); /** method to determine first anchored object, whose 'anchor is moved forward'. diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 0e2fed891fb0..de4f7496e9e6 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -335,7 +335,7 @@ static void lcl_ShrinkCellsAndAllContent( SwRowFrame& rRow ) { // NEW TABLES SwCellFrame& rToAdjust = pCurrMasterCell->GetTabBox()->getRowSpan() < 1 ? - const_cast<SwCellFrame&>(pCurrMasterCell->FindStartEndOfRowSpanCell( true, true )) : + const_cast<SwCellFrame&>(pCurrMasterCell->FindStartEndOfRowSpanCell( true )) : *pCurrMasterCell; // #i26945# @@ -441,7 +441,7 @@ static void lcl_MoveRowContent( SwRowFrame& rSourceLine, SwRowFrame& rDestLine ) // NEW TABLES SwCellFrame* pDestCell = static_cast<SwCellFrame*>(pCurrDestCell); if ( pDestCell->GetTabBox()->getRowSpan() < 1 ) - pDestCell = & const_cast<SwCellFrame&>(pDestCell->FindStartEndOfRowSpanCell( true, true )); + pDestCell = & const_cast<SwCellFrame&>(pDestCell->FindStartEndOfRowSpanCell( true )); // Find last content SwFrame* pFrame = pDestCell->GetLastLower(); @@ -1309,7 +1309,7 @@ void SwInvalidateAll( SwFrame *pFrame, long nBottom ) SwCellFrame* pThisCell = dynamic_cast<SwCellFrame*>(pFrame); if ( pThisCell && pThisCell->GetTabBox()->getRowSpan() < 1 ) { - pToInvalidate = & const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( true, true )); + pToInvalidate = & const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( true )); pToInvalidate->_InvalidatePos(); pToInvalidate->_InvalidateSize(); pToInvalidate->_InvalidatePrt(); @@ -1472,7 +1472,7 @@ static bool lcl_InnerCalcLayout( SwFrame *pFrame, SwCellFrame* pThisCell = dynamic_cast<SwCellFrame*>(pFrame); if ( pThisCell && pThisCell->GetTabBox()->getRowSpan() < 1 ) { - SwCellFrame& rToCalc = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( true, true )); + SwCellFrame& rToCalc = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( true )); bRet |= !rToCalc.IsValid(); rToCalc.Calc(pRenderContext); if ( rToCalc.Lower() ) @@ -1540,7 +1540,7 @@ static void lcl_RecalcRow( SwRowFrame& rRow, long nBottom ) if ( bCalc ) { SwCellFrame& rToRecalc = 0 == i ? - const_cast<SwCellFrame&>(pCellFrame->FindStartEndOfRowSpanCell( true, true )) : + const_cast<SwCellFrame&>(pCellFrame->FindStartEndOfRowSpanCell( true )) : *pCellFrame; bCheck |= SwContentFrame::CalcLowers( &rToRecalc, &rToRecalc, nBottom, false ); } @@ -2725,7 +2725,7 @@ void SwTabFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA //the value applies to the screen width in the BrowseView. const SwFormatFrameSize &rSz = GetFormat()->GetFrameSize(); // OD 14.03.2003 #i9040# - adjust variable name. - const SwTwips nWishedTableWidth = CalcRel( rSz, true ); + const SwTwips nWishedTableWidth = CalcRel( rSz ); bool bCheckBrowseWidth = false; @@ -3824,7 +3824,7 @@ static SwTwips lcl_CalcMinRowHeight( const SwRowFrame* _pRow, // Height of the last cell of a row span is height of master cell // minus the height of the other rows which are covered by the master // cell: - const SwCellFrame& rMaster = pLow->FindStartEndOfRowSpanCell( true, true ); + const SwCellFrame& rMaster = pLow->FindStartEndOfRowSpanCell( true ); nTmp = ::lcl_CalcMinCellHeight( &rMaster, _bConsiderObjs ); const SwFrame* pMasterRow = rMaster.GetUpper(); while ( pMasterRow && pMasterRow != _pRow ) @@ -4143,7 +4143,7 @@ void SwRowFrame::AdjustCells( const SwTwips nHeight, const bool bHeight ) // height of the cell starting the row span if ( pCellFrame->GetLayoutRowSpan() < 1 ) { - pToAdjust = const_cast< SwCellFrame*>(&pCellFrame->FindStartEndOfRowSpanCell( true, true )); + pToAdjust = const_cast< SwCellFrame*>(&pCellFrame->FindStartEndOfRowSpanCell( true )); pToAdjustRow = pToAdjust->GetUpper(); } else diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 832a2b6daf6a..a46ba4c3537f 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -2262,7 +2262,7 @@ SwTwips SwLayoutFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo ) const SwCellFrame* pThisCell = dynamic_cast<const SwCellFrame*>(this); if ( pThisCell && pThisCell->GetLayoutRowSpan() > 1 ) { - SwCellFrame& rEndCell = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( false, true )); + SwCellFrame& rEndCell = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( false )); if ( -1 == rEndCell.GetTabBox()->getRowSpan() ) pToGrow = rEndCell.GetUpper(); else @@ -2460,7 +2460,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) // NEW TABLES if ( pThisCell && pThisCell->GetLayoutRowSpan() > 1 ) { - SwCellFrame& rEndCell = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( false, true )); + SwCellFrame& rEndCell = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( false )); pToShrink = rEndCell.GetUpper(); } @@ -3115,7 +3115,7 @@ void SwLayoutFrame::InvaPercentLowers( SwTwips nDiff ) } while ( pFrame && IsAnLower( pFrame ) ) ; } -long SwLayoutFrame::CalcRel( const SwFormatFrameSize &rSz, bool ) const +long SwLayoutFrame::CalcRel( const SwFormatFrameSize &rSz ) const { long nRet = rSz.GetWidth(), nPercent = rSz.GetWidthPercent(); diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index 4e2958c6ffd3..3807f8fa5d83 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -913,7 +913,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside( const SwPageFrame* pObjPage = rFlyAtContentFrame.FindPageFrame(); const SwFrame* pObjContext = ::FindKontext( &rAnchorTextFrame, FRM_COLUMN ); sal_uLong nObjIndex = rAnchorTextFrame.GetTextNode()->GetIndex(); - SwOrderIter aIter( pObjPage, true ); + SwOrderIter aIter( pObjPage ); const SwFlyFrame* pFly = static_cast<const SwVirtFlyDrawObj*>(aIter.Bottom())->GetFlyFrame(); while ( pFly && nObjOrdNum > pFly->GetVirtDrawObj()->GetOrdNumDirect() ) { diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index e6fc6c466f05..b9b72cdb4700 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -51,7 +51,6 @@ #include <doc.hxx> #include <IDocumentOutlineNodes.hxx> #include <docary.hxx> -#include <crsskip.hxx> #include <mdiexp.hxx> #include <docufld.hxx> #include <ftnidx.hxx> diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx index 577506e71322..92a43c00e608 100644 --- a/sw/source/core/text/guess.cxx +++ b/sw/source/core/text/guess.cxx @@ -453,8 +453,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, SwTextFormatInfo &rInf, if( nBreakPos > nCutPos && nBreakPos != COMPLETE_STRING ) { const sal_Int32 nHangingLen = nBreakPos - nCutPos; - SwPosSize aTmpSize = rInf.GetTextSize( &rSI, nCutPos, - nHangingLen, 0 ); + SwPosSize aTmpSize = rInf.GetTextSize( &rSI, nCutPos, nHangingLen ); aTmpSize.Width(aTmpSize.Width() + nLeftRightBorderSpace); OSL_ENSURE( !pHanging, "A hanging portion is hanging around" ); pHanging = new SwHangingPortion( aTmpSize ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index ed7d4163459f..de21e6cea9c0 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -934,27 +934,15 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rInf, const SwLinePortion& r const_cast<SwTextPaintInfo&>(rInf).SetPos( aOldPos ); } -void SwTextPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic, - bool bRetouche ) const +void SwTextPaintInfo::DrawRect( const SwRect &rRect, bool bRetouche ) const { if ( OnWin() || !bRetouche ) { if( aTextFly.IsOn() ) const_cast<SwTextPaintInfo*>(this)->GetTextFly(). - DrawFlyRect( m_pOut, rRect, *this, bNoGraphic ); - else if ( bNoGraphic ) - m_pOut->DrawRect( rRect.SVRect() ); + DrawFlyRect( m_pOut, rRect, *this, true/*bNoGraphic*/ ); else - { - if(pBrushItem != reinterpret_cast<SvxBrushItem*>(-1)) - { - ::DrawGraphic( pBrushItem, m_pOut, aItemRect, rRect ); - } - else - { - OSL_ENSURE(false, "DrawRect: Uninitialized BrushItem!" ); - } - } + m_pOut->DrawRect( rRect.SVRect() ); } } @@ -1205,7 +1193,7 @@ void SwTextPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const pTmpOut->SetFillColor(aFillColor); pTmpOut->SetLineColor(); - DrawRect( aIntersect, true, false ); + DrawRect( aIntersect, false ); pTmpOut->Pop(); } diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index c463bd3dfdab..b1ae3b508275 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -270,7 +270,7 @@ public: sal_uInt16& nMinSize, sal_uInt16& nMaxSizeDiff, vcl::TextLayoutCache const* = nullptr) const; inline SwPosSize GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nIdx, - const sal_Int32 nLen, const sal_uInt16 nComp ) const; + const sal_Int32 nLen ) const; inline SwPosSize GetTextSize( const OUString &rText ) const; sal_Int32 GetTextBreak( const long nLineWidth, @@ -415,13 +415,11 @@ public: inline void DrawText( const SwLinePortion &rPor, const sal_Int32 nLen, const bool bKern = false ) const; inline void DrawMarkedText( const SwLinePortion &rPor, const sal_Int32 nLen, - const bool bKern, const bool bWrong, const bool bSmartTags, const bool bGrammarCheck ) const; - void DrawRect( const SwRect &rRect, bool bNoGraphic = false, - bool bRetouche = true ) const; + void DrawRect( const SwRect &rRect, bool bRetouche ) const; void DrawTab( const SwLinePortion &rPor ) const; void DrawLineBreak( const SwLinePortion &rPor ) const; @@ -747,10 +745,9 @@ inline SwPosSize SwTextSizeInfo::GetTextSize( const OUString &rText ) const inline SwPosSize SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nNewIdx, - const sal_Int32 nNewLen, - const sal_uInt16 nCompress ) const + const sal_Int32 nNewLen ) const { - return GetTextSize( m_pOut, pSI, *m_pText, nNewIdx, nNewLen, nCompress ); + return GetTextSize( m_pOut, pSI, *m_pText, nNewIdx, nNewLen, 0/*nCompress*/ ); } inline SwTwips SwTextPaintInfo::GetPaintOfst() const @@ -779,12 +776,11 @@ inline void SwTextPaintInfo::DrawText( const SwLinePortion &rPor, inline void SwTextPaintInfo::DrawMarkedText( const SwLinePortion &rPor, const sal_Int32 nLength, - const bool bKern, const bool bWrong, const bool bSmartTags, const bool bGrammarCheck ) const { - const_cast<SwTextPaintInfo*>(this)->_DrawText( *m_pText, rPor, m_nIdx, nLength, bKern, bWrong, bSmartTags, bGrammarCheck ); + const_cast<SwTextPaintInfo*>(this)->_DrawText( *m_pText, rPor, m_nIdx, nLength, false/*bKern*/, bWrong, bSmartTags, bGrammarCheck ); } inline sal_Int32 SwTextFormatInfo::GetReformatStart() const diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx index 90a290f9fc63..0107991d97d9 100644 --- a/sw/source/core/text/porexp.cxx +++ b/sw/source/core/text/porexp.cxx @@ -85,7 +85,7 @@ void SwExpandPortion::Paint( const SwTextPaintInfo &rInf ) const // ST2 if ( rInf.GetSmartTags() || rInf.GetGrammarCheckList() ) - rInf.DrawMarkedText( *this, rInf.GetLen(), false, false, + rInf.DrawMarkedText( *this, rInf.GetLen(), false, nullptr != rInf.GetSmartTags(), nullptr != rInf.GetGrammarCheckList() ); else rInf.DrawText( *this, rInf.GetLen() ); diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index bd6ee06067f1..0f02b033f06b 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -548,7 +548,7 @@ void SwTextPortion::Paint( const SwTextPaintInfo &rInf ) const const bool bSmartTags = nullptr != pSmarttags; if ( bWrong || bSmartTags || bGrammarCheck ) - rInf.DrawMarkedText( *this, rInf.GetLen(), false, bWrong, bSmartTags, bGrammarCheck ); + rInf.DrawMarkedText( *this, rInf.GetLen(), bWrong, bSmartTags, bGrammarCheck ); else rInf.DrawText( *this, rInf.GetLen() ); } diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 8c041c66492d..341a2eb6cfaf 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -388,14 +388,13 @@ void SwTextFly::CtorInitTextFly( const SwTextFrame *pFrame ) nIndex = ULONG_MAX; } -SwRect SwTextFly::_GetFrame( const SwRect &rRect, bool bTop ) const +SwRect SwTextFly::_GetFrame( const SwRect &rRect ) const { SwRect aRet; if( ForEach( rRect, &aRet, true ) ) { SWRECTFN( pCurrFrame ) - if( bTop ) - (aRet.*fnRect->fnSetTop)( (rRect.*fnRect->fnGetTop)() ); + (aRet.*fnRect->fnSetTop)( (rRect.*fnRect->fnGetTop)() ); // Do not always adapt the bottom const SwTwips nRetBottom = (aRet.*fnRect->fnGetBottom)(); diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index cdf6e98387e5..e340e027f3eb 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -957,11 +957,10 @@ void SwHistoryChangeCharFormat::SetInDoc(SwDoc * pDoc, bool ) } // <- #i27615# -SwHistory::SwHistory( sal_uInt16 nInitSz ) +SwHistory::SwHistory() : m_SwpHstry() , m_nEndDiff( 0 ) { - m_SwpHstry.reserve( (sal_uInt8)nInitSz ); } SwHistory::~SwHistory() diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index a313693311af..fc9ede2a20b6 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -204,7 +204,7 @@ void SwUndoDelNum::RepeatImpl(::sw::RepeatContext & rContext) rContext.GetDoc().DelNumRules(rContext.GetRepeatPaM()); } -void SwUndoDelNum::AddNode( const SwTextNode& rNd, bool ) +void SwUndoDelNum::AddNode( const SwTextNode& rNd ) { if( rNd.GetNumRule() ) { diff --git a/sw/source/core/unocore/unocrsr.cxx b/sw/source/core/unocore/unocrsr.cxx index 314ee8f8a822..53d728452311 100644 --- a/sw/source/core/unocore/unocrsr.cxx +++ b/sw/source/core/unocore/unocrsr.cxx @@ -30,7 +30,7 @@ sw::DocDisposingHint::~DocDisposingHint() {} IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCursor ) SwUnoCursor::SwUnoCursor( const SwPosition &rPos, SwPaM* pRing ) - : SwCursor( rPos, pRing, false ) + : SwCursor( rPos, pRing ) , SwModify(nullptr) , m_bRemainInSection(true) , m_bSkipOverHiddenSections(false) @@ -157,10 +157,10 @@ bool SwUnoCursor::IsSelOvr( int eFlags ) } SwUnoTableCursor::SwUnoTableCursor(const SwPosition& rPos) - : SwCursor(rPos, nullptr, false) + : SwCursor(rPos, nullptr) , SwUnoCursor(rPos) , SwTableCursor(rPos) - , m_aTableSel(rPos, nullptr, false) + , m_aTableSel(rPos, nullptr) { SetRemainInSection(false); } diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 22aa10a3cd66..56de02bc78d7 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -99,7 +99,6 @@ #include <fmtclds.hxx> #include <dcontact.hxx> #include <SwStyleNameMapper.hxx> -#include <crsskip.hxx> #include <sortopt.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <memory> @@ -750,8 +749,7 @@ void SwXTextCursor::DeleteAndInsert(const OUString& rText, (void) bSuccess; SwUnoCursorHelper::SelectPam(*pUnoCursor, true); - pCurrent->Left(rText.getLength(), - CRSR_SKIP_CHARS, false, false); + pCurrent->Left(rText.getLength()); } pCurrent = static_cast<SwCursor*>(pCurrent->GetNext()); } while (pCurrent != pUnoCursor); @@ -940,7 +938,7 @@ throw (uno::RuntimeException, std::exception) SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() ); SwUnoCursorHelper::SelectPam(rUnoCursor, Expand); - bool bRet = rUnoCursor.Left( nCount, CRSR_SKIP_CHARS, false, false); + bool bRet = rUnoCursor.Left( nCount); if (CURSOR_META == m_pImpl->m_eType) { bRet = lcl_ForceIntoMeta(rUnoCursor, m_pImpl->m_xParentText, @@ -959,7 +957,7 @@ throw (uno::RuntimeException, std::exception) SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() ); SwUnoCursorHelper::SelectPam(rUnoCursor, Expand); - bool bRet = rUnoCursor.Right(nCount, CRSR_SKIP_CHARS, false, false); + bool bRet = rUnoCursor.Right(nCount); if (CURSOR_META == m_pImpl->m_eType) { bRet = lcl_ForceIntoMeta(rUnoCursor, m_pImpl->m_xParentText, @@ -1241,7 +1239,7 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std:: if (rUnoCursor.GetContentNode() && (pPoint->nContent == rUnoCursor.GetContentNode()->Len())) { - rUnoCursor.Right(1, CRSR_SKIP_CHARS, false, false); + rUnoCursor.Right(1); } else { @@ -1284,14 +1282,14 @@ SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException, s // start of paragraph? if (pPoint->nContent == 0) { - rUnoCursor.Left(1, CRSR_SKIP_CHARS, false, false); + rUnoCursor.Left(1); } else { rUnoCursor.GoPrevWordWT( i18n::WordType::DICTIONARY_WORD ); if (pPoint->nContent == 0) { - rUnoCursor.Left(1, CRSR_SKIP_CHARS, false, false); + rUnoCursor.Left(1); } } @@ -1394,7 +1392,7 @@ SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException, std::exception) if (!bRet && (!rUnoCursor.HasMark() || *rUnoCursor.GetPoint() == *rUnoCursor.GetMark())) { - SwCursor aCursor(*rUnoCursor.GetPoint(),nullptr,false); + SwCursor aCursor(*rUnoCursor.GetPoint(),nullptr); SwPosition aOrigPos = *aCursor.GetPoint(); aCursor.GoSentence(SwCursor::START_SENT ); bRet = aOrigPos == *aCursor.GetPoint(); @@ -1418,7 +1416,7 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception) if (!bRet && (!rUnoCursor.HasMark() || *rUnoCursor.GetPoint() == *rUnoCursor.GetMark())) { - SwCursor aCursor(*rUnoCursor.GetPoint(), nullptr, false); + SwCursor aCursor(*rUnoCursor.GetPoint(), nullptr); SwPosition aOrigPos = *aCursor.GetPoint(); aCursor.GoSentence(SwCursor::END_SENT); bRet = aOrigPos == *aCursor.GetPoint(); diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index dc870e8ee757..9ef2c2eaa1c3 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -103,7 +103,6 @@ #include <fmtclds.hxx> #include <dcontact.hxx> #include <dflyobj.hxx> -#include <crsskip.hxx> #include <vector> #include <sortedobjs.hxx> #include <sortopt.hxx> @@ -811,7 +810,7 @@ throw (uno::RuntimeException) } const SwPosition aPos(GetDoc().GetNodes().GetEndOfContent()); - SwCursor aCursor(aPos, nullptr, false); + SwCursor aCursor(aPos, nullptr); if (GetPositions(aCursor)) { UnoActionContext aAction(& m_pImpl->m_rDoc); @@ -827,7 +826,7 @@ throw (uno::RuntimeException) m_pImpl->m_rDoc, aCursor, rText, bForceExpandHints); SwUnoCursorHelper::SelectPam(aCursor, true); - aCursor.Left(rText.getLength(), CRSR_SKIP_CHARS, false, false); + aCursor.Left(rText.getLength()); } SetPositions(aCursor); m_pImpl->m_rDoc.GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, nullptr); @@ -1590,7 +1589,7 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString) OSL_ENSURE( bSuccess, "DocInsertStringSplitCR" ); (void) bSuccess; SwUnoCursorHelper::SelectPam(rCursor, true); - rCursor.Left(rString.getLength(), CRSR_SKIP_CHARS, false, false); + rCursor.Left(rString.getLength()); } pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, nullptr); } diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index f2d976955da0..93cfc6cb49dc 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -396,7 +396,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, SwTextNode & rTextNode(GetTextNodeOrThrow()); SwPosition aPos( rTextNode ); - SwCursor aCursor( aPos, nullptr, false ); + SwCursor aCursor( aPos, nullptr ); const OUString* pPropertyNames = rPropertyNames.getConstArray(); const uno::Any* pValues = rValues.getConstArray(); const SfxItemPropertyMap &rMap = m_rPropSet.getPropertyMap(); @@ -665,7 +665,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) m_pImpl->m_rPropSet.getPropertyMap(); SwPosition aPos( rTextNode ); - SwCursor aCursor( aPos, nullptr, false ); + SwCursor aCursor( aPos, nullptr ); SwParaSelection aParaSel( aCursor ); for (sal_Int32 i = 0; i < nProps; ++i) { @@ -1124,7 +1124,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow()); SwPosition aPos( rTextNode ); - SwCursor aCursor( aPos, nullptr, false ); + SwCursor aCursor( aPos, nullptr ); if (rPropertyName == UNO_NAME_ANCHOR_TYPE || rPropertyName == UNO_NAME_ANCHOR_TYPES || rPropertyName == UNO_NAME_TEXT_WRAP) @@ -1260,7 +1260,7 @@ SwXParagraph::getAnchor() throw (uno::RuntimeException, std::exception) SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow()); SwPosition aPos( rTextNode ); - SwCursor aCursor( aPos, nullptr, false ); + SwCursor aCursor( aPos, nullptr ); // select paragraph SwParaSelection aParaSel( aCursor ); const uno::Reference< text::XTextRange > xRet = @@ -1275,7 +1275,7 @@ void SAL_CALL SwXParagraph::dispose() throw (uno::RuntimeException, std::excepti SwTextNode *const pTextNode( m_pImpl->GetTextNode() ); if (pTextNode) { - SwCursor aCursor( SwPosition( *pTextNode ), nullptr, false ); + SwCursor aCursor( SwPosition( *pTextNode ), nullptr ); pTextNode->GetDoc()->getIDocumentContentOperations().DelFullPara(aCursor); lang::EventObject const ev(static_cast< ::cppu::OWeakObject&>(*this)); m_pImpl->m_EventListeners.disposeAndClear(ev); @@ -1340,7 +1340,7 @@ SwXParagraph::getStart() throw (uno::RuntimeException, std::exception) SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow()); SwPosition aPos( rTextNode ); - SwCursor aCursor( aPos, nullptr, false ); + SwCursor aCursor( aPos, nullptr ); SwParaSelection aParaSel( aCursor ); SwPaM aPam( *aCursor.Start() ); uno::Reference< text::XText > xParent = getText(); @@ -1357,7 +1357,7 @@ SwXParagraph::getEnd() throw (uno::RuntimeException, std::exception) SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow()); SwPosition aPos( rTextNode ); - SwCursor aCursor( aPos, nullptr, false ); + SwCursor aCursor( aPos, nullptr ); SwParaSelection aParaSel( aCursor ); SwPaM aPam( *aCursor.End() ); uno::Reference< text::XText > xParent = getText(); @@ -1374,7 +1374,7 @@ OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException, std::e if (pTextNode) { SwPosition aPos( *pTextNode ); - SwCursor aCursor( aPos, nullptr, false ); + SwCursor aCursor( aPos, nullptr ); SwParaSelection aParaSel( aCursor ); SwUnoCursorHelper::GetTextFromPam(aCursor, aRet); } @@ -1398,7 +1398,7 @@ throw (uno::RuntimeException, std::exception) if (pTextNode) { SwPosition aPos( *pTextNode ); - SwCursor aCursor( aPos, nullptr, false ); + SwCursor aCursor( aPos, nullptr ); if (!SwUnoCursorHelper::IsStartOfPara(aCursor)) { aCursor.MovePara(fnParaCurr, fnParaStart); } diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index e7cec35e48e9..a26e970cccb0 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -53,7 +53,6 @@ #include <unoidx.hxx> #include <unocoll.hxx> #include <redline.hxx> -#include <crsskip.hxx> #include <calbck.hxx> #include <docufld.hxx> #include <osl/mutex.hxx> @@ -443,7 +442,7 @@ lcl_ExportFieldMark( OSL_ENSURE(pUnoCursor->End()->nContent.GetIndex() == start, "hmm --- why is this different"); - pUnoCursor->Right(1, CRSR_SKIP_CHARS, false, false); + pUnoCursor->Right(1); if ( *pUnoCursor->GetMark() == *pUnoCursor->GetPoint() ) { OSL_FAIL("cannot move cursor?"); @@ -822,7 +821,7 @@ lcl_ExportHints( case RES_TXTATR_FIELD: if(!bRightMoveForbidden) { - pUnoCursor->Right(1,CRSR_SKIP_CHARS,false,false); + pUnoCursor->Right(1); if( *pUnoCursor->GetMark() == *pUnoCursor->GetPoint() ) break; SwXTextPortion* pPortion; @@ -839,7 +838,7 @@ lcl_ExportHints( case RES_TXTATR_ANNOTATION: if(!bRightMoveForbidden) { - pUnoCursor->Right(1,CRSR_SKIP_CHARS,false,false); + pUnoCursor->Right(1); if( *pUnoCursor->GetMark() == *pUnoCursor->GetPoint() ) break; @@ -869,10 +868,7 @@ lcl_ExportHints( { pUnoCursor->Right( - pAttr->GetFormatField().GetField()->ExpandField( true ).getLength() + 2, - CRSR_SKIP_CHARS, - false, - false ); + pAttr->GetFormatField().GetField()->ExpandField( true ).getLength() + 2 ); if( *pUnoCursor->GetMark() == *pUnoCursor->GetPoint() ) break; SwXTextPortion* pPortion = @@ -888,7 +884,7 @@ lcl_ExportHints( case RES_TXTATR_FLYCNT: if(!bRightMoveForbidden) { - pUnoCursor->Right(1,CRSR_SKIP_CHARS,false,false); + pUnoCursor->Right(1); if( *pUnoCursor->GetMark() == *pUnoCursor->GetPoint() ) break; // Robust #i81708 content in covered cells @@ -905,7 +901,7 @@ lcl_ExportHints( { if(!bRightMoveForbidden) { - pUnoCursor->Right(1,CRSR_SKIP_CHARS,false,false); + pUnoCursor->Right(1); if( *pUnoCursor->GetMark() == *pUnoCursor->GetPoint() ) break; SwXTextPortion* pPortion; @@ -926,7 +922,7 @@ lcl_ExportHints( { if (bIsPoint) { - pUnoCursor->Right(1,CRSR_SKIP_CHARS,false,false); + pUnoCursor->Right(1); } Reference<XTextRange> xTmp = (RES_TXTATR_REFMARK == nAttrWhich) @@ -961,7 +957,7 @@ lcl_ExportHints( { if (!bRightMoveForbidden) { - pUnoCursor->Right(1,CRSR_SKIP_CHARS,false,false); + pUnoCursor->Right(1); o_rbCursorMoved = true; // only if the end is included in selection! if ((i_nEndPos < 0) || @@ -1255,8 +1251,7 @@ static void lcl_CreatePortions( (i_nStartPos <= pUnoCursor->Start()->nNode.GetNode().GetTextNode()-> GetText().getLength()), "Incorrect start position" ); // ??? should this be i_nStartPos - current position ? - pUnoCursor->Right(static_cast<sal_Int32>(i_nStartPos), - CRSR_SKIP_CHARS, false, false); + pUnoCursor->Right(static_cast<sal_Int32>(i_nStartPos)); } SwDoc * const pDoc = pUnoCursor->GetDoc(); diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 6f88f4828a44..ca54e3004ec0 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -94,7 +94,6 @@ #include <osl/mutex.hxx> #include <SwStyleNameMapper.hxx> #include <frmatr.hxx> -#include <crsskip.hxx> #include <unochart.hxx> #include <sortopt.hxx> #include <rtl/math.hxx> @@ -1569,7 +1568,7 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand) throw( un SwUnoCursor& rUnoCursor = GetCursor(); SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor); lcl_CursorSelect(rTableCursor, bExpand); - return rTableCursor.Left(Count, CRSR_SKIP_CHARS, false, false); + return rTableCursor.Left(Count); } sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception ) @@ -1578,7 +1577,7 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) throw( u SwUnoCursor& rUnoCursor = GetCursor(); SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor); lcl_CursorSelect(rTableCursor, bExpand); - return rTableCursor.Right(Count, CRSR_SKIP_CHARS, false, false); + return rTableCursor.Right(Count); } sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception ) diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 31bc7f2cfc97..6c8443df8c74 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -66,7 +66,6 @@ #include <IMark.hxx> #include <fmtanchr.hxx> #include <fmtcntnt.hxx> -#include <crsskip.hxx> #include <ndtxt.hxx> using namespace ::com::sun::star; @@ -468,9 +467,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) OTextCursorHelper *const pCursor = ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel); - SwCursor aCursor(*aPam.GetPoint(), nullptr, false); + SwCursor aCursor(*aPam.GetPoint(), nullptr); SwUnoCursorHelper::SelectPam(aCursor, true); - aCursor.Left(1, CRSR_SKIP_CHARS, false, false); + aCursor.Left(1); // here, the PaM needs to be moved: if (pRange) { @@ -1615,7 +1614,7 @@ SwXText::convertToTextFrame( // if not - remove the additional paragraphs and throw if (bParaBeforeInserted) { - SwCursor aDelete(*aStartPam.GetPoint(), nullptr, false); + SwCursor aDelete(*aStartPam.GetPoint(), nullptr); *aStartPam.GetPoint() = // park it because node is deleted SwPosition(GetDoc()->GetNodes().GetEndOfContent()); aDelete.MovePara(fnParaCurr, fnParaStart); @@ -1625,7 +1624,7 @@ SwXText::convertToTextFrame( } if (bParaAfterInserted) { - SwCursor aDelete(*pEndPam->GetPoint(), nullptr, false); + SwCursor aDelete(*pEndPam->GetPoint(), nullptr); *pEndPam->GetPoint() = // park it because node is deleted SwPosition(GetDoc()->GetNodes().GetEndOfContent()); aDelete.MovePara(fnParaCurr, fnParaStart); diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index f19bd3d499ab..d2f21e58e680 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -180,8 +180,7 @@ void SwPagePreviewLayout::_CalcPreviewLayoutSizes() */ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, const sal_uInt16 _nRows, - const Size& _rPxWinSize, - const bool _bCalcScale + const Size& _rPxWinSize ) { // check environment and parameters @@ -212,16 +211,14 @@ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, // validate layout information mbLayoutInfoValid = true; - if ( _bCalcScale ) + // calculate scaling + MapMode aMapMode( MAP_TWIP ); + Size aWinSize = mrParentViewShell.GetOut()->PixelToLogic( _rPxWinSize, aMapMode ); + Fraction aXScale( aWinSize.Width(), mnPreviewLayoutWidth ); + Fraction aYScale( aWinSize.Height(), mnPreviewLayoutHeight ); + if( aXScale < aYScale ) + aYScale = aXScale; { - // calculate scaling - MapMode aMapMode( MAP_TWIP ); - Size aWinSize = mrParentViewShell.GetOut()->PixelToLogic( _rPxWinSize, aMapMode ); - Fraction aXScale( aWinSize.Width(), mnPreviewLayoutWidth ); - Fraction aYScale( aWinSize.Height(), mnPreviewLayoutHeight ); - if( aXScale < aYScale ) - aYScale = aXScale; - // adjust scaling for Drawing layer. aYScale *= Fraction( 1000, 1 ); long nNewNuminator = aYScale.operator long(); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 817a90b0c81f..547f28de197e 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -192,14 +192,13 @@ class SwCSS1OutMode public: - SwCSS1OutMode( SwHTMLWriter& rHWrt, sal_uInt16 nMode, bool bStartFirst=true, - const OUString *pSelector=nullptr ) : + SwCSS1OutMode( SwHTMLWriter& rHWrt, sal_uInt16 nMode, + const OUString *pSelector ) : rWrt( rHWrt ), nOldMode( rHWrt.m_nCSS1OutMode ) { rWrt.m_nCSS1OutMode = nMode; - if( bStartFirst ) - rWrt.m_bFirstCSS1Property = true; + rWrt.m_bFirstCSS1Property = true; if( pSelector ) rWrt.m_aCSS1Selector = *pSelector; } @@ -1324,7 +1323,7 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector, // some class rule for the additional style dependen properties { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_NO_SCRIPT|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, - true, &rSelector ); + &rSelector ); rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false ); } @@ -1342,21 +1341,21 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector, aNewSelector += ".western" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, - true, &aNewSelector ); + &aNewSelector ); rHTMLWrt.OutCSS1_SfxItemSet( aScriptItemSet, false ); } aNewSelector = aSelector + ".cjk" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, - true, &aNewSelector ); + &aNewSelector ); rHTMLWrt.OutCSS1_SfxItemSet( aScriptItemSet, false ); } aNewSelector = aSelector + ".ctl" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, - true, &aNewSelector ); + &aNewSelector ); rHTMLWrt.OutCSS1_SfxItemSet( aScriptItemSet, false ); } } @@ -1369,21 +1368,21 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector, aNewSelector += "-western" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, - true, &aNewSelector ); + &aNewSelector ); rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false ); } aNewSelector = aSelector + "-cjk" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, - true, &aNewSelector ); + &aNewSelector ); rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false ); } aNewSelector = aSelector + "-ctl" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, - true, &aNewSelector ); + &aNewSelector ); rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false ); } } @@ -1396,7 +1395,7 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector, // script dependencies by now. SwCSS1OutMode aMode( rHTMLWrt, rHTMLWrt.m_nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, - true, &rSelector ); + &rSelector ); rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false ); } @@ -1429,7 +1428,7 @@ static void OutCSS1DropCapRule( // some class rule for the additional style dependen properties { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_NO_SCRIPT|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP, - true, &rSelector ); + &rSelector ); OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop ); } @@ -1446,21 +1445,21 @@ static void OutCSS1DropCapRule( aNewSelector += ".western" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP, - true, &aNewSelector ); + &aNewSelector ); OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop, &aScriptItemSet ); } aNewSelector = aSelector + ".cjk" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP, - true, &aNewSelector ); + &aNewSelector ); OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop, &aScriptItemSet ); } aNewSelector = aSelector + ".ctl" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP, - true, &aNewSelector ); + &aNewSelector ); OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop, &aScriptItemSet ); } } @@ -1473,21 +1472,21 @@ static void OutCSS1DropCapRule( aNewSelector += "-western" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP, - true, &aNewSelector ); + &aNewSelector ); OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop ); } aNewSelector = aSelector + "-cjk" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP, - true, &aNewSelector ); + &aNewSelector ); OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop ); } aNewSelector = aSelector + "-ctl" + aPseudo; { SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP, - true, &aNewSelector ); + &aNewSelector ); OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop ); } } @@ -1500,7 +1499,7 @@ static void OutCSS1DropCapRule( // script dependencies by now. SwCSS1OutMode aMode( rHTMLWrt, rHTMLWrt.m_nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP, - true, &rSelector ); + &rSelector ); OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop ); } } @@ -1707,7 +1706,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, } SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_RULE_ON|CSS1_OUTMODE_TEMPLATE, - true, &aSelector ); + &aSelector ); // Size: If the only difference is the Landscape-Flag, // only export Portrait oder Landscape. Otherwise export size. @@ -1795,7 +1794,7 @@ static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo, ( bEndNote ? OUString(OOO_STRING_SVTOOLS_HTML_sdendnote_anc) : OUString(OOO_STRING_SVTOOLS_HTML_sdfootnote_anc) ); SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, - true, &aSelector ); + &aSelector ); rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_font_size, sHTML_FTN_fontheight ); rHTMLWrt.Strm().WriteCharPtr( sCSS1_rule_end ); @@ -1838,7 +1837,7 @@ Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet ) SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt); SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_STYLE_OPT_ON | - CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_BODY ); + CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_BODY, nullptr ); // Only export the attributes of the page template. // The attributes of the default paragraph template were @@ -1872,7 +1871,7 @@ Writer& OutCSS1_ParaTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet ) SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt); SwCSS1OutMode aMode( rHTMLWrt, rHTMLWrt.m_nCSS1Script|CSS1_OUTMODE_STYLE_OPT | - CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_PARA ); + CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_PARA, nullptr ); rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false ); return rWrt; @@ -1883,7 +1882,7 @@ Writer& OutCSS1_HintSpanTag( Writer& rWrt, const SfxPoolItem& rHt ) SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt); SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_SPAN_TAG | - CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_HINT ); + CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_HINT, nullptr ); Out( aCSS1AttrFnTab, rHt, rWrt ); @@ -1899,7 +1898,7 @@ Writer& OutCSS1_HintStyleOpt( Writer& rWrt, const SfxPoolItem& rHt ) SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_STYLE_OPT_ON | CSS1_OUTMODE_ENCODE| - CSS1_OUTMODE_HINT ); + CSS1_OUTMODE_HINT, nullptr ); Out( aCSS1AttrFnTab, rHt, rWrt ); @@ -1916,7 +1915,7 @@ Writer& OutCSS1_TableBGStyleOpt( Writer& rWrt, const SfxPoolItem& rHt ) SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_STYLE_OPT_ON | CSS1_OUTMODE_ENCODE| - CSS1_OUTMODE_TABLEBOX ); + CSS1_OUTMODE_TABLEBOX, nullptr ); OutCSS1_SvxBrush( rWrt, rHt, CSS1_BACKGROUND_TABLE ); if( !rHTMLWrt.m_bFirstCSS1Property ) @@ -1931,7 +1930,7 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule, SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt); SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_STYLE_OPT | - CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_PARA ); + CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_PARA, nullptr ); const SwNumFormat& rNumFormat = rNumRule.Get( nLevel ); @@ -1966,7 +1965,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat { SwCSS1OutMode aMode( *this, CSS1_OUTMODE_STYLE_OPT_ON | CSS1_OUTMODE_ENCODE| - CSS1_OUTMODE_FRAME ); + CSS1_OUTMODE_FRAME, nullptr ); const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient(); SvxLRSpaceItem aLRItem( rFrameFormat.GetLRSpace() ); @@ -2159,7 +2158,7 @@ void SwHTMLWriter::OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameF { SwCSS1OutMode aMode( *this, CSS1_OUTMODE_STYLE_OPT_ON | CSS1_OUTMODE_ENCODE| - CSS1_OUTMODE_TABLE ); + CSS1_OUTMODE_TABLE, nullptr ); const SfxPoolItem *pItem; const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet(); @@ -2179,7 +2178,7 @@ void SwHTMLWriter::OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameF void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat) { SwCSS1OutMode const aMode( *this, - CSS1_OUTMODE_STYLE_OPT_ON|CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_TABLEBOX ); + CSS1_OUTMODE_STYLE_OPT_ON|CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_TABLEBOX, nullptr ); OutCSS1_SvxBox(*this, rFrameFormat.GetBox()); if (!m_bFirstCSS1Property) { @@ -2191,7 +2190,7 @@ void SwHTMLWriter::OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameForm { SwCSS1OutMode aMode( *this, CSS1_OUTMODE_STYLE_OPT_ON | CSS1_OUTMODE_ENCODE| - CSS1_OUTMODE_SECTION ); + CSS1_OUTMODE_SECTION, nullptr ); const SfxPoolItem *pItem; const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet(); @@ -2906,7 +2905,7 @@ static Writer& OutCSS1_SwFormatDrop( Writer& rWrt, const SfxPoolItem& rHt ) { SwCSS1OutMode aMode( rHTMLWrt, rHTMLWrt.m_nCSS1Script|CSS1_OUTMODE_SPAN_TAG1_ON|CSS1_OUTMODE_ENCODE| - CSS1_OUTMODE_DROPCAP ); + CSS1_OUTMODE_DROPCAP, nullptr ); OutCSS1_SwFormatDropAttrs( rHTMLWrt, static_cast<const SwFormatDrop&>(rHt) ); // A "> is already printed by the calling OutCSS1_HintAsSpanTag. diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 3e70ba9506d2..b285c9015b7a 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -230,7 +230,7 @@ SwHTMLTextCollOutputInfo::~SwHTMLTextCollOutputInfo() SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTemplate, bool bOutStyles, LanguageType eDfltLang, - sal_uInt16 nCSS1Script, bool bHardDrop ) + sal_uInt16 nCSS1Script ) : pFormat(pF) , pItemSet(nullptr) , nLeftMargin(0) @@ -372,33 +372,6 @@ SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTem } } - // Ggf. noch ein DropCap-Attribut uebernehmen - if( bOutStyles && bHardDrop && nDeep != 0 ) - { - const SfxPoolItem *pItem; - if( SfxItemState::SET==pFormat->GetAttrSet().GetItemState( - RES_PARATR_DROP, true, &pItem ) ) - { - bool bPut = true; - if( pTemplate ) - { - pReferenceFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() ); - const SfxPoolItem *pRefItem; - bool bRefItemSet = - SfxItemState::SET==pReferenceFormat->GetAttrSet().GetItemState( - RES_PARATR_DROP, true, &pRefItem ); - bPut = !bRefItemSet || *pItem!=*pRefItem; - } - if( bPut ) - { - if( !pItemSet ) - pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(), - pFormat->GetAttrSet().GetRanges() ); - pItemSet->Put( *pItem ); - } - } - } - // Die diversen default-Abstaende aus der Vorlage oder der // Vergleischs-Vorlage merken const SvxLRSpaceItem &rLRSpace = @@ -533,8 +506,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat, { pFormatInfo = new SwHTMLFormatInfo( &rFormat, rWrt.pDoc, rHWrt.m_pTemplate, rHWrt.m_bCfgOutStyles, rHWrt.m_eLang, - rHWrt.m_nCSS1Script, - false ); + rHWrt.m_nCSS1Script ); rHWrt.m_TextCollInfos.insert(std::unique_ptr<SwHTMLFormatInfo>(pFormatInfo)); if( rHWrt.m_aScriptParaStyles.count( rFormat.GetName() ) ) pFormatInfo->bScriptDependent = true; diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index ef2f83ba43cd..54ff3e252f2c 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -98,7 +98,7 @@ void SwHTMLParser::EndScript() SwScriptField aField( pType, m_aScriptType, !m_aScriptURL.isEmpty() ? m_aScriptURL : m_aScriptSource, !m_aScriptURL.isEmpty() ); - InsertAttr( SwFormatField( aField ) ); + InsertAttr( SwFormatField( aField ), false ); } SwDocShell *pDocSh = m_pDoc->GetDocShell(); diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index bdd1bdf34570..f05c2ed6c594 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -2121,8 +2121,7 @@ void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet, } } -_HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit, - bool bRemove ) +_HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken ) { _HTMLAttrContexts::size_type nPos = m_aContexts.size(); if( nPos <= m_nContextStMin ) @@ -2140,7 +2139,7 @@ _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit bFound = true; break; } - else if( nCntxtToken == nLimit ) // 0 als Token kommt nicht vor + else if( nCntxtToken == 0 ) // 0 als Token kommt nicht vor { break; } @@ -2155,8 +2154,7 @@ _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit if( bFound ) { pCntxt = m_aContexts[nPos]; - if( bRemove ) - m_aContexts.erase( m_aContexts.begin() + nPos ); + m_aContexts.erase( m_aContexts.begin() + nPos ); } return pCntxt; diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index b98e0d829bf1..267772fe32ed 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -638,7 +638,7 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag SwPostItField aPostItField( static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )), aEmptyOUStr, aComment, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) ); - InsertAttr( SwFormatField( aPostItField ) ); + InsertAttr( SwFormatField( aPostItField ), false ); if( bMoveFwd ) m_pPam->Move( fnMoveForward ); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 00ec79fd3f97..591a4b159d17 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -228,7 +228,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri, // hier auch geweohnlich attributiert !!! sal_uInt16 nUpper=0, nLower=0; GetULSpaceFromContext( nUpper, nLower ); - InsertAttr( SvxULSpaceItem( nUpper, 0, RES_UL_SPACE ), false, true ); + InsertAttr( SvxULSpaceItem( nUpper, 0, RES_UL_SPACE ), true ); AppendTextNode( AM_NOSPACE ); diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index 05e9c4eb84af..b729c2a9260b 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -252,7 +252,7 @@ void SwHTMLParser::NewNumBulList( int nToken ) // den aktuellen Absatz erst einmal nicht numerieren { sal_uInt8 nLvl = nLevel; - SetNodeNum( nLvl, false ); + SetNodeNum( nLvl ); } // einen neuen Kontext anlegen @@ -406,7 +406,7 @@ void SwHTMLParser::EndNumBulList( int nToken ) else { // the next paragraph not numbered first - SetNodeNum( rInfo.GetLevel(), false ); + SetNodeNum( rInfo.GetLevel() ); } } @@ -597,7 +597,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl, SetTextCollAttrs(); } -void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList ) +void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel ) { SwTextNode* pTextNode = m_pPam->GetNode().GetTextNode(); OSL_ENSURE( pTextNode, "Kein Text-Node an PaM-Position" ); @@ -607,7 +607,7 @@ void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList ) static_cast<SwContentNode *>(pTextNode)->SetAttr( SwNumRuleItem(rName) ); pTextNode->SetAttrListLevel( nLevel ); - pTextNode->SetCountedInList( bCountedInList ); + pTextNode->SetCountedInList( false ); // NumRule invalidieren, weil sie durch ein EndAction bereits // auf valid geschaltet worden sein kann. diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 02dfb42cd009..0eb7512ae0e9 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -3405,7 +3405,7 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents( // 1. Absatz auf nicht numeriert setzen sal_uInt8 nLvl = GetNumInfo().GetLevel(); - SetNodeNum( nLvl, false ); + SetNodeNum( nLvl ); } // Attributierungs-Anfang neu setzen diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index b8abbc05873c..2478d9672e5d 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -559,8 +559,7 @@ void SvxCSS1PropertyInfo::CopyBorderInfo( sal_uInt16 nCount, sal_uInt16 nWhat ) void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet, sal_uInt16 nMinBorderDist, - const SvxBoxItem *pDfltItem, - bool bTable ) + const SvxBoxItem *pDfltItem ) { bool bChg = nTopBorderDistance != USHRT_MAX || nBottomBorderDistance != USHRT_MAX || @@ -630,10 +629,7 @@ void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet, if( USHRT_MAX == nDist ) nDist = aBoxItem.GetDistance( nLine ); - if( !bTable ) - nDist = 0U; - else if( nDist && nDist < nMinBorderDist ) - nDist = nMinBorderDist; + nDist = 0U; } aBoxItem.SetDistance( nDist, nLine ); diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index d1f9f2b8dbd6..89f19c538bd9 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -144,7 +144,7 @@ public: void CopyBorderInfo( sal_uInt16 nCount, sal_uInt16 nWhat ); void SetBoxItem( SfxItemSet& rItemSet, sal_uInt16 nMinBorderDist, - const SvxBoxItem* pDflt=nullptr, bool bTable = false ); + const SvxBoxItem* pDflt=nullptr ); }; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index e127c5bbba25..6be1b44d8ee2 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -644,7 +644,7 @@ void SwHTMLParser::Continue( int nToken ) SwScriptField aField( pType, m_aScriptType, m_aScriptSource, false ); - InsertAttr( SwFormatField( aField ) ); + InsertAttr( SwFormatField( aField ), false ); } if( m_pAppletImpl ) @@ -1523,7 +1523,7 @@ void SwHTMLParser::NextToken( int nToken ) case HTML_DEFLIST_OFF: if( m_nOpenParaToken ) EndPara(); - EndDefListItem( 0, false, 1==m_nDefListDeep ); + EndDefListItem( 0, 1==m_nDefListDeep ); EndDefList(); break; @@ -1531,7 +1531,7 @@ void SwHTMLParser::NextToken( int nToken ) case HTML_DT_ON: if( m_nOpenParaToken ) EndPara(); - EndDefListItem( 0, false );// close <DD>/<DT> and set no template + EndDefListItem();// close <DD>/<DT> and set no template NewDefListItem( nToken ); break; @@ -1540,7 +1540,7 @@ void SwHTMLParser::NextToken( int nToken ) // c.f. HTML_LI_OFF // Actually we should close a DD/DT now. // But neither Netscape nor Microsoft do this and so don't we. - EndDefListItem( nToken, false ); + EndDefListItem( nToken ); break; // divisions @@ -2262,7 +2262,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum ) if( GetNumInfo().GetDepth() ) { sal_uInt8 nLvl = GetNumInfo().GetLevel(); - SetNodeNum( nLvl, false ); + SetNodeNum( nLvl ); } else m_pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE ); @@ -3402,13 +3402,10 @@ void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab ) } } -void SwHTMLParser::InsertAttr( const SfxPoolItem& rItem, bool bLikePara, - bool bInsAtStart ) +void SwHTMLParser::InsertAttr( const SfxPoolItem& rItem, bool bInsAtStart ) { _HTMLAttr* pTmp = new _HTMLAttr( *m_pPam->GetPoint(), rItem ); - if( bLikePara ) - pTmp->SetLikePara(); if (bInsAtStart) m_aSetAttrTab.push_front( pTmp ); else @@ -3420,7 +3417,7 @@ void SwHTMLParser::InsertAttrs( _HTMLAttrs& rAttrs ) while( !rAttrs.empty() ) { _HTMLAttr *pAttr = rAttrs.front(); - InsertAttr( pAttr->GetItem() ); + InsertAttr( pAttr->GetItem(), false ); rAttrs.pop_front(); delete pAttr; } @@ -4415,8 +4412,7 @@ void SwHTMLParser::NewDefListItem( int nToken ) : RES_POOLCOLL_HTML_DT) ); } -void SwHTMLParser::EndDefListItem( int nToken, bool bSetColl, - bool /*bLastPara*/ ) +void SwHTMLParser::EndDefListItem( int nToken, bool /*bLastPara*/ ) { // einen neuen Absatz aufmachen if( !nToken && m_pPam->GetPoint()->nContent.GetIndex() ) @@ -4458,10 +4454,6 @@ void SwHTMLParser::EndDefListItem( int nToken, bool bSetColl, SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen delete pCntxt; } - - // und die bisherige Vorlage setzen - if( bSetColl ) - SetTextCollAttrs(); } bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly, @@ -5442,7 +5434,7 @@ void SwHTMLParser::ParseMoreMetaOptions() static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )), aEmptyOUStr, sText.makeStringAndClear(), aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) ); SwFormatField aFormatField( aPostItField ); - InsertAttr( aFormatField ); + InsertAttr( aFormatField, false ); } _HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 599d90f7bf31..483f357db7d4 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -515,8 +515,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient void SplitAttrTab( const SwPosition& rNewPos ); void SplitAttrTab( _HTMLAttrTable& rNewAttrTab, bool bMoveEndBack = true ); void RestoreAttrTab( _HTMLAttrTable& rNewAttrTab ); - void InsertAttr( const SfxPoolItem& rItem, bool bLikePara = false, - bool bInsAtStart=false ); + void InsertAttr( const SfxPoolItem& rItem, bool bInsAtStart ); void InsertAttrs( _HTMLAttrs& rAttrs ); bool DoPositioning( SfxItemSet &rItemSet, @@ -543,7 +542,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient SwHTMLNumRuleInfo& GetNumInfo() { return *m_pNumRuleInfo; } // add parameter <bCountedInList> - void SetNodeNum( sal_uInt8 nLevel, bool bCountedInList ); + void SetNodeNum( sal_uInt8 nLevel ); // Verwalten von Absatz-Vorlagen @@ -560,8 +559,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient // den obersten/spezifizierten Kontext holen, aber nicht ausserhalb // des Kontexts mit Token nLimit suchen. Wenn bRemove gesetzt ist, // wird er entfernt - _HTMLAttrContext *PopContext( sal_uInt16 nToken=0, sal_uInt16 nLimit=0, - bool bRemove=true ); + _HTMLAttrContext *PopContext( sal_uInt16 nToken=0 ); bool GetMarginsFromContext( sal_uInt16 &nLeft, sal_uInt16 &nRight, short& nIndent, bool bIgnoreCurrent=false ) const; @@ -619,8 +617,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient void NewDefList(); void EndDefList(); void NewDefListItem( int nToken ); - void EndDefListItem( int nToken=0, bool bSetColl=true, - bool bLastPara=false ); + void EndDefListItem( int nToken=0, bool bLastPara=false ); // Behandlung von Tags auf Zeichen-Ebene diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 247b3423fece..09eab5f13944 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -237,8 +237,7 @@ struct SwHTMLFormatInfo // Konstruktor zum Erstellen der Format-Info SwHTMLFormatInfo( const SwFormat *pFormat, SwDoc *pDoc, SwDoc *pTemlate, bool bOutStyles, LanguageType eDfltLang=LANGUAGE_DONTKNOW, - sal_uInt16 nScript=CSS1_OUTMODE_ANY_SCRIPT, - bool bHardDrop=false ); + sal_uInt16 nScript=CSS1_OUTMODE_ANY_SCRIPT ); ~SwHTMLFormatInfo(); friend bool operator<( const SwHTMLFormatInfo& rInfo1, diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 11a4ee8e4301..7088a0b0c2ed 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5938,7 +5938,7 @@ void SwWW8ImplReader::SetOutlineStyles() // WW8 Built-In Heading Style does not apply the chosen one. // --> delete assignment to OutlineStyle, but keep its current // outline level - pTextFormatColl->DeleteAssignmentToListLevelOfOutlineStyle(false); + pTextFormatColl->DeleteAssignmentToListLevelOfOutlineStyle(); // Apply existing WW8 list style a normal list style at the // Paragraph Style if (pStyleInf->GetOutlineNumrule() != nullptr) diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 46d858c1f195..4251a45ecfac 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -718,7 +718,7 @@ public: SwXMLStylesContext_Impl( - SwXMLImport& rImport, sal_uInt16 nPrfx, + SwXMLImport& rImport, const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList, bool bAuto ); @@ -798,10 +798,10 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateDefaultStyleStyleChildContext( } SwXMLStylesContext_Impl::SwXMLStylesContext_Impl( - SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, + SwXMLImport& rImport, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, bool bAuto ) : - SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList, bAuto ) + SvXMLStylesContext( rImport, XML_NAMESPACE_OFFICE, rLName, xAttrList, bAuto ) { } @@ -898,7 +898,7 @@ public: SwXMLMasterStylesContext_Impl( - SwXMLImport& rImport, sal_uInt16 nPrfx, + SwXMLImport& rImport, const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~SwXMLMasterStylesContext_Impl(); @@ -907,10 +907,10 @@ public: SwXMLMasterStylesContext_Impl::SwXMLMasterStylesContext_Impl( - SwXMLImport& rImport, sal_uInt16 nPrfx, + SwXMLImport& rImport, const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ) : - XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList ) + XMLTextMasterStylesContext( rImport, XML_NAMESPACE_OFFICE, rLName, xAttrList ) { } @@ -944,7 +944,7 @@ SvXMLImportContext *SwXMLImport::CreateStylesContext( bool bAuto ) { SvXMLStylesContext *pContext = - new SwXMLStylesContext_Impl( *this, XML_NAMESPACE_OFFICE, rLocalName, + new SwXMLStylesContext_Impl( *this, rLocalName, xAttrList, bAuto ); if( bAuto ) SetAutoStyles( pContext ); @@ -959,8 +959,7 @@ SvXMLImportContext *SwXMLImport::CreateMasterStylesContext( const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLStylesContext *pContext = - new SwXMLMasterStylesContext_Impl( *this, XML_NAMESPACE_OFFICE, rLocalName, - xAttrList ); + new SwXMLMasterStylesContext_Impl( *this, rLocalName, xAttrList ); SetMasterStyles( pContext ); return pContext; diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index e20a181cb769..084d5c96cb61 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -30,8 +30,7 @@ class SwXMLBodyContentContext_Impl : public SvXMLImportContext public: - SwXMLBodyContentContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName ); + SwXMLBodyContentContext_Impl( SwXMLImport& rImport, const OUString& rLName ); virtual ~SwXMLBodyContentContext_Impl(); virtual SvXMLImportContext *CreateChildContext( @@ -44,9 +43,8 @@ public: }; SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport, - sal_uInt16 nPrfx, const OUString& rLName ) : - SvXMLImportContext( rImport, nPrfx, rLName ) + SvXMLImportContext( rImport, XML_NAMESPACE_OFFICE, rLName ) { } @@ -81,8 +79,7 @@ SvXMLImportContext *SwXMLImport::CreateBodyContentContext( SvXMLImportContext *pContext = nullptr; if( !IsStylesOnlyMode() ) - pContext = new SwXMLBodyContentContext_Impl( *this, XML_NAMESPACE_OFFICE, - rLocalName ); + pContext = new SwXMLBodyContentContext_Impl( *this, rLocalName ); else pContext = new SvXMLImportContext( *this, XML_NAMESPACE_OFFICE, rLocalName ); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 63c28e3a3e4f..ae4abb0b7cf5 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -74,7 +74,6 @@ #include <modcfg.hxx> #include <swmodule.hxx> #include <poolfmt.hxx> -#include <crsskip.hxx> #include <connectivity/dbtools.hxx> #include <dbui.hrc> diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 6b31000a6dd9..808c8bedf276 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -781,12 +781,11 @@ SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod () SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet , - sal_uInt8 nDialogMode, const OUString *pCollName, bool bDraw , const OString& sDefPage) { - VclPtr<SfxTabDialog> pDlg = VclPtr<SwParaDlg>::Create( pParent, rVw, rCoreSet,nDialogMode, pCollName, bDraw, sDefPage ); + VclPtr<SfxTabDialog> pDlg = VclPtr<SwParaDlg>::Create( pParent, rVw, rCoreSet, DLG_STD, pCollName, bDraw, sDefPage ); return new AbstractTabDialog_Impl( pDlg ); } @@ -851,13 +850,13 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(vcl::Window* return nullptr; } -SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) +SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, int nResId ) { VclPtr<SfxModalDialog> pDlg; switch ( nResId ) { case RC_DLG_SWWRAPDLG : - pDlg = VclPtr<SwWrapDlg>::Create( pParent, rSet, pSh, bDrawMode ); + pDlg = VclPtr<SwWrapDlg>::Create( pParent, rSet, pSh, true/*bDrawMode*/ ); break; default: break; diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index a4bbd5c6baed..605248b39c03 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -402,7 +402,6 @@ public: virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, - sal_uInt8 nDialogMode, const OUString *pCollName = nullptr, bool bDraw = false, const OString& sDefPage = OString() ) override; @@ -416,7 +415,7 @@ public: const SwTableAutoFormat* pSelFormat = nullptr ) override; virtual SfxAbstractDialog * CreateSwBorderDlg (vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) override; - virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) override; + virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, int nResId ) override; virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) override; virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh) override; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 45fe095adea5..445177b2f490 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -131,7 +131,7 @@ void SwFieldDBPage::Reset(const SfxItemSet*) m_pFormatLB->Clear(); - const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(TYP_DBSETNUMBERFLD, false, IsFieldDlgHtmlMode()); + const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(TYP_DBSETNUMBERFLD, IsFieldDlgHtmlMode()); for( sal_uInt16 i = 0; i < nSize; ++i ) { const sal_Int32 nEntryPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr(TYP_DBSETNUMBERFLD, i)); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 58ea65708db5..710d53995cba 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -397,7 +397,7 @@ sal_Int32 SwFieldDokInfPage::FillSelectionLB(sal_uInt16 nSubType) } else { - nSize = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode()); + nSize = GetFieldMgr().GetFormatCount(nTypeId, IsFieldDlgHtmlMode()); for (sal_uInt16 i = 0; i < nSize; i++) { sal_Int32 nPos = m_pSelectionLB->InsertEntry(GetFieldMgr().GetFormatStr(nTypeId, i)); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 00d91dc60038..2916ebe89770 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -239,7 +239,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDokPage, TypeHdl, ListBox&, void) if (nTypeId != TYP_AUTHORFLD) nCount = aLst.size(); else - nCount = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode()); + nCount = GetFieldMgr().GetFormatCount(nTypeId, IsFieldDlgHtmlMode()); size_t nPos; @@ -498,7 +498,7 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) if (nTypeId == TYP_AUTHORFLD) return m_pFormatLB->GetEntryCount(); - const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode()); + const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(nTypeId, IsFieldDlgHtmlMode()); for( sal_uInt16 i = 0; i < nSize; ++i ) { diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index ed95e6e8db0f..e11971426d03 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -35,7 +35,6 @@ #include <fldfunc.hxx> #include <fldref.hxx> #include <fldedt.hxx> -#include <crsskip.hxx> #include <cmdid.h> #include <helpid.h> diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index aa8c6e9523b8..50df8c0d0711 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -234,7 +234,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, TypeHdl, ListBox&, void) // fill Format-Listbox m_pFormatLB->Clear(); - const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode()); + const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(nTypeId, IsFieldDlgHtmlMode()); for (sal_uInt16 i = 0; i < nSize; i++) { diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index f6f002abb4f2..df326f0166b1 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -621,11 +621,11 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString) for ( size_t nNumItemIdx = 0; nNumItemIdx < maNumItems.size(); ++nNumItemIdx ) { SvTreeListEntry* pEntry = nullptr; - bool isSubstring = MatchSubstring(pIDoc->getListItemText( *maNumItems[nNumItemIdx], true, true ), filterString); + bool isSubstring = MatchSubstring(pIDoc->getListItemText( *maNumItems[nNumItemIdx] ), filterString); if(isSubstring) { pEntry = m_pSelectionToolTipLB->InsertEntry( - pIDoc->getListItemText( *maNumItems[nNumItemIdx], true, true ) ); + pIDoc->getListItemText( *maNumItems[nNumItemIdx] ) ); pEntry->SetUserData( reinterpret_cast<void*>(nNumItemIdx) ); if ( ( IsFieldEdit() && pRefField->GetReferencedTextNode() == maNumItems[nNumItemIdx]->GetTextNode() ) || @@ -781,7 +781,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) } else { - nSize = GetFieldMgr().GetFormatCount( nTypeId, false, IsFieldDlgHtmlMode() ); + nSize = GetFieldMgr().GetFormatCount( nTypeId, IsFieldDlgHtmlMode() ); } break; } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 77b3c3819e73..5e38e3e5e790 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -800,7 +800,7 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId) m_pNumFormatLB->SelectEntry(sOldSel); } - const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode()); + const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(nTypeId, IsFieldDlgHtmlMode()); for (sal_uInt16 i = 0; i < nSize; i++) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 6fce5a371900..1f63cfaff1a6 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1000,7 +1000,7 @@ static long lcl_TOXTypesToUserData(CurTOXType eType) void SwTOXSelectTabPage::SelectType(TOXTypes eSet) { - CurTOXType eCurType (eSet, 0); + CurTOXType eCurType (eSet); sal_IntPtr nData = lcl_TOXTypesToUserData(eCurType); m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos(reinterpret_cast<void*>(nData))); diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index fb8181b91cb9..407c366bb63f 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -30,7 +30,6 @@ #include <view.hxx> #include <basesh.hxx> #include <insfnote.hxx> -#include <crsskip.hxx> #include <misc.hrc> #include <globals.hrc> #include <svx/svxdlg.hxx> diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx index 4c1358d58701..9125317f6a0b 100644 --- a/sw/source/ui/vba/vbaaddin.cxx +++ b/sw/source/ui/vba/vbaaddin.cxx @@ -25,8 +25,8 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL, bool bAutoload ) throw ( uno::RuntimeException ) : - SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( bAutoload ), mbInstalled( bAutoload ) +SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL ) throw ( uno::RuntimeException ) : + SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( true ), mbInstalled( true ) { } diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index 7b1e825e3d9d..5eec826895c0 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -32,7 +32,7 @@ private: bool mbInstalled; public: - SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL, bool bAutoload ) throw ( css::uno::RuntimeException ); + SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL ) throw ( css::uno::RuntimeException ); virtual ~SwVbaAddin(); // Attributes diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index da6716df4760..352f47ad3eab 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -45,7 +45,7 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u OUString sUrl = sEntries[ index ]; if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCase( ".dot" ) ) { - maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, true ) ) ); + maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl ) ) ); } } } diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index ad0ed53ddfeb..63cfd8458b7b 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -58,7 +58,6 @@ #include <poolfmt.hxx> #include <expfld.hxx> #include <SwStyleNameMapper.hxx> -#include <crsskip.hxx> #include <fmtpdsc.hxx> #include <cmdid.h> diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index cf3970ab9bbb..b124c797b2ae 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -209,8 +209,8 @@ void SwContentViewConfig::Load() rParent.SetUpdateLinkMode(nSet, true); } break;// "Update/Link", - case 17: rParent.SetUpdateFields(bSet, true); break;// "Update/Field", - case 18: rParent.SetUpdateCharts(bSet, true); break;// "Update/Chart" + case 17: rParent.SetUpdateFields(bSet); break;// "Update/Field", + case 18: rParent.SetUpdateCharts(bSet); break;// "Update/Chart" } } } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 58951865cf79..f69fcc230dfa 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -2183,7 +2183,7 @@ bool SwDBManager::ToNextMergeRecord() } bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter, - sal_uInt16 nLanguage, bool asString, SwCalc &rCalc ) + sal_uInt16 nLanguage, SwCalc &rCalc ) { if (!(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is())) return false; @@ -2232,10 +2232,7 @@ bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter, if( bValidValue ) { SwSbxValue aValue; - if( !asString ) - aValue.PutDouble( aNumber ); - else - aValue.PutString( aString ); + aValue.PutString( aString ); SAL_INFO( "sw.ui", "'" << pColNames[nCol] << "': " << aNumber << " / " << aString ); rCalc.VarChange( pColNames[nCol], aValue ); } @@ -2911,8 +2908,7 @@ void SwDBManager::LoadAndRegisterEmbeddedDataSource(const SwDBData& rData, const } void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh, - const uno::Sequence<beans::PropertyValue>& rProperties, - bool bWithDataSourceBrowser) + const uno::Sequence<beans::PropertyValue>& rProperties) { //prevent second call if(pImpl->pMergeDialog) @@ -2953,8 +2949,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh, sDataSource, sDataTableOrQuery, nCmdType, - xConnection, - bWithDataSourceBrowser ? nullptr : &aSelection); + xConnection); OSL_ENSURE(pImpl->pMergeDialog, "Dialog creation failed!"); if(pImpl->pMergeDialog->Execute() == RET_OK) { diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 581189b35aee..630149f39d9b 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -45,7 +45,6 @@ #include <gloslst.hxx> #include <swdtflvr.hxx> #include <docsh.hxx> -#include <crsskip.hxx> #include <dochdl.hrc> #include <swerror.h> @@ -408,7 +407,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, for(size_t i = 0; i < nGroupCount; ++i) { // get group name with path-extension - const OUString sGroupName = pGlossaryList->GetGroupName(i, false); + const OUString sGroupName = pGlossaryList->GetGroupName(i); if(sGroupName == pGlossary->GetName()) continue; const sal_uInt16 nBlockCount = pGlossaryList->GetBlockCount(i); diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 0f28c5de41ab..7380e27239e3 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -228,7 +228,7 @@ void SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExistance, bool b } mbLayout = bFocus; if (dynamic_cast< const SwFormatField *>( pItem ) != nullptr) - mvPostItFields.push_back(new SwAnnotationItem(static_cast<SwFormatField&>(*pItem), true, bFocus) ); + mvPostItFields.push_back(new SwAnnotationItem(static_cast<SwFormatField&>(*pItem), bFocus) ); OSL_ENSURE(dynamic_cast< const SwFormatField *>( pItem ) != nullptr,"Mgr::InsertItem: seems like new stuff was added"); StartListening(*pItem); } diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index a354e1b6a188..7df99e62e88c 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -116,7 +116,6 @@ #include <swcalwrp.hxx> #include <swdtflvr.hxx> #include <wdocsh.hxx> -#include <crsskip.hxx> #include <breakit.hxx> #include <checkit.hxx> #include <pagefrm.hxx> diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 02cf4a75015a..a25ea0615ca4 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -72,7 +72,6 @@ #include <authfld.hxx> #include <flddat.hxx> #include <fldmgr.hxx> -#include <crsskip.hxx> #include <flddropdown.hxx> #include <fldui.hrc> #include <tox.hxx> @@ -523,7 +522,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) // determine format // ACCESS over TYP_.... -sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode) const +sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bHtmlMode) const { OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); { @@ -535,9 +534,6 @@ sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHt sal_uLong nStart = aSwFields[nPos].nFormatBegin; sal_uLong nEnd = aSwFields[nPos].nFormatEnd; - if (bIsText && nEnd - nStart >= 2) - return 2; - if (nTypeId == TYP_FILENAMEFLD) nEnd -= 2; // no range or template diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx index e5626bb74c37..e81d0f276b33 100644 --- a/sw/source/uibase/inc/cnttab.hxx +++ b/sw/source/uibase/inc/cnttab.hxx @@ -61,7 +61,7 @@ struct CurTOXType CurTOXType () : eType (TOX_INDEX), nIndex (0) {}; - CurTOXType (TOXTypes t, sal_uInt16 i) : eType (t), nIndex (i) {}; + CurTOXType (TOXTypes t) : eType (t), nIndex (0) {}; }; class SwOLENames : public Resource diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 65e91492ed78..0d479b19c0e1 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -184,7 +184,7 @@ public: void GetSubTypes(sal_uInt16 nId, std::vector<OUString>& rToFill); // format to a type - sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode = false) const; + sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, bool bHtmlMode) const; OUString GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const; sal_uInt16 GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const; sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter); diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx index e460e81bb1d3..64eab46ea637 100644 --- a/sw/source/uibase/inc/glosdoc.hxx +++ b/sw/source/uibase/inc/glosdoc.hxx @@ -63,22 +63,21 @@ public: ~SwGlossaries(); /** returns the cached AutoTextGroup (if any) for the given group name + The group is created if it does not yet exist @precond If <arg>_bCreate</arg> is <TRUE/>, the SolarMutex must be locked when calling into this method. @param _rGroupName the name of the glossaries group - @param _bCreate - if <TRUE/>, the group is created if it does not yet exist */ css::uno::Reference< css::text::XAutoTextGroup > GetAutoTextGroup( - const OUString& _rGroupName, - bool _bCreate = false + const OUString& _rGroupName ); /** returns the cached AutoTextEntry (if any) for the given group/with the given name + The entry is created if it does not yet exist @precond If <arg>_bCreate</arg> is <TRUE/>, the SolarMutex must be locked when calling into this method. @@ -89,15 +88,12 @@ public: the name of the glossaries group, as to be passed to the entry @param _rEntryName the name of the auto text entry - @param _bCreate - if <TRUE/>, the entry is created if it does not yet exist */ css::uno::Reference< css::text::XAutoTextEntry > GetAutoTextEntry( const OUString& _rCompleteGroupName, const OUString& _rGroupName, - const OUString& _rEntryName, - bool _bCreate = false + const OUString& _rEntryName ); size_t GetGroupCnt(); diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx index 0011330c5d30..978c453b8e7f 100644 --- a/sw/source/uibase/inc/gloslst.hxx +++ b/sw/source/uibase/inc/gloslst.hxx @@ -61,7 +61,7 @@ public: OUString& rShortName, OUString& rGroupName ); size_t GetGroupCount(); - OUString GetGroupName(size_t nPos, bool bNoPath = true); + OUString GetGroupName(size_t nPos); OUString GetGroupTitle(size_t nPos); sal_uInt16 GetBlockCount(size_t nGroup); diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 9a252de063d2..33761318e5b9 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -41,8 +41,8 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox DECL_DLLPRIVATE_LINK_TYPED( SelectHdl, ListBox&, void ); SAL_DLLPRIVATE double GetDefValue(const short nFormatType) const; - SAL_DLLPRIVATE void Init(short nFormatType, bool bUsrFormats); - SAL_DLLPRIVATE SwView* GetView(); + SAL_DLLPRIVATE void Init(short nFormatType); + SAL_DLLPRIVATE SwView* GetView(); public: NumFormatListBox(vcl::Window* pWin, WinBits nStyle); diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx index b0355555337b..15344025a919 100644 --- a/sw/source/uibase/inc/prcntfld.hxx +++ b/sw/source/uibase/inc/prcntfld.hxx @@ -53,7 +53,7 @@ public: void SetModifyHdl(const Link<Edit&,void>& rLink) { m_pField->SetModifyHdl(rLink); } void SetLoseFocusHdl(const Link<Control&,void>& rLink) { m_pField->SetLoseFocusHdl(rLink); } void SetMetric(FieldUnit eUnit) { ::SetMetric(*m_pField, eUnit); } - void Enable(bool bEnable = true, bool bChild = true) { m_pField->Enable(bEnable, bChild); } + void Enable(bool bEnable = true) { m_pField->Enable(bEnable); } void Disable() { m_pField->Disable(); } bool HasFocus() const { return m_pField->HasFocus(); } void SetAccessibleName(const OUString& rName) { m_pField->SetAccessibleName(rName); } diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx index 7db2669a745c..93956394651a 100644 --- a/sw/source/uibase/inc/srcview.hxx +++ b/sw/source/uibase/inc/srcview.hxx @@ -45,7 +45,6 @@ class SwSrcView: public SfxViewShell protected: void StartSearchAndReplace(const SvxSearchItem& rItem, - bool bFromStart, bool bApi, bool bRecursive = false); diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx index eb512826605b..10f6a6fa742f 100644 --- a/sw/source/uibase/inc/tablemgr.hxx +++ b/sw/source/uibase/inc/tablemgr.hxx @@ -51,7 +51,7 @@ private: public: inline SwTableFUNC(SwFrameFormat &); - SwTableFUNC(SwWrtShell *pShell, bool bCopyFormat = false); + SwTableFUNC(SwWrtShell *pShell); ~SwTableFUNC(); void InitTabCols(); diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx index 055167216cad..e41af1200b7a 100644 --- a/sw/source/uibase/inc/unomod.hxx +++ b/sw/source/uibase/inc/unomod.hxx @@ -176,7 +176,7 @@ protected: virtual ~SwXViewSettings() throw(); public: - SwXViewSettings(bool bWeb, SwView* pView); + SwXViewSettings(SwView* pView); //XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index 636a4d495fb9..31e8b6ba26c5 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -171,19 +171,15 @@ public: } sal_Int32 GetUpdateLinkMode() const {return nLinkUpdateMode; } - void SetUpdateFields(bool bSet, bool bNoModify = false) + void SetUpdateFields(bool bSet) { if(bSet && eFieldUpdateFlags == AUTOUPD_OFF) { eFieldUpdateFlags = AUTOUPD_FIELD_ONLY; - if(!bNoModify) - aContentConfig.SetModified(); } else if(!bSet) { eFieldUpdateFlags = AUTOUPD_OFF; - if(!bNoModify) - aContentConfig.SetModified(); } }; bool IsUpdateFields()const {return eFieldUpdateFlags != AUTOUPD_OFF; } @@ -195,19 +191,15 @@ public: aContentConfig.SetModified(); } - void SetUpdateCharts(bool bSet, bool bNoModify = false) + void SetUpdateCharts(bool bSet) { if(bSet) { eFieldUpdateFlags = AUTOUPD_FIELD_AND_CHARTS; - if(!bNoModify) - aContentConfig.SetModified(); } else if(eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS) { eFieldUpdateFlags = AUTOUPD_FIELD_ONLY; - if(!bNoModify) - aContentConfig.SetModified(); } }; bool IsUpdateCharts()const {return eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; } diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 5c6dfd2a13be..51adb0336c9a 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -177,10 +177,10 @@ public: // select word / sentence bool SelNearestWrd(); - bool SelWrd (const Point * = nullptr, bool bProp=false ); + bool SelWrd (const Point * = nullptr ); // #i32329# Enhanced selection - void SelSentence (const Point * = nullptr, bool bProp=false ); - void SelPara (const Point * = nullptr, bool bProp=false ); + void SelSentence (const Point * = nullptr ); + void SelPara (const Point * = nullptr ); long SelAll(); // basecursortravelling @@ -191,8 +191,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); sal_uInt16 nCount, bool bBasicCall, bool bVisual = false ); bool Right ( sal_uInt16 nMode, bool bSelect, sal_uInt16 nCount, bool bBasicCall, bool bVisual = false ); - bool Up ( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false ); - bool Down ( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false ); + bool Up ( bool bSelect, bool bBasicCall = false ); + bool Down ( bool bSelect, bool bBasicCall = false ); void NxtWrd ( bool bSelect = false ) { SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); } bool PrvWrd ( bool bSelect = false ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); } @@ -298,7 +298,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void InsertLineBreak(); void InsertColumnBreak(); void InsertFootnote(const OUString &, bool bEndNote = false, bool bEdit = true ); - void SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true ); + void SplitNode( bool bAutoFormat = false ); bool CanInsert(); // indexes @@ -321,7 +321,6 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 for clipboard const svt::EmbeddedObjectRef&, SvGlobalName *pName = nullptr, // != 0 create object accordingly - bool bActivate = true, sal_uInt16 nSlotId = 0); // SlotId for dialog bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = nullptr ); @@ -396,7 +395,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); // jump to bookmark and set the "selections-flags" correctly again void GotoMark( const ::sw::mark::IMark* const pMark ); - bool GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect, bool bStart ); + bool GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect ); void GotoMark( const OUString& rName ); bool GoNextBookmark(); // true when there still was one bool GoPrevBookmark(); diff --git a/sw/source/uibase/index/toxmgr.cxx b/sw/source/uibase/index/toxmgr.cxx index 676944636673..eba05c80ae07 100644 --- a/sw/source/uibase/index/toxmgr.cxx +++ b/sw/source/uibase/index/toxmgr.cxx @@ -22,7 +22,6 @@ #include <swwait.hxx> #include <view.hxx> #include <toxmgr.hxx> -#include <crsskip.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <swundo.hxx> diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 0974e870343f..a3b10dbee5ec 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -36,7 +36,6 @@ #include <docsh.hxx> #include <mdiexp.hxx> #include <edtwin.hxx> -#include <crsskip.hxx> #include <index.hxx> #include <pam.hxx> #include <swcrsr.hxx> diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 17318f982956..fd9128a5effc 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -21,7 +21,6 @@ #include "chrdlg.hrc" #include "cmdid.h" #include "comcore.hrc" -#include "crsskip.hxx" #include "doc.hxx" #include "docsh.hxx" #include "edtwin.hxx" diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx index badc48d938d5..fa503d054a33 100644 --- a/sw/source/uibase/misc/glosdoc.cxx +++ b/sw/source/uibase/misc/glosdoc.cxx @@ -548,8 +548,9 @@ void SwGlossaries::InvalidateUNOOjects() m_aGlossaryEntries.swap( aTmpe ); } -Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString& _rGroupName, bool _bCreate ) +Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString& _rGroupName ) { + bool _bCreate = true; // first, find the name with path-extension const OUString sCompleteGroupName = GetCompleteGroupName( _rGroupName ); @@ -605,8 +606,7 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const OUString& rCompleteGroupName, const OUString& rGroupName, - const OUString& rEntryName, - bool _bCreate ) + const OUString& rEntryName ) { //standard must be created bool bCreate = ( rCompleteGroupName == GetDefName() ); @@ -650,7 +650,7 @@ Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( ++aSearch; } - if ( !xReturn.is() && _bCreate ) + if ( !xReturn.is() ) { xReturn = new SwXAutoTextEntry( this, rGroupName, rEntryName ); // cache it diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 506e4de330fd..27df6fd819fc 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -144,7 +144,7 @@ IMPL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, pMenu, bool) sal_uInt16 nBlock = nId / 100; SwGlossaryList* pGlossaryList = ::GetGlossaryList(); - OUString sGroup = pGlossaryList->GetGroupName(nBlock - 1, false); + OUString sGroup = pGlossaryList->GetGroupName(nBlock - 1); OUString sShortName = pGlossaryList->GetBlockShortName(nBlock - 1, nId - (100 * nBlock) - 1); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 73715d1aca41..2876d0b1a650 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -544,7 +544,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr,DLG_STD, nullptr, true )); + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr, nullptr, true )); OSL_ENSURE(pDlg, "Dialog creation failed!"); sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet) diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index cd0f8b002019..44c1f42462e2 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -91,7 +91,6 @@ #include <statstr.hrc> #include <globals.h> #include <unotxdoc.hxx> -#include <crsskip.hxx> #include <fmtinfmt.hxx> #include <doc.hxx> #include <IDocumentSettingAccess.hxx> @@ -612,7 +611,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) if( rSh.IsCursorInTable() ) { if( !rSh.IsTableComplexForChart() ) - SwTableFUNC( &rSh, false).UpdateChart(); + SwTableFUNC( &rSh ).UpdateChart(); rSh.ClearTableBoxContent(); rSh.SaveTableBoxContent(); } diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 126986d782ff..6ebd85b4f153 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -148,7 +148,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, true, RC_DLG_SWWRAPDLG )); + std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, RC_DLG_SWWRAPDLG )); OSL_ENSURE(pDlg, "Dialog creation failed!"); if (pDlg->Execute() == RET_OK) diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index ac2a781158a4..00b10a52d151 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -422,7 +422,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); assert(pFact && "SwAbstractDialogFactory fail!"); - std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, nullptr, true )); + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr, nullptr, true )); assert(pDlg && "Dialog creation failed!"); sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet) diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index c44f881eb7ca..71bdf6ae2dc9 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -1139,7 +1139,7 @@ void SwTableShell::Execute(SfxRequest &rReq) // The last case branch which needs a table manager!! case FN_TABLE_SET_COL_WIDTH: { - SwTableFUNC aMgr( &rSh, false); + SwTableFUNC aMgr( &rSh ); aMgr.ColWidthDlg(GetView().GetWindow()); break; } diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 652f607d731e..e9db87ffe399 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -18,7 +18,6 @@ */ #include <chrdlgmodes.hxx> -#include <crsskip.hxx> #include <hintids.hxx> #include <SidebarWin.hxx> #include <IDocumentFieldsAccess.hxx> diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 312dc99ae4da..cf44195e9f12 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -86,7 +86,6 @@ #include <idxmrk.hxx> #include <poolfmt.hxx> #include <breakit.hxx> -#include <crsskip.hxx> #include <modcfg.hxx> #include <column.hxx> #include <edtwin.hxx> @@ -249,7 +248,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) } svt::EmbeddedObjectRef xObj; - rSh.InsertObject( xObj, pName, true, nSlot); + rSh.InsertObject( xObj, pName, nSlot); rReq.Done(); break; } @@ -316,7 +315,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) } else { - rSh.InsertObject( xObj, nullptr, true, nSlot); + rSh.InsertObject( xObj, nullptr, nSlot); rReq.Done(); } } @@ -348,7 +347,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) else bFillWithData = false; // will create chart with only it's default image - SwTableFUNC( &rSh, false ).InsertChart( xDataProvider, bFillWithData, aRangeString ); + SwTableFUNC( &rSh ).InsertChart( xDataProvider, bFillWithData, aRangeString ); rSh.LaunchOLEObj(); svt::EmbeddedObjectRef& xObj = rSh.GetOLEObject(); diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index ddce7968ac63..70ddbcfccb63 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -86,7 +86,6 @@ #include <app.hrc> #include <web.hrc> #include "paratr.hxx" -#include <crsskip.hxx> #include <vcl/svapp.hxx> #include <sfx2/app.hxx> #include <breakit.hxx> @@ -1006,7 +1005,7 @@ void SwTextShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - pDlg.reset(pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, DLG_STD, nullptr, false, sDefPage )); + pDlg.reset(pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, nullptr, false, sDefPage )); OSL_ENSURE(pDlg, "Dialog creation failed!"); } SfxItemSet* pSet = nullptr; @@ -1120,12 +1119,12 @@ void SwTextShell::Execute(SfxRequest &rReq) { OUString sContinuedListId; const SwNumRule* pRule = - rWrtSh.SearchNumRule( true, false, -1, sContinuedListId ); + rWrtSh.SearchNumRule( true, -1, sContinuedListId ); // #i86492# // Search also for bullet list if ( !pRule ) { - pRule = rWrtSh.SearchNumRule( false, false, -1, sContinuedListId ); + pRule = rWrtSh.SearchNumRule( false, -1, sContinuedListId ); } if ( pRule ) { @@ -1882,10 +1881,10 @@ void SwTextShell::GetState( SfxItemSet &rSet ) // Search also for bullet list OUString aDummy; const SwNumRule* pRule = - rSh.SearchNumRule( true, false, -1, aDummy ); + rSh.SearchNumRule( true, -1, aDummy ); if ( !pRule ) { - pRule = rSh.SearchNumRule( false, false, -1, aDummy ); + pRule = rSh.SearchNumRule( false, -1, aDummy ); } if ( !pRule ) rSet.DisableItem(nWhich); diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx index 7b5ad39ae64d..3319993658d9 100644 --- a/sw/source/uibase/shells/txtcrsr.cxx +++ b/sw/source/uibase/shells/txtcrsr.cxx @@ -32,7 +32,6 @@ #include <textsh.hxx> #include <num.hxx> #include <edtwin.hxx> -#include <crsskip.hxx> #include <doc.hxx> #include <docsh.hxx> diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index e1d39e7661c1..a29680e955ee 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -163,7 +163,7 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings ) } SwFlyFrameFormat *pFlyFrameFormat = nullptr; - xChartModel.set( SwTableFUNC( &rWrtShell, false ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrameFormat )); + xChartModel.set( SwTableFUNC( &rWrtShell ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrameFormat )); //open wizard //@todo get context from writer if that has one diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index e6bed55bb587..a82738dce1db 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -166,10 +166,10 @@ void SwTableFUNC::InitTabCols() pSh->GetTabCols( aCols ); } -SwTableFUNC::SwTableFUNC(SwWrtShell *pShell, bool bCopyFormat) +SwTableFUNC::SwTableFUNC(SwWrtShell *pShell) : pFormat(pShell->GetTableFormat()), pSh(pShell), - bCopy(bCopyFormat) + bCopy(false) { // if applicable copy the format for edit if( pFormat && bCopy ) diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index bb1b5c83aa55..47136c11bfb6 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -252,7 +252,7 @@ void SwPagePreviewWin::CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol ) if( mnSttPage > nLastSttPg ) mnSttPage = nLastSttPg; - mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize, true ); + mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize ); mpPgPreviewLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, mnSttPage, maPaintedPreviewDocRect ); SetSelectedPage( mnSttPage ); @@ -399,7 +399,7 @@ void SwPagePreviewWin::SetWinSize( const Size& rNewSize ) if ( mbCalcScaleForPreviewLayout ) { - mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize, true ); + mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize ); maScale = GetMapMode().GetScaleX(); } mpPgPreviewLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, @@ -1763,7 +1763,7 @@ void SwPagePreviewWin::AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor, { mnRow = 1; mnCol = 1; - mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize, true ); + mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize ); mpPgPreviewLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, mnSttPage, maPaintedPreviewDocRect ); SetSelectedPage( mnSttPage ); diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 0def762c6410..37c366f57d96 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -369,7 +369,7 @@ void SwSrcView::Execute(SfxRequest& rReq) OSL_ENSURE( nWhich, "Which for SearchItem ?" ); const SfxPoolItem& rItem = pTmpArgs->Get( nWhich ); SetSearchItem( static_cast<const SvxSearchItem&>(rItem)); - StartSearchAndReplace( static_cast<const SvxSearchItem&>(rItem), false, rReq.IsAPI() ); + StartSearchAndReplace( static_cast<const SvxSearchItem&>(rItem), rReq.IsAPI() ); if(aEditWin->IsModified()) GetDocShell()->GetDoc()->getIDocumentState().SetModified(); } @@ -379,7 +379,7 @@ void SwSrcView::Execute(SfxRequest& rReq) SvxSearchItem* pSrchItem = GetSearchItem(); if(pSrchItem) { - StartSearchAndReplace( *pSrchItem, false, rReq.IsAPI() ); + StartSearchAndReplace( *pSrchItem, rReq.IsAPI() ); if(aEditWin->IsModified()) GetDocShell()->GetDoc()->getIDocumentState().SetModified(); } @@ -567,7 +567,6 @@ void SwSrcView::SetSearchItem( const SvxSearchItem& rItem ) } void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, - bool bFromStart, bool bApi, bool bRecursive) { @@ -581,12 +580,6 @@ void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, if( !bForward ) aPaM = TextPaM( TEXT_PARA_ALL, TEXT_INDEX_ALL ); - if( bFromStart ) - { - aSel = pTextView->GetSelection(); - pTextView->SetSelection( TextSelection( aPaM, aPaM )); - } - util::SearchOptions2 aSearchOpt( rSearchItem.GetSearchOptions() ); aSearchOpt.Locale = GetAppLanguageTag().getLocale(); @@ -613,15 +606,7 @@ void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, bool bNotFoundMessage = false; if(!bRecursive) { - if(!bFromStart) - { - bNotFoundMessage = bAtStart; - } - else - { - bNotFoundMessage = true; - pTextView->SetSelection( aSel ); - } + bNotFoundMessage = bAtStart; } else if(bAtStart) { @@ -653,7 +638,7 @@ void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, if (nRet == RET_YES) { pTextView->SetSelection( TextSelection( aPaM, aPaM ) ); - StartSearchAndReplace( rSearchItem, false, false, true ); + StartSearchAndReplace( rSearchItem, false, true ); } } } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 990513f769fb..a976ea9cda54 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -216,7 +216,7 @@ OUString SwView::GetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUStr int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter, bool bLink, GraphicFilter *pFilter, - Graphic* pPreviewGrf, bool bRule ) + Graphic* pPreviewGrf ) { SwWait aWait( *GetDocShell(), true ); @@ -278,8 +278,7 @@ int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter, OUString sURL = URIHelper::SmartRel2Abs( aTemp, rPath, URIHelper::GetMaybeFileHdl() ); - rShell.Insert( sURL, - rFilter, aGraphic, &aFrameManager, bRule ); + rShell.Insert( sURL, rFilter, aGraphic, &aFrameManager ); } else { @@ -1114,7 +1113,7 @@ void SwView::Execute(SfxRequest &rReq) pValues[0].Value <<= aData.sDataSource; pValues[1].Value <<= aData.sCommand; pValues[2].Value <<= aData.nCommandType; - pDBManager->ExecuteFormLetter(rSh, aProperties, true); + pDBManager->ExecuteFormLetter(rSh, aProperties); } } #endif @@ -2005,7 +2004,7 @@ bool SwView::JumpToSwMark( const OUString& rMark ) } else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)) ) { - m_pWrtShell->GotoMark( ppMark->get(), false, true ); + m_pWrtShell->GotoMark( ppMark->get(), false ); bRet = true; } else if( nullptr != ( pINet = m_pWrtShell->FindINetAttr( sMark ) )) { @@ -2032,7 +2031,7 @@ bool SwView::JumpToSwMark( const OUString& rMark ) } else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark))) { - m_pWrtShell->GotoMark( ppMark->get(), false, true ); + m_pWrtShell->GotoMark( ppMark->get(), false ); bRet = true; } else if( nullptr != ( pINet = m_pWrtShell->FindINetAttr( sMark ) )) @@ -2415,7 +2414,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) pValues[0].Value <<= aData.sDataSource; pValues[1].Value <<= aData.sCommand; pValues[2].Value <<= aData.nCommandType; - pDBManager->ExecuteFormLetter(GetWrtShell(), aProperties, true); + pDBManager->ExecuteFormLetter(GetWrtShell(), aProperties); } } else diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 3050d02eee54..29072b039691 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -54,7 +54,6 @@ #include <olmenu.hxx> #include <pam.hxx> #include <edtwin.hxx> -#include <crsskip.hxx> #include <ndtxt.hxx> #include <txtfrm.hxx> #include <vcl/lstbox.hxx> diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 5ecfd6260431..b68af257e300 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -41,7 +41,6 @@ #include <usrpref.hxx> #include <pagedesc.hxx> #include <workctrl.hxx> -#include <crsskip.hxx> #include <touch/touch.h> #include <PostItMgr.hxx> diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 8ee1ad987c56..c4ed4e58bcf8 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -106,7 +106,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) uno::Reference< text::XAutoTextGroup > xGroup; if ( pGlossaries && hasByName( GroupName ) ) // group name already known? // true = create group if not already available - xGroup = pGlossaries->GetAutoTextGroup( GroupName, true ); + xGroup = pGlossaries->GetAutoTextGroup( GroupName ); if ( !xGroup.is() ) throw container::NoSuchElementException(); @@ -178,7 +178,7 @@ uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName( } pGlossaries->NewGroupDoc(sGroup, sGroup.getToken(0, GLOS_DELIM)); - uno::Reference< text::XAutoTextGroup > xGroup = pGlossaries->GetAutoTextGroup( sGroup, true ); + uno::Reference< text::XAutoTextGroup > xGroup = pGlossaries->GetAutoTextGroup( sGroup ); OSL_ENSURE( xGroup.is(), "SwXAutoTextContainer::insertNewByName: no UNO object created? How this?" ); // We just inserted the group into the glossaries, so why doesn't it exist? @@ -412,7 +412,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const try { xEntry = pGlossaries ? - pGlossaries->GetAutoTextEntry( m_sGroupName, sName, sShortName, true ) : + pGlossaries->GetAutoTextEntry( m_sGroupName, sName, sShortName ) : uno::Reference< text::XAutoTextEntry >(); OSL_ENSURE( xEntry.is(), "SwXAutoTextGroup::insertNewByName: no UNO object created? How this?" ); // we just inserted the entry into the group, so why doesn't it exist? @@ -540,7 +540,7 @@ uno::Any SwXAutoTextGroup::getByName(const OUString& _rName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - uno::Reference< text::XAutoTextEntry > xEntry = pGlossaries->GetAutoTextEntry( m_sGroupName, sName, _rName, true ); + uno::Reference< text::XAutoTextEntry > xEntry = pGlossaries->GetAutoTextEntry( m_sGroupName, sName, _rName ); OSL_ENSURE( xEntry.is(), "SwXAutoTextGroup::getByName: GetAutoTextEntry is fractious!" ); // we told it to create the object, so why didn't it? return makeAny( xEntry ); diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 0220afac1b23..195dfcee2479 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -209,7 +209,7 @@ Reference< XPropertySet > SwXModule::getViewSettings() throw( uno::RuntimeExcep if(!mxViewSettings.is()) { OSL_FAIL("Web or Text?"); - mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( false, nullptr ) ); + mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( nullptr ) ); } return mxViewSettings; } @@ -537,13 +537,13 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames() throw( Runtime return aRet; } -SwXViewSettings::SwXViewSettings(bool bWebView, SwView* pVw) +SwXViewSettings::SwXViewSettings(SwView* pVw) : ChainableHelperNoState( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() ) , pView(pVw) , mpViewOption(nullptr) , mpConstViewOption(nullptr) , bObjectValid(true) - , bWeb(bWebView) + , bWeb(false) , mbApplyZoom(false) , eHRulerUnit(FUNIT_CM) , mbApplyHRulerMetric(false) diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 91849d97ecac..ef20d115eca4 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -60,7 +60,6 @@ #include <shellio.hxx> #include <ndtxt.hxx> #include <SwStyleNameMapper.hxx> -#include <crsskip.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/ShapeCollection.hpp> #include <editeng/outliner.hxx> @@ -514,7 +513,7 @@ uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings() throw( uno { if(!mxViewSettings.is()) { - mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( false, m_pView ) ); + mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( m_pView ) ); } } else @@ -1621,7 +1620,7 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand) throw uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) ); for( sal_uInt16 i = 0; i < nCount; i++ ) - bRet = m_pView->GetWrtShell().Down( bExpand, 1, true ); + bRet = m_pView->GetWrtShell().Down( bExpand, true ); } else throw uno::RuntimeException(); @@ -1639,7 +1638,7 @@ sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand) throw uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) ); for( sal_uInt16 i = 0; i < nCount; i++ ) - bRet = m_pView->GetWrtShell().Up( bExpand, 1, true ); + bRet = m_pView->GetWrtShell().Up( bExpand, true ); } else throw uno::RuntimeException(); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 6280e001a199..36ecbb27c1a2 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -55,7 +55,6 @@ #include <IDocumentOutlineNodes.hxx> #include <unotools.hxx> #include <unotxvw.hxx> -#include <crsskip.hxx> #include <cmdid.h> #include <helpid.h> #include <navipi.hrc> diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 3af10c9fd928..94678dee00ac 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -186,15 +186,13 @@ size_t SwGlossaryList::GetGroupCount() return aGroupArr.size(); } -OUString SwGlossaryList::GetGroupName(size_t nPos, bool bNoPath) +OUString SwGlossaryList::GetGroupName(size_t nPos) { OSL_ENSURE(aGroupArr.size() > nPos, "group not available"); if(nPos < aGroupArr.size()) { AutoTextGroup* pGroup = aGroupArr[nPos]; OUString sRet = pGroup->sName; - if(bNoPath) - sRet = sRet.getToken(0, GLOS_DELIM); return sRet; } return OUString(); diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index dc7d5eb4a118..0a535a8d6948 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -64,7 +64,7 @@ NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits nStyle) : bShowLanguageControl(false), bUseAutomaticLanguage(true) { - Init(css::util::NumberFormat::NUMBER, true); + Init(css::util::NumberFormat::NUMBER); } VCL_BUILDER_DECL_FACTORY(NumFormatListBox) @@ -86,7 +86,7 @@ VCL_BUILDER_DECL_FACTORY(NumFormatListBox) rRet = pListBox; } -void NumFormatListBox::Init(short nFormatType, bool bUsrFormats) +void NumFormatListBox::Init(short nFormatType) { SwView *pView = GetView(); @@ -95,11 +95,6 @@ void NumFormatListBox::Init(short nFormatType, bool bUsrFormats) else eCurLanguage = SvtSysLocale().GetLanguageTag().getLanguageType(); - if (!bUsrFormats) - { - pOwnFormatter = new SvNumberFormatter(comphelper::getProcessComponentContext(), eCurLanguage); - } - SetFormatType(nFormatType); SetDefFormat(nDefFormat); diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 340b39a696a8..3375cbb2f33f 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -18,7 +18,6 @@ */ #include <wrtsh.hxx> -#include <crsskip.hxx> #include <swcrsr.hxx> #include <editeng/lrspitem.hxx> #include <view.hxx> diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx index baaba962613d..02cbb152fc2a 100644 --- a/sw/source/uibase/wrtsh/move.cxx +++ b/sw/source/uibase/wrtsh/move.cxx @@ -21,7 +21,6 @@ #include <wrtsh.hxx> #include <view.hxx> #include <viewopt.hxx> -#include <crsskip.hxx> /** Always: @@ -128,7 +127,7 @@ bool SwWrtShell::Right( sal_uInt16 nMode, bool bSelect, } } -bool SwWrtShell::Up( bool bSelect, sal_uInt16 nCount, bool bBasicCall ) +bool SwWrtShell::Up( bool bSelect, bool bBasicCall ) { if ( !bSelect && !bBasicCall && IsCursorReadonly() && !GetViewOptions()->IsSelectionInReadonly()) { @@ -139,10 +138,10 @@ bool SwWrtShell::Up( bool bSelect, sal_uInt16 nCount, bool bBasicCall ) } ShellMoveCursor aTmp( this, bSelect ); - return SwCursorShell::Up( nCount ); + return SwCursorShell::Up(); } -bool SwWrtShell::Down( bool bSelect, sal_uInt16 nCount, bool bBasicCall ) +bool SwWrtShell::Down( bool bSelect, bool bBasicCall ) { if ( !bSelect && !bBasicCall && IsCursorReadonly() && !GetViewOptions()->IsSelectionInReadonly()) { @@ -154,7 +153,7 @@ bool SwWrtShell::Down( bool bSelect, sal_uInt16 nCount, bool bBasicCall ) } ShellMoveCursor aTmp( this, bSelect ); - return SwCursorShell::Down( nCount ); + return SwCursorShell::Down(); } bool SwWrtShell::LeftMargin( bool bSelect, bool bBasicCall ) @@ -577,11 +576,11 @@ bool SwWrtShell::GotoPage(sal_uInt16 nPage, bool bRecord) return false; } -bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect, bool bStart ) +bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect ) { ShellMoveCursor aTmp( this, bSelect ); SwPosition aPos = *GetCursor()->GetPoint(); - bool bRet = SwCursorShell::GotoMark( pMark, bStart ); + bool bRet = SwCursorShell::GotoMark( pMark, true/*bStart*/ ); if (bRet) m_aNavigationMgr.addEntry(aPos); return bRet; diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 35b0b19cc850..823cef83601b 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -36,7 +36,6 @@ #include <swundo.hxx> #include <swevent.hxx> #include <swdtflvr.hxx> -#include <crsskip.hxx> #include <doc.hxx> #include <wordcountdialog.hxx> #include <memory> @@ -70,7 +69,7 @@ bool SwWrtShell::SelNearestWrd() return SelWrd(); } -bool SwWrtShell::SelWrd(const Point *pPt, bool ) +bool SwWrtShell::SelWrd(const Point *pPt ) { bool bRet; { @@ -88,7 +87,7 @@ bool SwWrtShell::SelWrd(const Point *pPt, bool ) return bRet; } -void SwWrtShell::SelSentence(const Point *pPt, bool ) +void SwWrtShell::SelSentence(const Point *pPt ) { { SwMvContext aMvContext(this); @@ -104,7 +103,7 @@ void SwWrtShell::SelSentence(const Point *pPt, bool ) m_bSelWrd = false; // disable SelWord, otherwise no SelLine goes on } -void SwWrtShell::SelPara(const Point *pPt, bool ) +void SwWrtShell::SelPara(const Point *pPt ) { { SwMvContext aMvContext(this); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 0c89f8c535e6..2c87f3f52144 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -80,7 +80,6 @@ #include <caption.hxx> #include <viscrs.hxx> #include <swdtflvr.hxx> -#include <crsskip.hxx> #include <doc.hxx> #include <IDocumentSettingAccess.hxx> #include <wrtsh.hrc> @@ -339,7 +338,7 @@ void SwWrtShell::Insert( const OUString &rPath, const OUString &rFilter, // if no object is transferred, then one will be created. void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName *pName, - bool bActivate, sal_uInt16 nSlotId ) + sal_uInt16 nSlotId ) { ResetCursorStack(); if( !CanInsert() ) @@ -401,7 +400,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName if ( xObj.is() ) { - if( InsertOleObject( xObj ) && bActivate && bDoVerb ) + if( InsertOleObject( xObj ) && bDoVerb ) { SfxInPlaceClient* pClient = GetView().FindIPClient( xObj.GetObject(), &GetView().GetEditWin() ); if ( !pClient ) @@ -947,7 +946,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit // - of deleting selected content; // - of reset of the Cursorstack if necessary. -void SwWrtShell::SplitNode( bool bAutoFormat, bool bCheckTableStart ) +void SwWrtShell::SplitNode( bool bAutoFormat ) { ResetCursorStack(); if( CanInsert() ) @@ -962,7 +961,7 @@ void SwWrtShell::SplitNode( bool bAutoFormat, bool bCheckTableStart ) DelRight(); } - SwFEShell::SplitNode( bAutoFormat, bCheckTableStart ); + SwFEShell::SplitNode( bAutoFormat ); if( bHasSel ) EndUndo( UNDO_INSERT ); } diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index 0c50310dae6a..700c30284071 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -52,7 +52,6 @@ #include <section.hxx> #include <navicont.hxx> #include <navipi.hxx> -#include <crsskip.hxx> #include <txtinet.hxx> #include <cmdid.h> #include <wrtsh.hrc> diff --git a/sw/source/uibase/wrtsh/wrtsh4.cxx b/sw/source/uibase/wrtsh/wrtsh4.cxx index 49e7353f6aa3..60db3754d6a2 100644 --- a/sw/source/uibase/wrtsh/wrtsh4.cxx +++ b/sw/source/uibase/wrtsh/wrtsh4.cxx @@ -18,7 +18,6 @@ */ #include <wrtsh.hxx> -#include <crsskip.hxx> // Private methods, which move the cursor over search. // The removal of the selection must be made on the level above. |