diff options
| author | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:03:10 -0500 |
|---|---|---|
| committer | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:07:38 -0500 |
| commit | 49c2b9808df8a6b197dec666dfc0cda6321a4306 (patch) | |
| tree | 045ef4b9b8dfdb06bfbe18cdf773d59f57d5552d /sw/inc | |
| parent | 5470a365f25e5052b4dd74f76aa2196f0d70934b (diff) | |
bin/rename-sw-abbreviations.sh
libreoffice-5-1-branch-point
This commit renames the most annoying abbreviations in Writer (and
partially in the shared code too).
Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8
Diffstat (limited to 'sw/inc')
72 files changed, 770 insertions, 770 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 74da45127883..c1d3e30654f4 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -34,9 +34,9 @@ namespace vcl class PDFExtOutDevData; } class OutputDevice; -class SwFrm; +class SwFrame; class SwLinePortion; -class SwPageFrm; +class SwPageFrame; class SwPrintData; class SwTextPainter; class SwEditShell; @@ -55,11 +55,11 @@ class SvxLanguageItem; * * Grouping elements: * - * SwRootFrm Document + * SwRootFrame Document * Part * Art * SwSection Sect - * SwFootnoteContFrm and SwFlyFrm Div + * SwFootnoteContFrame and SwFlyFrame Div * SwFormat "Quotations" BlockQuote * SwFormat "Caption" Caption * SwSection (TOC) TOC @@ -73,16 +73,16 @@ class SvxLanguageItem; * SwTextNode with Outline H1 - H6 * SwTextNode with NumRule L, LI, LBody * SwTable Table - * SwRowFrm TR - * SwCellFrm in Headline row or + * SwRowFrame TR + * SwCellFrame in Headline row or * SwFtm "Table Heading" TH - * SwCellFrm TD + * SwCellFrame TD * * Inline-Level Structure Elements: * * SwTextPortion Span * SwFormat "Quotation" Quote - * SwFootnoteFrm Note + * SwFootnoteFrame Note * Form * Reference * SwFieldPortion (AuthorityField) BibEntry @@ -91,21 +91,21 @@ class SvxLanguageItem; * * Illustration elements: * - * SwFlyFrm with SwNoTextFrm Figure - * SwFlyFrm with Math OLE Object Formula + * SwFlyFrame with SwNoTextFrame Figure + * SwFlyFrame with Math OLE Object Formula * */ struct Num_Info { - const SwFrm& mrFrm; - Num_Info( const SwFrm& rFrm ) : mrFrm( rFrm ) {}; + const SwFrame& mrFrame; + Num_Info( const SwFrame& rFrame ) : mrFrame( rFrame ) {}; }; -struct Frm_Info +struct Frame_Info { - const SwFrm& mrFrm; - Frm_Info( const SwFrm& rFrm ) : mrFrm( rFrm ) {}; + const SwFrame& mrFrame; + Frame_Info( const SwFrame& rFrame ) : mrFrame( rFrame ) {}; }; struct Por_Info @@ -141,7 +141,7 @@ class SwTaggedPDFHelper vcl::PDFExtOutDevData* mpPDFExtOutDevData; const Num_Info* mpNumInfo; - const Frm_Info* mpFrmInfo; + const Frame_Info* mpFrameInfo; const Por_Info* mpPorInfo; void BeginTag( vcl::PDFWriter::StructElement aTagRole, const OUString& rTagName ); @@ -160,10 +160,10 @@ class SwTaggedPDFHelper public: - // pFrmInfo != 0 => BeginBlockStructureElement + // pFrameInfo != 0 => BeginBlockStructureElement // pPorInfo != 0 => BeginInlineStructureElement - // pFrmInfo, pPorInfo = 0 => BeginNonStructureElement - SwTaggedPDFHelper( const Num_Info* pNumInfo, const Frm_Info* pFrmInfo, const Por_Info* pPorInfo, + // pFrameInfo, pPorInfo = 0 => BeginNonStructureElement + SwTaggedPDFHelper( const Num_Info* pNumInfo, const Frame_Info* pFrameInfo, const Por_Info* pPorInfo, OutputDevice& rOut ); ~SwTaggedPDFHelper(); @@ -187,7 +187,7 @@ typedef std::vector< IdMapEntry > LinkIdMap; typedef std::map< const SwTable*, TableColumnsMapEntry > TableColumnsMap; typedef std::map< const SwNumberTreeNode*, sal_Int32 > NumListIdMap; typedef std::map< const SwNumberTreeNode*, sal_Int32 > NumListBodyIdMap; -typedef std::map< const void*, sal_Int32 > FrmTagIdMap; +typedef std::map< const void*, sal_Int32 > FrameTagIdMap; class SwEnhancedPDFExportHelper { @@ -215,7 +215,7 @@ class SwEnhancedPDFExportHelper static LinkIdMap aLinkIdMap; static NumListIdMap aNumListIdMap; static NumListBodyIdMap aNumListBodyIdMap; - static FrmTagIdMap aFrmTagIdMap; + static FrameTagIdMap aFrameTagIdMap; static LanguageType eLanguageDefault; @@ -242,12 +242,12 @@ class SwEnhancedPDFExportHelper static LinkIdMap& GetLinkIdMap() { return aLinkIdMap; } static NumListIdMap& GetNumListIdMap() {return aNumListIdMap; } static NumListBodyIdMap& GetNumListBodyIdMap() {return aNumListBodyIdMap; } - static FrmTagIdMap& GetFrmTagIdMap() { return aFrmTagIdMap; } + static FrameTagIdMap& GetFrameTagIdMap() { return aFrameTagIdMap; } static LanguageType GetDefaultLanguage() {return eLanguageDefault; } //scale and position rRectangle if we're scaling due to notes in margins. - Rectangle SwRectToPDFRect(const SwPageFrm* pCurrPage, + Rectangle SwRectToPDFRect(const SwPageFrame* pCurrPage, const Rectangle& rRectangle) const; }; diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx index cba6d26e545d..8261c86c16d6 100644 --- a/sw/inc/HandleAnchorNodeChg.hxx +++ b/sw/inc/HandleAnchorNodeChg.hxx @@ -21,7 +21,7 @@ class SwFlyFrameFormat; class SwFormatAnchor; -class SwFlyFrm; +class SwFlyFrame; // helper class to track change of anchor node of at-paragraph respectively // at-character anchored fly frames @@ -43,15 +43,15 @@ public: @param _rNewAnchorFormat new anchor attribute, which will be applied at the given fly frame format - @param _pKeepThisFlyFrm + @param _pKeepThisFlyFrame optional parameter - pointer to a fly frame of the given fly frame format, which isn't deleted, if re-creation of fly frames is necessary. */ SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat, const SwFormatAnchor& _rNewAnchorFormat, - SwFlyFrm* _pKeepThisFlyFrm = nullptr ); + SwFlyFrame* _pKeepThisFlyFrame = nullptr ); - /** calls <SwFlyFrameFormat::MakeFrms>, if re-creation of fly frames is necessary. + /** calls <SwFlyFrameFormat::MakeFrames>, if re-creation of fly frames is necessary. @author OD */ diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx index ab02daa108df..23f465f36f5f 100644 --- a/sw/inc/IDocumentLayoutAccess.hxx +++ b/sw/inc/IDocumentLayoutAccess.hxx @@ -23,7 +23,7 @@ #include <swtypes.hxx> class SwViewShell; -class SwRootFrm; +class SwRootFrame; class SwFrameFormat; class SfxItemSet; class SwLayouter; @@ -39,8 +39,8 @@ public: */ virtual const SwViewShell* GetCurrentViewShell() const = 0; virtual SwViewShell* GetCurrentViewShell() = 0; - virtual const SwRootFrm* GetCurrentLayout() const = 0; - virtual SwRootFrm* GetCurrentLayout() = 0; + virtual const SwRootFrame* GetCurrentLayout() const = 0; + virtual SwRootFrame* GetCurrentLayout() = 0; virtual bool HasLayout() const = 0; /** !!!The old layout must be deleted!!! @@ -64,7 +64,7 @@ public: /** */ virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor, - bool bSetTextFlyAtt, bool bMakeFrms ) = 0; + bool bSetTextFlyAtt, bool bMakeFrames ) = 0; protected: diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 3c8324e3dd4d..b41bdb36159f 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -57,10 +57,10 @@ namespace sw { namespace annotation { }} namespace sw { namespace sidebarwindows { class SwSidebarWin; - class SwFrmSidebarWinContainer; + class SwFrameSidebarWinContainer; }} class SwSidebarItem; -class SwFrm; +class SwFrame; namespace vcl { class Window; } struct ImplSVEvent; @@ -158,8 +158,8 @@ class SwPostItMgr: public SfxListener OutlinerParaObject* mpAnswer; bool mbIsShowAnchor; - // data structure to collect the <SwSidebarWin> instances for certain <SwFrm> instances. - sw::sidebarwindows::SwFrmSidebarWinContainer* mpFrmSidebarWinContainer; + // data structure to collect the <SwSidebarWin> instances for certain <SwFrame> instances. + sw::sidebarwindows::SwFrameSidebarWinContainer* mpFrameSidebarWinContainer; typedef std::list<sw::sidebarwindows::SwSidebarWin*>::iterator SwSidebarWin_iterator; @@ -277,15 +277,15 @@ class SwPostItMgr: public SfxListener void AssureStdModeAtShell(); - void ConnectSidebarWinToFrm( const SwFrm& rFrm, + void ConnectSidebarWinToFrame( const SwFrame& rFrame, const SwFormatField& rFormatField, sw::sidebarwindows::SwSidebarWin& rSidebarWin ); - void DisconnectSidebarWinFromFrm( const SwFrm& rFrm, + void DisconnectSidebarWinFromFrame( const SwFrame& rFrame, sw::sidebarwindows::SwSidebarWin& rSidebarWin ); - bool HasFrmConnectedSidebarWins( const SwFrm& rFrm ); - vcl::Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm, + bool HasFrameConnectedSidebarWins( const SwFrame& rFrame ); + vcl::Window* GetSidebarWinForFrameByIndex( const SwFrame& rFrame, const sal_Int32 nIndex ); - void GetAllSidebarWinForFrm( const SwFrm& rFrm, + void GetAllSidebarWinForFrame( const SwFrame& rFrame, std::vector< vcl::Window* >* pChildren ); void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage); diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 4d88b4623a1c..c6738fac6132 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -41,7 +41,7 @@ class SwEditWin; class SwView; class Edit; class MenuButton; -class SwFrm; +class SwFrame; namespace sw { namespace overlay { class OverlayRanges; @@ -247,7 +247,7 @@ class SwSidebarWin : public vcl::Window bool mbIsFollow; SwSidebarItem& mrSidebarItem; - const SwFrm* mpAnchorFrm; + const SwFrame* mpAnchorFrame; }; } } // eof namespace sw::sidebarwindows diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx index 8f015b0d3a0f..60a2056e9428 100644 --- a/sw/inc/ToxTabStopTokenHandler.hxx +++ b/sw/inc/ToxTabStopTokenHandler.hxx @@ -18,7 +18,7 @@ struct SwFormToken; class SwPageDesc; -class SwRootFrm; +class SwRootFrame; class SwTextNode; namespace sw { @@ -46,7 +46,7 @@ public: */ virtual HandledTabStopToken HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode, - const SwRootFrm *currentLayout) const = 0; + const SwRootFrame *currentLayout) const = 0; }; /** The default implementation of ToxTabStopTokenHandler */ @@ -84,7 +84,7 @@ public: */ ToxTabStopTokenHandler::HandledTabStopToken HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode, - const SwRootFrm *currentLayout) const override; + const SwRootFrame *currentLayout) const override; private: /** Test whether the page layout can be obtained by a layout rectangle. @@ -92,7 +92,7 @@ private: * Is used to determine how to find tab stop position. */ static bool - CanUseLayoutRectangle(const SwTextNode& targetNode, const SwRootFrm *currentLayout); + CanUseLayoutRectangle(const SwTextNode& targetNode, const SwRootFrame *currentLayout); /** Calculate the page margin from the page description. * diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx index 94f142c83ff3..bbd4872541be 100644 --- a/sw/inc/ToxTextGenerator.hxx +++ b/sw/inc/ToxTextGenerator.hxx @@ -32,13 +32,13 @@ class SwAttrPool; class SwFormatAutoFormat; class SwChapterField; class SwChapterFieldType; -class SwContentFrm; +class SwContentFrame; class SwContentNode; class SwDoc; class SwForm; struct SwFormToken; class SwPageDesc; -class SwRootFrm; +class SwRootFrame; class SwTextAttr; class SwTextNode; struct SwTOXSortTabBase; @@ -138,7 +138,7 @@ private: /** Generate the text for a chapter token. */ OUString - GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrm* contentFrame, + GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrame* contentFrame, const SwContentNode *contentNode) const; /** Obtain a ChapterField to use for the text generation. @@ -147,7 +147,7 @@ private: */ virtual SwChapterField ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken, - const SwContentFrm* contentFrame, const SwContentNode *contentNode) const; + const SwContentFrame* contentFrame, const SwContentNode *contentNode) const; friend class ::ToxTextGeneratorTest; }; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index a47051303379..eaf01f294e27 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -37,9 +37,9 @@ class SwAccessibleParagraph; class SwViewShell; class Rectangle; -class SwFrm; -class SwTextFrm; -class SwPageFrm; +class SwFrame; +class SwTextFrame; +class SwPageFrame; class SwAccessibleContext; class SwAccessibleContextMap_Impl; class SwAccessibleEventList_Impl; @@ -79,7 +79,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, { mutable ::osl::Mutex maMutex; ::osl::Mutex maEventMutex; - SwAccessibleContextMap_Impl *mpFrmMap; + SwAccessibleContextMap_Impl *mpFrameMap; SwAccessibleShapeMap_Impl *mpShapeMap; SwShapeList_Impl *mpShapes; SwAccessibleEventList_Impl *mpEvents; @@ -107,12 +107,12 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, void InvalidateShapeSelection(); - //mpSelectedFrmMap contains the old selected objects. - SwAccessibleContextMap_Impl *mpSeletedFrmMap; + //mpSelectedFrameMap contains the old selected objects. + SwAccessibleContextMap_Impl *mpSeletedFrameMap; //IvalidateShapeInParaSelection() method is responsible for the updating the selected states of the objects. void InvalidateShapeInParaSelection(); - void _InvalidateRelationSet( const SwFrm* pFrm, bool bFrom ); + void _InvalidateRelationSet( const SwFrame* pFrame, bool bFrom ); css::uno::Reference<css::accessibility::XAccessible> _GetDocumentView( bool bPagePreview ); @@ -136,14 +136,14 @@ public: css::uno::Reference<css::accessibility::XAccessible> GetDocumentPreview( const std::vector<PreviewPage*>& _rPreviewPages, const Fraction& _rScale, - const SwPageFrm* _pSelectedPageFrm, + const SwPageFrame* _pSelectedPageFrame, const Size& _rPreviewWinSize ); ::rtl::Reference < SwAccessibleContext > GetContextImpl( - const SwFrm *pFrm, + const SwFrame *pFrame, bool bCreate = true ); css::uno::Reference<css::accessibility::XAccessible> GetContext( - const SwFrm *pFrm, + const SwFrame *pFrame, bool bCreate = true ); ::rtl::Reference < ::accessibility::AccessibleShape > GetContextImpl( @@ -180,25 +180,25 @@ public: */ Size GetPreviewPageSize( sal_uInt16 _nPreviewPageNum ) const; - void RemoveContext( const SwFrm *pFrm ); + void RemoveContext( const SwFrame *pFrame ); void RemoveContext( const SdrObject *pObj ); // Dispose frame and its children if bRecursive is set - void Dispose( const SwFrm* pFrm, + void Dispose( const SwFrame* pFrame, const SdrObject* pObj, vcl::Window* pWindow, bool bRecursive = false ); - void InvalidatePosOrSize( const SwFrm* pFrm, + void InvalidatePosOrSize( const SwFrame* pFrame, const SdrObject* pObj, vcl::Window* pWindow, - const SwRect& rOldFrm ); + const SwRect& rOldFrame ); - void InvalidateContent( const SwFrm *pFrm ); + void InvalidateContent( const SwFrame *pFrame ); - void InvalidateAttr( const SwTextFrm& rTextFrm ); + void InvalidateAttr( const SwTextFrame& rTextFrame ); - void InvalidateCursorPosition( const SwFrm *pFrm ); + void InvalidateCursorPosition( const SwFrame *pFrame ); void InvalidateFocus(); void SetCursorContext( const ::rtl::Reference < SwAccessibleContext >& rCursorContext ); @@ -206,15 +206,15 @@ public: // Invalidate state of whole tree. If an action is open, this call // is processed when the last action ends. void InvalidateStates( AccessibleStates _nStates, - const SwFrm* _pFrm = nullptr ); + const SwFrame* _pFrame = nullptr ); - void InvalidateRelationSet( const SwFrm* pMaster, const SwFrm* pFollow ); + void InvalidateRelationSet( const SwFrame* pMaster, const SwFrame* pFollow ); /** invalidation CONTENT_FLOWS_FROM/_TO relation of a paragraph @author OD - @param _rTextFrm + @param _rTextFrame input parameter - reference to paragraph, whose CONTENT_FLOWS_FROM/_TO has to be invalidated. @@ -222,14 +222,14 @@ public: input parameter - boolean indicating, if relation CONTENT_FLOWS_FROM (value <true>) or CONTENT_FLOWS_TO (value <false>) has to be invalidated. */ - void InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm, + void InvalidateParaFlowRelation( const SwTextFrame& _rTextFrame, const bool _bFrom ); /** invalidation of text selection of a paragraph @author OD */ - void InvalidateParaTextSelection( const SwTextFrm& _rTextFrm ); + void InvalidateParaTextSelection( const SwTextFrame& _rTextFrame ); /** invalidation of text selection of all paragraphs @@ -237,17 +237,17 @@ public: */ void InvalidateTextSelectionOfAllParas(); - sal_Int32 GetChildIndex( const SwFrm& rParentFrm, + sal_Int32 GetChildIndex( const SwFrame& rParentFrame, vcl::Window& rChild ) const; // update preview data (and fire events if necessary) void UpdatePreview( const std::vector<PreviewPage*>& _rPreviewPages, const Fraction& _rScale, - const SwPageFrm* _pSelectedPageFrm, + const SwPageFrame* _pSelectedPageFrame, const Size& _rPreviewWinSize ); void InvalidatePreviewSelection( sal_uInt16 nSelPage ); - bool IsPageSelected( const SwPageFrm *pPageFrm ) const; + bool IsPageSelected( const SwPageFrame *pPageFrame ) const; void FireEvents(); diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 3d25df8ba2fc..7b097a2fb606 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -103,7 +103,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject @author OD */ - void _InvalidatePage( SwPageFrm* _pPageFrm ); + void _InvalidatePage( SwPageFrame* _pPageFrame ); protected: virtual void ObjectAttachedToAnchorFrame() override; @@ -154,21 +154,21 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject @author OD - @param <_pNewAnchorFrm> + @param <_pNewAnchorFrame> input parameter - new anchor frame for the anchored object. @param <_pNewObjRect> optional input parameter - proposed new object rectangle. If not provided the current object rectangle is taken. */ - void AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm, + void AdjustPositioningAttr( const SwFrame* _pNewAnchorFrame, const SwRect* _pNewObjRect = nullptr ); /** method to notify background of drawing object @author OD */ - virtual void NotifyBackground( SwPageFrm* _pPageFrm, + virtual void NotifyBackground( SwPageFrame* _pPageFrame, const SwRect& _rRect, PrepareHint _eHint ) override; diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 803a3986ec1e..8b72e4c77fe1 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -24,11 +24,11 @@ #include <libxml/xmlwriter.h> class SdrObject; -class SwFrm; -class SwLayoutFrm; -class SwTextFrm; +class SwFrame; +class SwLayoutFrame; +class SwTextFrame; -class SwPageFrm; +class SwPageFrame; class SwObjPositioningInProgress; class SwFrameFormat; @@ -37,8 +37,8 @@ class SwFormatAnchor; /** wrapper class for the positioning of Writer fly frames and drawing objects Purpose of this class is to provide a unified interface for the positioning - of Writer fly frames (derived classes of <SwFlyFrm>) and of drawing objects - (derived classes of <SwDrawFrm>). + of Writer fly frames (derived classes of <SwFlyFrame>) and of drawing objects + (derived classes of <SwDrawFrame>). @author OD */ @@ -48,10 +48,10 @@ class SW_DLLPUBLIC SwAnchoredObject // drawing object representing the anchored object in the drawing layer SdrObject* mpDrawObj; // frame the object is anchored at - SwFrm* mpAnchorFrm; + SwFrame* mpAnchorFrame; // #i28701 - page frame the object is registered at // note: no page frame for as-character anchored objects - SwPageFrm* mpPageFrm; + SwPageFrame* mpPageFrame; // current relative position (relative to anchor position of anchor frame) Point maRelPos; @@ -71,7 +71,7 @@ class SW_DLLPUBLIC SwAnchoredObject // Layout frame vertical position is orient at - typically its the upper // of the anchor frame, but it could also by the upper of a follow or // a following layout frame in the text flow. - const SwLayoutFrm* mpVertPosOrientFrm; + const SwLayoutFrame* mpVertPosOrientFrame; // i#i28701 boolean, indicating that the object // positioning algorithm is in progress. @@ -103,7 +103,7 @@ class SW_DLLPUBLIC SwAnchoredObject // considered during its positioning. // This boolean is used, if compatibility option 'Consider wrapping style // influence on object positioning' is OFF and a positioning loop is - // detected in method <SwFlyAtCntFrm::MakeAll()> or method + // detected in method <SwFlyAtContentFrame::MakeAll()> or method // <SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()>. // The boolean is reset to <false>, when the layout process for a // page frame starts. @@ -131,19 +131,19 @@ class SW_DLLPUBLIC SwAnchoredObject For to-character anchored Writer fly frames the member <maLastCharRect> is updated. This is checked for change and depending on the applied positioning, it's decided, if the Writer fly frame has to be invalidated. - improvement - add second parameter <_rAnchorCharFrm> + improvement - add second parameter <_rAnchorCharFrame> @author OD @param _rAnch input parameter - reference to anchor position - @param _rAnchorCharFrm + @param _rAnchorCharFrame input parameter - reference to the text frame containing the anchor character. */ void _CheckCharRect( const SwFormatAnchor& _rAnch, - const SwTextFrm& _rAnchorCharFrm ); + const SwTextFrame& _rAnchorCharFrame ); /** check top of line @@ -157,23 +157,23 @@ class SW_DLLPUBLIC SwAnchoredObject @param _rAnch input parameter - reference to anchor position - @param _rAnchorCharFrm + @param _rAnchorCharFrame input parameter - reference to the text frame containing the anchor character. */ void _CheckTopOfLine( const SwFormatAnchor& _rAnch, - const SwTextFrm& _rAnchorCharFrm ); + const SwTextFrame& _rAnchorCharFrame ); // method <sw_HideObj(..)> sets needed data structure values for the // object positioning - friend bool sw_HideObj( const SwTextFrm& _rFrm, + friend bool sw_HideObj( const SwTextFrame& _rFrame, const RndStdIds _eAnchorType, const sal_Int32 _nObjAnchorPos, SwAnchoredObject* _pAnchoredObj ); protected: SwAnchoredObject(); - void SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFrm ); + void SetVertPosOrientFrame( const SwLayoutFrame& _rVertPosOrientFrame ); /** method to assure that anchored object is registered at the correct page frame @@ -215,24 +215,24 @@ class SW_DLLPUBLIC SwAnchoredObject const SdrObject* GetDrawObj() const { return mpDrawObj; } SdrObject* DrawObj() { return mpDrawObj; } - // accessors to member <mpAnchorFrm> - const SwFrm* GetAnchorFrm() const { return mpAnchorFrm; } - SwFrm* AnchorFrm() { return mpAnchorFrm; } - void ChgAnchorFrm( SwFrm* _pNewAnchorFrm ); + // accessors to member <mpAnchorFrame> + const SwFrame* GetAnchorFrame() const { return mpAnchorFrame; } + SwFrame* AnchorFrame() { return mpAnchorFrame; } + void ChgAnchorFrame( SwFrame* _pNewAnchorFrame ); /** determine anchor frame containing the anchor position - the anchor frame, which is determined, is <mpAnchorFrm> + the anchor frame, which is determined, is <mpAnchorFrame> for an at-page, at-frame or at-paragraph anchored object and the anchor character frame for an at-character and as-character anchored object. @author OD */ - SwFrm* GetAnchorFrmContainingAnchPos(); + SwFrame* GetAnchorFrameContainingAnchPos(); - SwPageFrm* GetPageFrm() { return mpPageFrm; } - const SwPageFrm* GetPageFrm() const { return mpPageFrm; } - void SetPageFrm( SwPageFrm* _pNewPageFrm ); + SwPageFrame* GetPageFrame() { return mpPageFrame; } + const SwPageFrame* GetPageFrame() const { return mpPageFrame; } + void SetPageFrame( SwPageFrame* _pNewPageFrame ); /** method to determine the page frame, on which the 'anchor' of the given anchored object is. @@ -248,30 +248,30 @@ class SW_DLLPUBLIC SwAnchoredObject input parameter - anchored object, for which the page frame of its 'anchor' has to be determined. - @return SwPageFrm& + @return SwPageFrame& page frame, the 'anchor' of the given anchored object is on */ - SwPageFrm* FindPageFrmOfAnchor(); + SwPageFrame* FindPageFrameOfAnchor(); /** get frame, which contains the anchor character, if the object is anchored at-character or as-character. @author OD - @return SwTextFrm* + @return SwTextFrame* text frame containing the anchor character. It's NULL, if the object isn't anchored at-character resp. as-character. */ - SwTextFrm* FindAnchorCharFrm(); + SwTextFrame* FindAnchorCharFrame(); // accessors to data of position calculation: // frame vertical position is orient at - const SwLayoutFrm* GetVertPosOrientFrm() const + const SwLayoutFrame* GetVertPosOrientFrame() const { - return mpVertPosOrientFrm; + return mpVertPosOrientFrame; } - // method to clear member <mpVertPosOrientFrm> - void ClearVertPosOrientFrm(); + // method to clear member <mpVertPosOrientFrame> + void ClearVertPosOrientFrame(); /** check anchor character rectangle and top of line @@ -290,8 +290,8 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to member <maLastCharRect> const SwRect& GetLastCharRect() const { return maLastCharRect;} - SwTwips GetRelCharX( const SwFrm* pFrm ) const; - SwTwips GetRelCharY( const SwFrm* pFrm ) const; + SwTwips GetRelCharX( const SwFrame* pFrame ) const; + SwTwips GetRelCharY( const SwFrame* pFrame ) const; void AddLastCharY( long nDiff ); void ResetLastCharRectHeight(); @@ -345,7 +345,7 @@ class SW_DLLPUBLIC SwAnchoredObject @author OD */ - virtual void NotifyBackground( SwPageFrm* _pPageFrm, + virtual void NotifyBackground( SwPageFrame* _pPageFrame, const SwRect& _rRect, PrepareHint _eHint ) = 0; @@ -489,7 +489,7 @@ class SW_DLLPUBLIC SwAnchoredObject @return Point - determined relative position */ - Point GetRelPosToAnchorFrm() const; + Point GetRelPosToAnchorFrame() const; /** method to determine position of anchored object relative to page frame @@ -512,7 +512,7 @@ class SW_DLLPUBLIC SwAnchoredObject @return Point - determined relative position */ - Point GetRelPosToPageFrm( const bool _bFollowTextFlow, + Point GetRelPosToPageFrame( const bool _bFollowTextFlow, bool& _obRelToTableCell ) const; /** method to determine position of anchored object relative to diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 491920e1fb13..def19644ee12 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -154,7 +154,7 @@ class SwCalc SwHash* VarTable[ TBLSZ ]; OUString aVarName, sCurrSym; OUString sCommand; - std::vector<const SwUserFieldType*> aRekurStk; + std::vector<const SwUserFieldType*> aRekurStack; SwSbxValue nLastLeft; SwSbxValue nNumberValue; SwCalcExp aErrExpr; diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index a470914ddb8f..e681a25fead8 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -37,7 +37,7 @@ class SwTableCalcPara sal_uInt16 nStackCnt, nMaxSize; public: - SwTableSortBoxes *pBoxStk; ///< stack for recognizing recursion + SwTableSortBoxes *pBoxStack; ///< stack for recognizing recursion SwCalc& rCalc; ///< current Calculator const SwTable* pTable; ///< current table diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index 59b6c84f989f..9889ecbc49eb 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -21,7 +21,7 @@ #include "fldbas.hxx" -class SwFrm; +class SwFrame; class SwContentNode; class SwTextNode; class ToxTextGeneratorTest; @@ -63,7 +63,7 @@ public: SwChapterField(SwChapterFieldType*, sal_uInt32 nFormat = 0); // #i53420# - void ChangeExpansion( const SwFrm*, + void ChangeExpansion( const SwFrame*, const SwContentNode*, bool bSrchNum = false); void ChangeExpansion(const SwTextNode &rNd, bool bSrchNum); diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 6e7cd830d38d..cd0ce77edbf0 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -600,7 +600,7 @@ #define FN_NAVIGATION_BACK (FN_EXTRA2 + 115) #define FN_NAVIGATION_FORWARD (FN_EXTRA2 + 116) -// #i972: bool items to be passed to SwFrmPage for evaluation +// #i972: bool items to be passed to SwFramePage for evaluation #define FN_OLE_IS_MATH (FN_EXTRA2 + 114) #define FN_MATH_BASELINE_ALIGNMENT (FN_EXTRA2 + 115) diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 124e5de8a4f2..d53a61064cc0 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -40,8 +40,8 @@ class SfxItemSet; class SfxPoolItem; -class SwContentFrm; -class SwCrsrShell; +class SwContentFrame; +class SwCursorShell; class SwCursor; class SwField; class SwFieldType; @@ -49,11 +49,11 @@ class SwFormat; class SwFormatField; class SwNodeIndex; class SwPaM; -class SwShellCrsr; -class SwShellTableCrsr; +class SwShellCursor; +class SwShellTableCursor; class SwTableNode; class SwTextFormatColl; -class SwVisCrsr; +class SwVisibleCursor; class SwTextINetFormat; class SwFormatINetFormat; class SwTextAttr; @@ -129,29 +129,29 @@ struct SwContentAtPos bool IsInRTLText()const; }; -// return values of SetCrsr (can be combined via ||) +// return values of SetCursor (can be combined via ||) const int CRSR_POSOLD = 0x01, // cursor stays at old position CRSR_POSCHG = 0x02; // position changed by the layout /// Helperfunction to resolve backward references in regular expressions OUString *ReplaceBackReferences( const css::util::SearchOptions& rSearchOpt, SwPaM* pPam ); -class SW_DLLPUBLIC SwCrsrShell +class SW_DLLPUBLIC SwCursorShell : public SwViewShell , public SwModify , public ::sw::IShellCursorSupplier { friend class SwCallLink; - friend class SwVisCrsr; + friend class SwVisibleCursor; friend class SwSelPaintRects; - // requires the Crsr as InternalCrsr - friend bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); + // requires the Cursor as InternalCursor + friend bool GetAutoSumSel( const SwCursorShell&, SwCellFrames& ); public: - /** for calling UpdateCrsr */ - enum CrsrFlag { + /** for calling UpdateCursor */ + enum CursorFlag { UPDOWN = (1 << 0), ///< keep Up/Down on columns SCROLLWIN = (1 << 1), ///< scroll window CHKRANGE = (1 << 2), ///< check overlapping PaMs @@ -161,23 +161,23 @@ public: private: SwRect m_aCharRect; ///< Char-SRectangle on which the cursor is located - Point m_aCrsrHeight; ///< height & offset from visible Cursor + Point m_aCursorHeight; ///< height & offset from visible Cursor Point m_aOldRBPos; ///< Right/Bottom of last VisArea // (used in Invalidate by Cursor) - Link<const SwFlyFrameFormat*,void> m_aFlyMacroLnk; /**< Link will be called, if the Crsr is set + Link<const SwFlyFrameFormat*,void> m_aFlyMacroLnk; /**< Link will be called, if the Cursor is set into a fly. A macro can then be called */ - Link<SwCrsrShell*,void> m_aChgLnk; /**< link will be called by every attribute/ + Link<SwCursorShell*,void> m_aChgLnk; /**< link will be called by every attribute/ format changes at cursor position.*/ - Link<SwCrsrShell&,void> m_aGrfArrivedLnk; ///< Link calls to UI if a graphic is arrived + Link<SwCursorShell&,void> m_aGrfArrivedLnk; ///< Link calls to UI if a graphic is arrived - SwShellCrsr* m_pCurCrsr; ///< current cursor - SwShellCrsr* m_pCrsrStk; ///< stack for the cursor - SwVisCrsr *m_pVisCrsr; ///< the visible cursor + SwShellCursor* m_pCurrentCursor; ///< current cursor + SwShellCursor* m_pCursorStack; ///< stack for the cursor + SwVisibleCursor *m_pVisibleCursor; ///< the visible cursor - SwBlockCursor *m_pBlockCrsr; ///< interface of cursor for block (=rectangular) selection + SwBlockCursor *m_pBlockCursor; ///< interface of cursor for block (=rectangular) selection - SwShellTableCrsr* m_pTableCrsr; /**< table Crsr; only in tables when the + SwShellTableCursor* m_pTableCursor; /**< table Cursor; only in tables when the selection lays over 2 columns */ SwNodeIndex* m_pBoxIdx; ///< for recognizing of the changed @@ -185,27 +185,27 @@ private: long m_nUpDownX; /**< try to move the cursor on up/down always in the same column */ - long m_nLeftFrmPos; + long m_nLeftFramePos; sal_uLong m_nAktNode; // save CursorPos at Start-Action sal_Int32 m_nAktContent; sal_uInt16 m_nAktNdTyp; bool m_bAktSelection; /* - * Via the Method SttCrsrMove and EndCrsrMove this counter gets + * Via the Method SttCursorMove and EndCursorMove this counter gets * incremented/decremented. As long as the counter is inequal to 0, the * current Cursor gets no update. This way, "complicated" cursor movements * (via Find()) can be realised. */ - sal_uInt16 m_nCrsrMove; + sal_uInt16 m_nCursorMove; sal_uInt16 m_nBasicActionCnt; ///< Actions which are parenthesized by Basic - CrsrMoveState m_eMvState; ///< Status for Crsr-Travelling - GetCrsrOfst + CursorMoveState m_eMvState; ///< Status for Cursor-Travelling - GetCursorOfst OUString m_sMarkedListId; int m_nMarkedListLevel; bool m_bHasFocus : 1; ///< Shell is "active" in a window - bool m_bSVCrsrVis : 1; ///< SV-Cursor visible/invisible + bool m_bSVCursorVis : 1; ///< SV-Cursor visible/invisible bool m_bChgCallFlag : 1; ///< attribute change inside Start- and EndAction bool m_bVisPortChgd : 1; ///< in VisPortChg-Call // (used in Invalidate by the Cursor) @@ -215,28 +215,28 @@ private: // access only via SwChgLinkFlag bool m_bAllProtect : 1; ///< Flag for areas // true -> everything protected / hidden - bool m_bInCMvVisportChgd : 1; ///< Flag for CrsrMoves + bool m_bInCMvVisportChgd : 1; ///< Flag for CursorMoves // true -> view was moved bool m_bGCAttr : 1; // true -> non expanded attributes exist. bool m_bIgnoreReadonly : 1; // true -> make the cursor visible on next // EndAction in spite of Readonly bool m_bSelTableCells : 1; // true -> select cells over the InputWin bool m_bAutoUpdateCells : 1; // true -> autoformat cells - bool m_bBasicHideCrsr : 1; // true -> HideCrsr from Basic - bool m_bSetCrsrInReadOnly : 1;// true -> Cursor is allowed in ReadOnly-Areas - bool m_bOverwriteCrsr : 1; // true -> show Overwrite Crsr + bool m_bBasicHideCursor : 1; // true -> HideCursor from Basic + bool m_bSetCursorInReadOnly : 1;// true -> Cursor is allowed in ReadOnly-Areas + bool m_bOverwriteCursor : 1; // true -> show Overwrite Cursor bool m_bMacroExecAllowed : 1; - SwFrm* m_oldColFrm; + SwFrame* m_oldColFrame; - SAL_DLLPRIVATE void UpdateCrsr( - sal_uInt16 eFlags = SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE, + SAL_DLLPRIVATE void UpdateCursor( + sal_uInt16 eFlags = SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE, bool bIdleEnd = false ); - SAL_DLLPRIVATE void MoveCrsrToNum(); + SAL_DLLPRIVATE void MoveCursorToNum(); - SAL_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing ); + SAL_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing ); /** Mark a certain list level of a certain list @@ -258,10 +258,10 @@ private: SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = nullptr ) const; - SAL_DLLPRIVATE bool isInHiddenTextFrm(SwShellCrsr* pShellCrsr); + SAL_DLLPRIVATE bool isInHiddenTextFrame(SwShellCursor* pShellCursor); -typedef bool (SwCursor:: *FNCrsr)(); - SAL_DLLPRIVATE bool CallCrsrFN( FNCrsr ); +typedef bool (SwCursor:: *FNCursor)(); + SAL_DLLPRIVATE bool CallCursorFN( FNCursor ); SAL_DLLPRIVATE const SwRangeRedline* _GotoRedline( sal_uInt16 nArrPos, bool bSelect ); @@ -272,9 +272,9 @@ protected: /* * Compare-Methode for the StackCursor and the current Cursor. * The Methods return -1, 0, 1 for lower, equal, greater. The enum - * CrsrCompareType says which position is compared. + * CursorCompareType says which position is compared. */ - enum CrsrCompareType { + enum CursorCompareType { StackPtStackMk, StackPtCurrPt, StackPtCurrMk, @@ -282,7 +282,7 @@ protected: StackMkCurrMk, CurrPtCurrMk }; - int CompareCursor( CrsrCompareType eType ) const; + int CompareCursor( CursorCompareType eType ) const; bool _SelTableRowOrCol( bool bRow, bool bRowSimple = false ); @@ -298,24 +298,24 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: - SwCrsrShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr ); + SwCursorShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr ); // disguised copy constructor - SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pWin ); - virtual ~SwCrsrShell(); + SwCursorShell( SwCursorShell& rShell, vcl::Window *pWin ); + virtual ~SwCursorShell(); // create new cursor and append the old one virtual SwPaM & CreateNewShellCursor() override; virtual SwPaM & GetCurrentShellCursor() override; - SwPaM * CreateCrsr(); + SwPaM * CreateCursor(); ///< delete the current cursor and make the following into the current - bool DestroyCrsr(); + bool DestroyCursor(); ///< transform TableCursor to normal cursor, nullify Tablemode - void TableCrsrToCursor(); + void TableCursorToCursor(); ///< enter block mode, change normal cursor into block cursor - void CrsrToBlockCrsr(); + void CursorToBlockCursor(); ///< leave block mode, change block cursor into normal cursor - void BlockCrsrToCrsr(); + void BlockCursorToCursor(); // SelAll() selects the document body content // if ExtendedSelect() is called afterwards, the whole nodes array is selected @@ -326,21 +326,21 @@ public: /// If document body starts with a table. bool StartsWithTable(); - SwPaM* GetCrsr( bool bMakeTableCrsr = true ) const; - inline SwCursor* GetSwCrsr( bool bMakeTableCrsr = true ) const; + SwPaM* GetCursor( bool bMakeTableCursor = true ) const; + inline SwCursor* GetSwCursor( bool bMakeTableCursor = true ) const; // return only the current cursor - SwShellCrsr* _GetCrsr() { return m_pCurCrsr; } - const SwShellCrsr* _GetCrsr() const { return m_pCurCrsr; } + SwShellCursor* _GetCursor() { return m_pCurrentCursor; } + const SwShellCursor* _GetCursor() const { return m_pCurrentCursor; } // show passed cursor - for UNO - void SetSelection(const SwPaM& rCrsr); + void SetSelection(const SwPaM& rCursor); // remove all cursors from ContentNodes and set to 0 - void ParkCrsr( const SwNodeIndex &rIdx ); + void ParkCursor( const SwNodeIndex &rIdx ); // return the current cursor stack // (required in EditShell when deleting contents) - inline SwPaM* GetStkCrsr() const; + inline SwPaM* GetStackCursor() const; // start parenthesing, hide SV-Cursor and selected areas void StartAction(); @@ -389,7 +389,7 @@ public: // return values: // CRSR_POSCHG: when cursor was corrected from SPoint by the layout // CRSR_POSOLD: when the cursor was not changed - int SetCrsr( const Point &rPt, bool bOnlyText = false, bool bBlock = true ); + int SetCursor( const Point &rPt, bool bOnlyText = false, bool bBlock = true ); /* * Notification that the visible area was changed. m_aVisArea is reset, then @@ -427,21 +427,21 @@ public: // story a copy of the cursor in the stack void Push(); /* - * Delete a cursor (controlled by bOldCrsr) - * - from stack or (bOldCrsr = true) + * Delete a cursor (controlled by bOldCursor) + * - from stack or (bOldCursor = true) * - delete the current one and replace it with the cursor from the * stack * Return: whether there was one left one the stack */ - bool Pop( bool bOldCrsr = true ); + bool Pop( bool bOldCursor = true ); /* * Combine 2 Cursors. * Delete the topmost from the stack and move its Mark into the current. */ void Combine(); - void SttCrsrMove(); - void EndCrsrMove( const bool bIdleEnd = false ); + void SttCursorMove(); + void EndCursorMove( const bool bIdleEnd = false ); /* * When the focus is lost the selected ranges are not displayed anymore. @@ -453,28 +453,28 @@ public: void ShGetFcs( bool bUpdate = true ); // Methods for displaying or hiding the visible text cursor. - void ShowCrsr(); - void HideCrsr(); + void ShowCursor(); + void HideCursor(); // Methods for displaying or hiding the selected ranges with visible cursor. - void ShowCrsrs( bool bCrsrVis ); - void HideCrsrs(); + void ShowCursors( bool bCursorVis ); + void HideCursors(); - bool IsOverwriteCrsr() const { return m_bOverwriteCrsr; } - void SetOverwriteCrsr( bool bFlag ) { m_bOverwriteCrsr = bFlag; } + bool IsOverwriteCursor() const { return m_bOverwriteCursor; } + void SetOverwriteCursor( bool bFlag ) { m_bOverwriteCursor = bFlag; } // Return current frame in which the cursor is placed. - SwContentFrm *GetCurrFrm( const bool bCalcFrm = true ) const; + SwContentFrame *GetCurrFrame( const bool bCalcFrame = true ) const; //true if cursor is hidden because of readonly. //false if it is working despite readonly. - bool IsCrsrReadonly() const; + bool IsCursorReadonly() const; // Cursor is placed in something that is protected or selection contains // something that is protected. bool HasReadonlySel(bool bAnnotationMode = false) const; // Can the cursor be set to read only ranges? - bool IsReadOnlyAvailable() const { return m_bSetCrsrInReadOnly; } + bool IsReadOnlyAvailable() const { return m_bSetCursorInReadOnly; } void SetReadOnlyAvailable( bool bFlag ); bool IsOverReadOnlyPos( const Point& rPt ) const; @@ -483,12 +483,12 @@ public: const Link<const SwFlyFrameFormat*,void>& GetFlyMacroLnk() const { return m_aFlyMacroLnk; } // Methods returning/altering link for changes of attributes/formates. - void SetChgLnk( const Link<SwCrsrShell*,void> &rLnk ) { m_aChgLnk = rLnk; } - const Link<SwCrsrShell*,void>& GetChgLnk() const { return m_aChgLnk; } + void SetChgLnk( const Link<SwCursorShell*,void> &rLnk ) { m_aChgLnk = rLnk; } + const Link<SwCursorShell*,void>& GetChgLnk() const { return m_aChgLnk; } // Methods returning/altering ling for "graphic completely loaded". - void SetGrfArrivedLnk( const Link<SwCrsrShell&,void> &rLnk ) { m_aGrfArrivedLnk = rLnk; } - const Link<SwCrsrShell&,void>& GetGrfArrivedLnk() const { return m_aGrfArrivedLnk; } + void SetGrfArrivedLnk( const Link<SwCursorShell&,void> &rLnk ) { m_aGrfArrivedLnk = rLnk; } + const Link<SwCursorShell&,void>& GetGrfArrivedLnk() const { return m_aGrfArrivedLnk; } //Call ChgLink. When within an action calling will be delayed. void CallChgLnk(); @@ -520,7 +520,7 @@ public: /* * Returns if cursor is wholly or partly within visible range. */ - bool IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); } + bool IsCursorVisible() const { return VisArea().IsOver( GetCharRect() ); } /* * Returns SwRect, at which the character is located. */ @@ -530,7 +530,7 @@ public: // true: in which cursor is located. // false: which is visible at the upper margin. void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum, - bool bAtCrsrPos = true, const bool bCalcFrm = true ); + bool bAtCursorPos = true, const bool bCalcFrame = true ); // Determine how "empty pages" are handled // (used in PhyPage). sal_uInt16 GetNextPrevPageNum( bool bNext = true ); @@ -540,17 +540,17 @@ public: sal_uInt16 GetPageCnt(); - bool GoNextCrsr(); + bool GoNextCursor(); - bool GoPrevCrsr(); + bool GoPrevCursor(); - // at CurCrsr.SPoint + // at CurrentCursor.SPoint ::sw::mark::IMark* SetBookmark( const vcl::KeyCode&, const OUString& rName, const OUString& rShortName, IDocumentMarkAccess::MarkType eMark = IDocumentMarkAccess::MarkType::BOOKMARK); - bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurCrsr.SPoint + bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurrentCursor.SPoint bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart ); bool GoNextBookmark(); // true, if there was one bool GoPrevBookmark(); @@ -563,7 +563,7 @@ public: // update Cursr, i.e. reset it into content should only be called when the // cursor was set to a random position e.g. when deleting frames - void UpdateCrsrPos(); + void UpdateCursorPos(); // get the selected text at the current cursor. it will be filled with // fields etc. @@ -573,10 +573,10 @@ public: OUString GetText() const; // Check of SPoint or Mark of current cursor are placed within a table. - inline const SwTableNode* IsCrsrInTable( bool bIsPtInTable = true ) const; + inline const SwTableNode* IsCursorInTable( bool bIsPtInTable = true ) const; - inline Point& GetCrsrDocPos( bool bPoint = true ) const; - inline bool IsCrsrPtAtEnd() const; + inline Point& GetCursorDocPos( bool bPoint = true ) const; + inline bool IsCursorPtAtEnd() const; inline const SwPaM* GetTableCrs() const; inline SwPaM* GetTableCrs(); @@ -585,7 +585,7 @@ public: // get current table selection as text OUString GetBoxNms() const; - // set Crsr to the next/previous cell + // set Cursor to the next/previous cell bool GoNextCell( bool bAppendLine = true ); bool GoPrevCell(); // go to this box (if available and inside of table) @@ -617,28 +617,28 @@ public: /** Delivers the current shell cursor Some operations have to run on the current cursor ring, - some on the m_pTableCrsr (if exist) or the current cursor ring and - some on the m_pTableCrsr or m_pBlockCrsr or the current cursor ring. + some on the m_pTableCursor (if exist) or the current cursor ring and + some on the m_pTableCursor or m_pBlockCursor or the current cursor ring. This small function checks the existence and delivers the wished cursor. @param bBlock [bool] if the block cursor is of interest or not - @return m_pTableCrsr if exist, - m_pBlockCrsr if exist and of interest (param bBlock) - otherwise m_pCurCrsr + @return m_pTableCursor if exist, + m_pBlockCursor if exist and of interest (param bBlock) + otherwise m_pCurrentCursor */ - SwShellCrsr* getShellCrsr( bool bBlock ); - const SwShellCrsr* getShellCrsr( bool bBlock ) const - { return (const_cast<SwCrsrShell*>(this))->getShellCrsr( bBlock ); } + SwShellCursor* getShellCursor( bool bBlock ); + const SwShellCursor* getShellCursor( bool bBlock ) const + { return (const_cast<SwCursorShell*>(this))->getShellCursor( bBlock ); } - bool IsBlockMode() const { return nullptr != m_pBlockCrsr; } + bool IsBlockMode() const { return nullptr != m_pBlockCursor; } - // is the Crsr in a table and is the selection over 2 columns - bool IsTableMode() const { return nullptr != m_pTableCrsr; } + // is the Cursor in a table and is the selection over 2 columns + bool IsTableMode() const { return nullptr != m_pTableCursor; } - const SwShellTableCrsr* GetTableCrsr() const { return m_pTableCrsr; } - SwShellTableCrsr* GetTableCrsr() { return m_pTableCrsr; } + const SwShellTableCursor* GetTableCursor() const { return m_pTableCursor; } + SwShellTableCursor* GetTableCursor() { return m_pTableCursor; } size_t UpdateTableSelBoxes(); bool GotoFootnoteText(); ///< jump from content to footnote @@ -650,7 +650,7 @@ public: bool GotoHeaderText(); ///< jump from the content to the header bool GotoFooterText(); ///< jump from the content to the footer // jump to the header/footer of the given or current PageDesc - bool SetCrsrInHdFt( size_t nDescNo = SIZE_MAX, + bool SetCursorInHdFt( size_t nDescNo = SIZE_MAX, bool bInHeader = true ); // is point of cursor in header/footer. pbInHeader return true if it is // in a headerframe otherwise in a footerframe @@ -682,8 +682,8 @@ public: // Place only the visible cursor at the given position in the document. // Return false if SPoint was corrected by layout. // (This is needed for displaying the Drag&Drop/Copy-Cursor.) - bool SetVisCrsr( const Point &rPt ); - inline void UnSetVisCrsr(); + bool SetVisibleCursor( const Point &rPt ); + inline void UnSetVisibleCursor(); // jump to the next or previous field of the corresponding type bool MoveFieldType( @@ -697,11 +697,11 @@ public: static SwTextField* GetTextFieldAtPos( const SwPosition* pPos, const bool bIncludeInputFieldAtStart ); - static SwField* GetFieldAtCrsr( - const SwPaM* pCrsr, + static SwField* GetFieldAtCursor( + const SwPaM* pCursor, const bool bIncludeInputFieldAtStart ); SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const; - bool CrsrInsideInputField() const; + bool CursorInsideInputField() const; static bool PosInsideInputField( const SwPosition& rPos ); bool DocPtInsideInputField( const Point& rDocPt ) const; static sal_Int32 StartOfInputFieldAtPos( const SwPosition& rPos ); @@ -709,7 +709,7 @@ public: // Return number of cursors in ring (The flag indicates whether // only cursors containing selections are requested). - sal_uInt16 GetCrsrCnt( bool bAll = true ) const; + sal_uInt16 GetCursorCnt( bool bAll = true ) const; // Char Travelling - methods (in crstrvl1.cxx) bool GoStartWord(); @@ -739,9 +739,9 @@ public: // delete all created cursors, set the table cursor and the last cursor to // its TextNode (or StartNode?) - // They all get created on the next ::GetCrsr again + // They all get created on the next ::GetCursor again // Used for Drag&Drop/Clipboard-Paste in tables - bool ParkTableCrsr(); + bool ParkTableCursor(); // Non expanded attributes? bool IsGCAttr() const { return m_bGCAttr; } @@ -763,7 +763,7 @@ public: bool GetContentAtPos( const Point& rPt, SwContentAtPos& rContentAtPos, - bool bSetCrsr = false, + bool bSetCursor = false, SwRect* pFieldRect = nullptr ); const SwPostItField* GetPostItFieldAtCursor() const; @@ -800,9 +800,9 @@ public: bool IsAutoUpdateCells() const { return m_bAutoUpdateCells; } void SetAutoUpdateCells( bool bFlag ) { m_bAutoUpdateCells = bFlag; } - bool GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode, + bool GetShadowCursorPos( const Point& rPt, SwFillMode eFillMode, SwRect& rRect, short& rOrient ); - bool SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode ); + bool SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode ); const SwRangeRedline* SelNextRedline(); const SwRangeRedline* SelPrevRedline(); @@ -822,7 +822,7 @@ public: bool SelectHiddenRange(); // remove all invalid cursors - void ClearUpCrsrs(); + void ClearUpCursors(); inline void SetMacroExecAllowed( const bool _bMacroExecAllowed ) { @@ -842,7 +842,7 @@ public: @return the textual description of the current selection */ - OUString GetCrsrDescr() const; + OUString GetCursorDescr() const; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; /// Implementation of lok::Document::getPartPageRectangles() for Writer. @@ -850,68 +850,68 @@ public: }; // Cursor Inlines: -inline SwMoveFnCollection* SwCrsrShell::MakeFindRange( +inline SwMoveFnCollection* SwCursorShell::MakeFindRange( sal_uInt16 nStt, sal_uInt16 nEnd, SwPaM* pPam ) const { - return m_pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam ); + return m_pCurrentCursor->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam ); } -inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTableCrsr ) const +inline SwCursor* SwCursorShell::GetSwCursor( bool bMakeTableCursor ) const { - return static_cast<SwCursor*>(GetCrsr( bMakeTableCrsr )); + return static_cast<SwCursor*>(GetCursor( bMakeTableCursor )); } -inline SwPaM* SwCrsrShell::GetStkCrsr() const { return m_pCrsrStk; } +inline SwPaM* SwCursorShell::GetStackCursor() const { return m_pCursorStack; } -inline void SwCrsrShell::SetMark() { m_pCurCrsr->SetMark(); } +inline void SwCursorShell::SetMark() { m_pCurrentCursor->SetMark(); } -inline bool SwCrsrShell::HasMark() { return( m_pCurCrsr->HasMark() ); } +inline bool SwCursorShell::HasMark() { return( m_pCurrentCursor->HasMark() ); } -inline bool SwCrsrShell::IsSelection() const +inline bool SwCursorShell::IsSelection() const { - return IsTableMode() || m_pCurCrsr->HasMark() || - m_pCurCrsr->GetNext() != m_pCurCrsr; + return IsTableMode() || m_pCurrentCursor->HasMark() || + m_pCurrentCursor->GetNext() != m_pCurrentCursor; } -inline bool SwCrsrShell::IsMultiSelection() const +inline bool SwCursorShell::IsMultiSelection() const { - return m_pCurCrsr->GetNext() != m_pCurCrsr; + return m_pCurrentCursor->GetNext() != m_pCurrentCursor; } -inline bool SwCrsrShell::IsSelOnePara() const +inline bool SwCursorShell::IsSelOnePara() const { - return !m_pCurCrsr->IsMultiSelection() && - m_pCurCrsr->GetPoint()->nNode == m_pCurCrsr->GetMark()->nNode; + return !m_pCurrentCursor->IsMultiSelection() && + m_pCurrentCursor->GetPoint()->nNode == m_pCurrentCursor->GetMark()->nNode; } -inline const SwTableNode* SwCrsrShell::IsCrsrInTable( bool bIsPtInTable ) const +inline const SwTableNode* SwCursorShell::IsCursorInTable( bool bIsPtInTable ) const { - return m_pCurCrsr->GetNode( bIsPtInTable ).FindTableNode(); + return m_pCurrentCursor->GetNode( bIsPtInTable ).FindTableNode(); } -inline bool SwCrsrShell::IsCrsrPtAtEnd() const +inline bool SwCursorShell::IsCursorPtAtEnd() const { - return m_pCurCrsr->End() == m_pCurCrsr->GetPoint(); + return m_pCurrentCursor->End() == m_pCurrentCursor->GetPoint(); } -inline Point& SwCrsrShell::GetCrsrDocPos( bool bPoint ) const +inline Point& SwCursorShell::GetCursorDocPos( bool bPoint ) const { - return bPoint ? m_pCurCrsr->GetPtPos() : m_pCurCrsr->GetMkPos(); + return bPoint ? m_pCurrentCursor->GetPtPos() : m_pCurrentCursor->GetMkPos(); } -inline const SwPaM* SwCrsrShell::GetTableCrs() const +inline const SwPaM* SwCursorShell::GetTableCrs() const { - return m_pTableCrsr; + return m_pTableCursor; } -inline SwPaM* SwCrsrShell::GetTableCrs() +inline SwPaM* SwCursorShell::GetTableCrs() { - return m_pTableCrsr; + return m_pTableCursor; } -inline void SwCrsrShell::UnSetVisCrsr() +inline void SwCursorShell::UnSetVisibleCursor() { - m_pVisCrsr->Hide(); - m_pVisCrsr->SetDragCrsr( false ); + m_pVisibleCursor->Hide(); + m_pVisibleCursor->SetDragCursor( false ); } #endif // _CRSRSH_HXX diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index cdb7df2e1fc2..0663b21bc81f 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -32,16 +32,16 @@ enum SwFillMode FILL_INDENT ///< by left paragraph indention }; -struct SwFillCrsrPos +struct SwFillCursorPos { - SwRect aCrsr; ///< position and size of the ShadowCursor + SwRect aCursor; ///< position and size of the ShadowCursor sal_uInt16 nParaCnt; ///< number of paragraphs to insert sal_uInt16 nTabCnt; ///< number of tabs respectively size of indentation sal_uInt16 nSpaceCnt; ///< number of spaces to insert sal_uInt16 nColumnCnt; ///< number of necessary column breaks sal_Int16 eOrient; ///< paragraph alignment SwFillMode eMode; ///< desired fill-up rule - SwFillCrsrPos( SwFillMode eMd = FILL_TAB ) : + SwFillCursorPos( SwFillMode eMd = FILL_TAB ) : nParaCnt( 0 ), nTabCnt( 0 ), nSpaceCnt( 0 ), nColumnCnt( 0 ), eOrient( css::text::HoriOrientation::NONE ), eMode( eMd ) {} @@ -68,7 +68,7 @@ struct Sw2LinesPos /** * SwSpecialPos. This structure is used to pass some additional information - * during the call of SwTextFrm::GetCharRect(). An SwSpecialPos defines a position + * during the call of SwTextFrame::GetCharRect(). An SwSpecialPos defines a position * inside a portion which does not have a representation in the core string or * which is only represented by one position, e.g., field portions, * number portions, ergo sum and quo vadis portions. @@ -85,7 +85,7 @@ struct Sw2LinesPos * * Get the position of the second character inside a number portion: * nCharOfst = 2; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_BEFORE; - * Call SwTextFrm:::GetCharRect with core string position 0. + * Call SwTextFrame:::GetCharRect with core string position 0. * * Example 2) * @@ -94,7 +94,7 @@ struct Sw2LinesPos * Get the position of the third character in follow field B, core position * of field A is 33. * nCharOfst = 7; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_NONE; - * Call SwTextFrm:::GetCharRect with core string position 33. + * Call SwTextFrame:::GetCharRect with core string position 33. */ enum class SwSPExtendRange : sal_uInt8 @@ -114,11 +114,11 @@ struct SwSpecialPos {} }; -// CrsrTravelling-States (for GetCrsrOfst) -enum CrsrMoveState +// CursorTravelling-States (for GetCursorOfst) +enum CursorMoveState { MV_NONE, ///< default - MV_UPDOWN, ///< Crsr Up/Down + MV_UPDOWN, ///< Cursor Up/Down MV_RIGHTMARGIN, ///< at right margin MV_LEFTMARGIN, ///< at left margin MV_SETONLYTEXT, ///< stay with the cursor inside text @@ -126,27 +126,27 @@ enum CrsrMoveState }; // struct for later extensions -struct SwCrsrMoveState +struct SwCursorMoveState { - SwFillCrsrPos *m_pFill; ///< for automatic filling with tabs etc + SwFillCursorPos *m_pFill; ///< for automatic filling with tabs etc Sw2LinesPos *m_p2Lines; ///< for selections inside/around 2line portions SwSpecialPos* m_pSpecialPos; ///< for positions inside fields Point m_aRealHeight; ///< contains then the position/height of the cursor - CrsrMoveState m_eState; + CursorMoveState m_eState; sal_uInt8 m_nCursorBidiLevel; bool m_bStop; bool m_bRealHeight; ///< should the real height be calculated? bool m_bFieldInfo; ///< should be fields recognized? bool m_bPosCorr; ///< Point had to be corrected bool m_bFootnoteNoInfo; ///< recognized footnote numbering - bool m_bExactOnly; /**< let GetCrsrOfst look for exact matches only, + bool m_bExactOnly; /**< let GetCursorOfst look for exact matches only, i.e. never let it run into GetContentPos */ bool m_bFillRet; ///< only used temporary in FillMode bool m_bSetInReadOnly; ///< ReadOnly areas may be entered bool m_bRealWidth; ///< Calculation of the width required bool m_b2Lines; ///< Check 2line portions and fill p2Lines bool m_bNoScroll; ///< No scrolling of undersized textframes - bool m_bPosMatchesBounds; /**< GetCrsrOfst should not return the next + bool m_bPosMatchesBounds; /**< GetCursorOfst should not return the next position if screen position is inside second have of bound rect */ @@ -160,7 +160,7 @@ struct SwCrsrMoveState bool m_bInNumPortion; ///< point is in number portion #i23726# int m_nInNumPostionOffset; ///< distance from number portion's start - SwCrsrMoveState( CrsrMoveState eSt = MV_NONE ) : + SwCursorMoveState( CursorMoveState eSt = MV_NONE ) : m_pFill( nullptr ), m_p2Lines( nullptr ), m_pSpecialPos( nullptr ), @@ -183,7 +183,7 @@ struct SwCrsrMoveState m_bInNumPortion(false), // #i26726# m_nInNumPostionOffset(0) // #i26726# {} - SwCrsrMoveState( SwFillCrsrPos *pInitFill ) : + SwCursorMoveState( SwFillCursorPos *pInitFill ) : m_pFill( pInitFill ), m_p2Lines( nullptr ), m_pSpecialPos( nullptr ), diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx index 2ba43ffef947..a75b3f9f878b 100644 --- a/sw/inc/cshtyp.hxx +++ b/sw/inc/cshtyp.hxx @@ -23,21 +23,21 @@ #include "swdllapi.h" class SwPaM; -class SwContentFrm; -class SwLayoutFrm; +class SwContentFrame; +class SwLayoutFrame; // Structure for SwPaM. Contains the method-pointers for cursor movement. struct SwMoveFnCollection; typedef SwMoveFnCollection* SwMoveFn; -// Type definition for CrsrShell. -// Direction-parameter for MovePage (initialized in SwContentFrm). -typedef SwLayoutFrm * (*SwWhichPage)( const SwLayoutFrm * ); -typedef SwContentFrm * (*SwPosPage)( const SwLayoutFrm * ); +// Type definition for CursorShell. +// Direction-parameter for MovePage (initialized in SwContentFrame). +typedef SwLayoutFrame * (*SwWhichPage)( const SwLayoutFrame * ); +typedef SwContentFrame * (*SwPosPage)( const SwLayoutFrame * ); extern SwWhichPage fnPagePrev, fnPageCurr, fnPageNext; extern SwPosPage fnPageStart, fnPageEnd; -// Direction-parameter for MovePara (initialized in SwContentFrm). +// Direction-parameter for MovePara (initialized in SwContentFrame). typedef SwMoveFnCollection* SwPosPara; typedef bool (*SwWhichPara)( SwPaM&, SwPosPara ); extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext; @@ -56,8 +56,8 @@ extern SwWhichTable fnTablePrev, fnTableCurr, fnTableNext; extern SwPosTable fnTableStart, fnTableEnd; // Direction-parameter for MoveColumn -typedef SwLayoutFrm * (*SwWhichColumn)( const SwLayoutFrm * ); -typedef SwContentFrm * (*SwPosColumn)( const SwLayoutFrm * ); +typedef SwLayoutFrame * (*SwWhichColumn)( const SwLayoutFrame * ); +typedef SwContentFrame * (*SwPosColumn)( const SwLayoutFrame * ); extern SwWhichColumn fnColumnPrev, fnColumnCurr, fnColumnNext; extern SwPosColumn fnColumnStart, fnColumnEnd; diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 682c950b7031..3e996288f038 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -25,7 +25,7 @@ class SwDoc; class SwTextField; -class SwFrm; +class SwFrame; // Database field. class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index c565b66dee82..73d4242f337e 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -32,9 +32,9 @@ class SfxPoolItem; class SwFrameFormat; class SwFlyFrameFormat; -class SwFlyFrm; -class SwFrm; -class SwPageFrm; +class SwFlyFrame; +class SwFrame; +class SwPageFrame; class SwVirtFlyDrawObj; class SwFormatAnchor; class SwFlyDrawObj; @@ -54,7 +54,7 @@ inline const SwFrameFormat *FindFrameFormat( const SdrObject *pObj ) { return ::FindFrameFormat( const_cast<SdrObject*>(pObj) ); } bool HasWrap( const SdrObject* pObj ); -void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor ); +void setContextWritingMode( SdrObject* pObj, SwFrame* pAnchor ); /// @return BoundRect plus distance. SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ); @@ -253,8 +253,8 @@ class SwDrawVirtObj : public SdrVirtObj /// connection to writer layout const SwAnchoredObject& GetAnchoredObj() const { return maAnchoredDrawObj; } SwAnchoredObject& AnchoredObj() { return maAnchoredDrawObj; } - const SwFrm* GetAnchorFrm() const; - SwFrm* AnchorFrm(); + const SwFrame* GetAnchorFrame() const; + SwFrame* AnchorFrame(); void RemoveFromWriterLayout(); /// connection to drawing layer @@ -363,10 +363,10 @@ class SwDrawContact : public SwContact /** unary function used by <list> iterator to find a 'virtual' drawing object anchored at a given frame */ - struct VirtObjAnchoredAtFrmPred + struct VirtObjAnchoredAtFramePred { - const SwFrm* mpAnchorFrm; - VirtObjAnchoredAtFrmPred( const SwFrm& _rAnchorFrm ); + const SwFrame* mpAnchorFrame; + VirtObjAnchoredAtFramePred( const SwFrame& _rAnchorFrame ); bool operator() ( const SwDrawVirtObj* _pDrawVirtObj ); }; @@ -396,25 +396,25 @@ class SwDrawContact : public SwContact virtual SdrObject* GetMaster() override; virtual void SetMaster( SdrObject* _pNewMaster ) override; - const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = nullptr ) const; - SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = nullptr ); + const SwFrame* GetAnchorFrame( const SdrObject* _pDrawObj = nullptr ) const; + SwFrame* GetAnchorFrame( SdrObject* _pDrawObj = nullptr ); - inline const SwPageFrm* GetPageFrm() const + inline const SwPageFrame* GetPageFrame() const { - return maAnchoredDrawObj.GetPageFrm(); + return maAnchoredDrawObj.GetPageFrame(); } - inline SwPageFrm* GetPageFrm() + inline SwPageFrame* GetPageFrame() { - return maAnchoredDrawObj.GetPageFrm(); + return maAnchoredDrawObj.GetPageFrame(); } - void SetPageFrm( SwPageFrm* _pNewPageFrm ) + void SetPageFrame( SwPageFrame* _pNewPageFrame ) { - return maAnchoredDrawObj.SetPageFrm( _pNewPageFrm ); + return maAnchoredDrawObj.SetPageFrame( _pNewPageFrame ); } void ChkPage(); - SwPageFrm* FindPage( const SwRect &rRect ); + SwPageFrame* FindPage( const SwRect &rRect ); - /** Inserts SdrObject in the arrays of the layout ((SwPageFrm and SwFrm). + /** Inserts SdrObject in the arrays of the layout ((SwPageFrame and SwFrame). The anchor is determined according to the attribute SwFormatAnchor. If required the object gets unregistered with the old anchor. */ void ConnectToLayout( const SwFormatAnchor *pAnch = nullptr ); @@ -436,7 +436,7 @@ class SwDrawContact : public SwContact /** get drawing object ('master' or 'virtual') by frame. */ - SdrObject* GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm ); + SdrObject* GetDrawObjectByAnchorFrame( const SwFrame& _rAnchorFrame ); /// Virtual methods of SdrObjUserCall. virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) override; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index be104eb2abab..c752fa385526 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -78,11 +78,11 @@ class SvxMacroTableDtor; class SwAutoCompleteWord; class SwAutoCorrExceptWord; class SwCalc; -class SwCellFrm; +class SwCellFrame; class SwCharFormat; class SwCharFormats; class SwConditionTextFormatColl; -class SwCrsrShell; +class SwCursorShell; class SwCursor; class SwDBNameInfField; class SwDocShell; @@ -120,7 +120,7 @@ class SwPagePreviewPrtData; class SwRangeRedline; class SwRedlineTable; class SwExtraRedlineTable; -class SwRootFrm; +class SwRootFrame; class SwRubyList; class SwRubyListEntry; class SwSectionFormat; @@ -142,7 +142,7 @@ class SwTextBlocks; class SwTextFormatColl; class SwTextFormatColls; class SwURLStateChanged; -class SwUnoCrsr; +class SwUnoCursor; class SwViewShell; class _SetGetExpField; class SwDrawContact; @@ -168,7 +168,7 @@ class SwChartLockController_Helper; class IGrammarContact; class SwPrintData; class SwRenderData; -class SwPageFrm; +class SwPageFrame; class SwViewOption; class SwList; class IDocumentUndoRedo; @@ -392,7 +392,7 @@ private: const SwContentNode& rNode, RndStdIds eRequestId, const SfxItemSet* pFlyAttrSet, SwFrameFormat* = nullptr ); - sal_Int8 SetFlyFrmAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrms ); + sal_Int8 SetFlyFrameAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrames ); typedef SwFormat* (SwDoc:: *FNCopyFormat)( const OUString&, SwFormat*, bool, bool ); SwFormat* CopyFormat( const SwFormat& rFormat, const SwFormatsBase& rFormatArr, @@ -619,7 +619,7 @@ public: have to be surrounded completely by css::awt::Selection. ( Start < Pos < End ) !!! (Required for Writers.) */ - SwPosFlyFrms GetAllFlyFormats( const SwPaM* = nullptr, + SwPosFlyFrames GetAllFlyFormats( const SwPaM* = nullptr, bool bDrawAlso = false, bool bAsCharAlso = false ) const; @@ -656,13 +656,13 @@ public: // these items work for the UNO API and thus e.g. for ODF im/export) void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet); - bool SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet ); + bool SetFlyFrameAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet ); bool SetFrameFormatToFly( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFormat, SfxItemSet* pSet = nullptr, bool bKeepOrient = false ); - void SetFlyFrmTitle( SwFlyFrameFormat& rFlyFrameFormat, + void SetFlyFrameTitle( SwFlyFrameFormat& rFlyFrameFormat, const OUString& sNewTitle ); - void SetFlyFrmDescription( SwFlyFrameFormat& rFlyFrameFormat, + void SetFlyFrameDescription( SwFlyFrameFormat& rFlyFrameFormat, const OUString& sNewDescription ); // Footnotes @@ -686,7 +686,7 @@ public: SwConversionArgs *pConvArgs = nullptr ) const; css::uno::Reference< css::linguistic2::XHyphenatedWord > - Hyphenate( SwPaM *pPam, const Point &rCrsrPos, + Hyphenate( SwPaM *pPam, const Point &rCursorPos, sal_uInt16* pPageCnt, sal_uInt16* pPageSt ); // count words in pam @@ -726,7 +726,7 @@ public: OUString GetUniqueFrameName() const; OUString GetUniqueShapeName() const; - std::set<SwRootFrm*> GetAllLayouts(); + std::set<SwRootFrame*> GetAllLayouts(); void SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName ); const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const; @@ -898,15 +898,15 @@ public: // travel over PaM Ring bool InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry, - SwPaM& rPaM, SwCrsrShell* pShell = nullptr); + SwPaM& rPaM, SwCursorShell* pShell = nullptr); /** get the set of printable pages for the XRenderable API by evaluating the respective settings (see implementation) */ - static void CalculatePagesForPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport, + static void CalculatePagesForPrinting( const SwRootFrame& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport, sal_Int32 nDocPageCount ); static void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport, sal_Int32 nDocPageCount ); - static void CalculatePagePairsForProspectPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, + static void CalculatePagePairsForProspectPrinting( const SwRootFrame& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, sal_Int32 nDocPageCount ); // PageDescriptor interface. @@ -1013,34 +1013,34 @@ public: // Correct the SwPosition-Objects that are registered with the document // e. g. Bookmarks or tables/indices. - // If bMoveCrsr is set move Crsr too. + // If bMoveCursor is set move Cursor too. // Set everything in rOldNode on rNewPos + Offset. void CorrAbs( const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset = 0, - bool bMoveCrsr = false ); + bool bMoveCursor = false ); // Set everything in the range of [rStartNode, rEndNode] to rNewPos. static void CorrAbs( const SwNodeIndex& rStartNode, const SwNodeIndex& rEndNode, const SwPosition& rNewPos, - bool bMoveCrsr = false ); + bool bMoveCursor = false ); // Set everything in this range from rRange to rNewPos. static void CorrAbs( const SwPaM& rRange, const SwPosition& rNewPos, - bool bMoveCrsr = false ); + bool bMoveCursor = false ); // Set everything in rOldNode to relative Pos. void CorrRel( const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset = 0, - bool bMoveCrsr = false ); + bool bMoveCursor = false ); // Query / set rules for Outline. inline SwNumRule* GetOutlineNumRule() const @@ -1230,14 +1230,14 @@ public: bool IsInsTableAlignNum() const; // From FEShell (for Undo and BModified). - static void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, - const SwCellFrm* pBoxFrm = nullptr ); + static void GetTabCols( SwTabCols &rFill, const SwCursor* pCursor, + const SwCellFrame* pBoxFrame = nullptr ); void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly, - const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = nullptr ); - static void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr, - const SwCellFrm* pBoxFrm = nullptr ); - void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* pCrsr, - const SwCellFrm* pBoxFrm = nullptr ); + const SwCursor* pCursor, const SwCellFrame* pBoxFrame = nullptr ); + static void GetTabRows( SwTabCols &rFill, const SwCursor* pCursor, + const SwCellFrame* pBoxFrame = nullptr ); + void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* pCursor, + const SwCellFrame* pBoxFrame = nullptr ); // Direct access for UNO. void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld, @@ -1460,7 +1460,7 @@ public: void SetOLEObjModified(); // Uno - Interfaces - std::shared_ptr<SwUnoCrsr> CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr = false ); + std::shared_ptr<SwUnoCursor> CreateUnoCursor( const SwPosition& rPos, bool bTableCursor = false ); // FeShell - Interfaces // !!! These assume always an existing layout !!! @@ -1469,8 +1469,8 @@ public: const bool _bSameOnly, const bool _bPosCorr ); - void SetRowHeight( const SwCursor& rCursor, const SwFormatFrmSize &rNew ); - static void GetRowHeight( const SwCursor& rCursor, SwFormatFrmSize *& rpSz ); + void SetRowHeight( const SwCursor& rCursor, const SwFormatFrameSize &rNew ); + static void GetRowHeight( const SwCursor& rCursor, SwFormatFrameSize *& rpSz ); void SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew ); static void GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz ); bool BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly = true ); @@ -1501,7 +1501,7 @@ public: SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest ); void Unchain( SwFrameFormat &rFormat ); - // For Copy/Move from FrmShell. + // For Copy/Move from FrameShell. SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false, bool bInsInPage = true ); @@ -1634,17 +1634,17 @@ public: void dumpAsXml(struct _xmlTextWriter* = nullptr) const; std::set<Color> GetDocColors(); - std::vector< std::weak_ptr<SwUnoCrsr> > mvUnoCrsrTable; + std::vector< std::weak_ptr<SwUnoCursor> > mvUnoCursorTable; - // Remove expired UnoCrsr weak pointers the document keeps to notify about document death. - void cleanupUnoCrsrTable() + // Remove expired UnoCursor weak pointers the document keeps to notify about document death. + void cleanupUnoCursorTable() { // In most cases we'll remove most of the elements. - std::vector< std::weak_ptr<SwUnoCrsr> > unoCrsrTable; - std::copy_if(mvUnoCrsrTable.begin(), mvUnoCrsrTable.end(), - std::back_inserter(unoCrsrTable), - [](const std::weak_ptr<SwUnoCrsr>& pWeakPtr) { return !pWeakPtr.expired(); }); - std::swap(mvUnoCrsrTable, unoCrsrTable); + std::vector< std::weak_ptr<SwUnoCursor> > unoCursorTable; + std::copy_if(mvUnoCursorTable.begin(), mvUnoCursorTable.end(), + std::back_inserter(unoCursorTable), + [](const std::weak_ptr<SwUnoCursor>& pWeakPtr) { return !pWeakPtr.expired(); }); + std::swap(mvUnoCursorTable, unoCursorTable); } private: diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 07246188f681..37c5201905e4 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -27,7 +27,7 @@ class SwRangeRedline; class SwExtraRedline; -class SwUnoCrsr; +class SwUnoCursor; class SwOLENode; class SwTable; class SwTableLine; diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index bd9cf5419751..52fe09828031 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -45,7 +45,7 @@ class SwWrtShell; class SwFEShell; class Reader; class SwReader; -class SwCrsrShell; +class SwCursorShell; class SwSrcView; class SwPaM; class SwgReaderOption; @@ -228,7 +228,7 @@ public: /// For inserting document. Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, - SwCrsrShell* pCrsrSh = nullptr, SwPaM* pPaM = nullptr); + SwCursorShell* pCursorSh = nullptr, SwPaM* pPaM = nullptr); #if defined WNT virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 2e8c9152fd24..d684e9facc71 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -29,7 +29,7 @@ class _SetGetExpFields; class SwTextField; -class SwFrm; +class SwFrame; class OutlinerParaObject; class SwTextAPIObject; class SwFormatField; @@ -273,7 +273,7 @@ public: SwDocStatField( SwDocStatFieldType*, sal_uInt16 nSubType = 0, sal_uInt32 nFormat = 0); - void ChangeExpansion( const SwFrm* pFrm ); + void ChangeExpansion( const SwFrame* pFrame ); virtual OUString Expand() const override; virtual SwField* Copy() const override; @@ -619,7 +619,7 @@ public: void SetText( const OUString& rText ) { sText = rText; } - void ChangeExpansion( const SwFrm* pFrm, const SwTextField* pField ); + void ChangeExpansion( const SwFrame* pFrame, const SwTextField* pField ); virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 74605baa5749..f786d84a8d83 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -141,7 +141,7 @@ typedef std::vector<SwGetINetAttr> SwGetINetAttrs; #define CNT_HasGrf(USH) ((USH)&CNT_GRF) #define CNT_HasOLE(USH) ((USH)&CNT_OLE) -class SW_DLLPUBLIC SwEditShell : public SwCrsrShell +class SW_DLLPUBLIC SwEditShell : public SwCursorShell { static SvxSwAutoFormatFlags* s_pAutoFormatFlags; @@ -165,7 +165,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell public: /// Edit (all selected ranges). - void Insert( sal_Unicode, bool bOnlyCurrCrsr = false ); + void Insert( sal_Unicode, bool bOnlyCurrCursor = false ); void Insert2( const OUString &, const bool bForceExpandHints = false ); void Overwrite( const OUString & ); @@ -234,7 +234,7 @@ public: bool GetCurAttr( SfxItemSet& , const bool bMergeIndentValuesOfNumRule = false ) const; void SetAttrItem( const SfxPoolItem&, SetAttrMode nFlags = SetAttrMode::DEFAULT ); - void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT, SwPaM* pCrsr = nullptr ); + void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT, SwPaM* pCursor = nullptr ); /** Get RES_CHRATR_* items of one type in the current selection. * @param nWhich WhichId of the collected items. @@ -276,7 +276,7 @@ public: /// Query default attribute of document. const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const; - void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCrsr = nullptr ); + void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCursor = nullptr ); void GCAttr(); /// @return the scripttpye of the selection. @@ -459,7 +459,7 @@ public: bool IsProtectedOutlinePara() const; - const SwNumRule* GetNumRuleAtCurrCrsrPos() const; + const SwNumRule* GetNumRuleAtCurrCursorPos() const; /** Returns the numbering rule found at the paragraphs of the current selection, if all paragraphs of the current selection have the same or none numbering rule applied. */ @@ -499,7 +499,7 @@ public: void ChangeIndentOfAllListLevels( short nDiff ); // Adjust method name void SetIndent(short nIndent, const SwPosition & rPos); - bool IsFirstOfNumRuleAtCrsrPos() const; + bool IsFirstOfNumRuleAtCursorPos() const; bool IsNoNum( bool bChkStart = true ) const; @@ -525,7 +525,7 @@ public: void ChgNumRuleFormats( const SwNumRule& rRule ); /// Set (and query if) a numbering with StartFlag starts at current PointPos. - void SetNumRuleStart( bool bFlag = true, SwPaM* pCrsr = nullptr ); + void SetNumRuleStart( bool bFlag = true, SwPaM* pCursor = nullptr ); bool IsNumRuleStart( SwPaM* pPaM = nullptr ) const; void SetNodeNumStart( sal_uInt16 nStt, SwPaM* = nullptr ); @@ -579,7 +579,7 @@ public: /// To enable set up of StartActions and EndActions. virtual void CalcLayout() override; - /// Determine form of content. Return Type at CurCrsr->SPoint. + /// Determine form of content. Return Type at CurrentCursor->SPoint. sal_uInt16 GetCntType() const; /// Are there frames, footnotes, etc. @@ -594,7 +594,7 @@ public: bool GetSelectedText( OUString &rBuf, int nHndlParaBreak = GETSELTXT_PARABRK_TO_BLANK ); - /** @return graphic, if CurCrsr->Point() points to a SwGrfNode + /** @return graphic, if CurrentCursor->Point() points to a SwGrfNode (and mark is not set or points to the same graphic). */ const Graphic* GetGraphic( bool bWait = true ) const; @@ -632,7 +632,7 @@ public: Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys! const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const; - /** @return a ClientObject, if CurCrsr->Point() points to a SwOLENode + /** @return a ClientObject, if CurrentCursor->Point() points to a SwOLENode (and mark is neither set not pointint to same ClientObject) else give rap on the knuckles. */ svt::EmbeddedObjectRef& GetOLEObject() const; @@ -960,7 +960,7 @@ public: ~SwActContext(); }; - /// Class for automated call of Start- and EndCrsrMove(). + /// Class for automated call of Start- and EndCursorMove(). class SwMvContext { SwEditShell & m_rShell; public: diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 58041f3269b9..b2dbe78d15d8 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -27,7 +27,7 @@ class SfxPoolItem; class SwTextNode; -class SwFrm; +class SwFrame; struct SwPosition; class SwTextField; class SwDoc; @@ -37,7 +37,7 @@ class SwEditShell; /// Forward declaration: get "BodyTextNode" for exp.fld in Fly's headers/footers/footnotes. const SwTextNode* GetBodyTextNode( const SwDoc& pDoc, SwPosition& rPos, - const SwFrm& rFrm ); + const SwFrame& rFrame ); OUString ReplacePoint(const OUString& sTmpName, bool bWithCommandType = false); @@ -111,7 +111,7 @@ public: /** For fields in header/footer/footnotes/flys: Only called by formatting!! */ - void ChangeExpansion( const SwFrm&, const SwTextField& ); + void ChangeExpansion( const SwFrame&, const SwTextField& ); virtual OUString GetFieldName() const override; @@ -363,8 +363,8 @@ public: SwField* GetField(size_t nId); void GotoFieldPos(size_t nId); - void PushCrsr(); - void PopCrsr(); + void PushCursor(); + void PopCursor(); /** Put all that are new into SortLst for updating. @return true if not empty. (For Glossary: only update its input-fields). diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index da9420ff973a..f0367287daf2 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -39,13 +39,13 @@ namespace editeng { class SvxBorderLine; } -class SwFlyFrm; +class SwFlyFrame; class SwTabCols; class SvxBrushItem; class SvxFrameDirectionItem; class SwTableAutoFormat; -class SwFrm; -class SwFormatFrmSize; +class SwFrame; +class SwFormatFrameSize; class SwFormatRowSplit; class SdrObject; class Color; @@ -60,9 +60,9 @@ namespace svx class ISdrObjectFilter; } -// return values for GetFrmType() und GetSelFrmType(). +// return values for GetFrameType() und GetSelFrameType(). //! values can be combined via logical or -enum class FrmTypeFlags { +enum class FrameTypeFlags { NONE = 0, PAGE = 1, HEADER = 2, @@ -82,7 +82,7 @@ enum class FrmTypeFlags { }; namespace o3tl { - template<> struct typed_flags<FrmTypeFlags> : is_typed_flags<FrmTypeFlags, 0x7fff> {}; + template<> struct typed_flags<FrameTypeFlags> : is_typed_flags<FrameTypeFlags, 0x7fff> {}; } //! values can be combined via logical or @@ -92,10 +92,10 @@ enum class GotoObjFlags DrawControl = 1, DrawSimple = 2, DrawAny = DrawControl | DrawSimple, - FlyFrm = 4, + FlyFrame = 4, FlyGrf = 8, FlyOLE = 16, - FlyAny = FlyOLE | FlyGrf | FlyFrm, + FlyAny = FlyOLE | FlyGrf | FlyFrame, Any = FlyAny | DrawAny, }; namespace o3tl @@ -141,8 +141,8 @@ enum CurRectType RECT_PAGE_CALC, ///< ... page will be formatted if required. RECT_PAGE_PRT, ///< Rect of current PrtArea of page. RECT_FRM, ///< Rect of current frame. - RECT_FLY_EMBEDDED, ///< Rect of current FlyFrm. - RECT_FLY_PRT_EMBEDDED, ///< Rect of PrtArea of FlyFrm + RECT_FLY_EMBEDDED, ///< Rect of current FlyFrame. + RECT_FLY_PRT_EMBEDDED, ///< Rect of PrtArea of FlyFrame RECT_SECTION, ///< Rect of current section. RECT_OUTTABSECTION, ///< Rect of current section but outside of table. RECT_SECTION_PRT, ///< Rect of current PrtArea of section. @@ -156,8 +156,8 @@ enum CurRectType struct SwGetCurColNumPara { const SwFrameFormat* pFrameFormat; - const SwRect* pPrtRect, *pFrmRect; - SwGetCurColNumPara() : pFrameFormat( nullptr ), pPrtRect( nullptr ), pFrmRect( nullptr ) {} + const SwRect* pPrtRect, *pFrameRect; + SwGetCurColNumPara() : pFrameFormat( nullptr ), pPrtRect( nullptr ), pFrameRect( nullptr ) {} }; enum class SwPasteSdr @@ -207,7 +207,7 @@ private: std::unique_ptr<SdrDropMarkerOverlay> m_pChainFrom; bool m_bCheckForOLEInCaption; - SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const css::uno::Reference < css::embed::XEmbeddedObject >& ) const; + SAL_DLLPRIVATE SwFlyFrame *FindFlyFrame( const css::uno::Reference < css::embed::XEmbeddedObject >& ) const; /// Terminate actions for all shells and call ChangeLink. SAL_DLLPRIVATE void EndAllActionAndCall(); @@ -218,14 +218,14 @@ private: /** Used for mouse operations on a table: @return a cell frame that is 'close' to rPt. */ - SAL_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const; + SAL_DLLPRIVATE const SwFrame *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const; // 0 == not in any column. - SAL_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm, + SAL_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrame *pFrame, SwGetCurColNumPara* pPara ) const; - SAL_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const; - SAL_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const; + SAL_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrame *pBox ) const; + SAL_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrame *pBox ) const; SAL_DLLPRIVATE bool ImpEndCreate(); @@ -237,7 +237,7 @@ private: bool bSelectInsert ); /// Get list of marked SdrObjects; - /// helper method for GetSelFrmType, IsSelContainsControl. + /// helper method for GetSelFrameType, IsSelContainsControl. SAL_DLLPRIVATE const SdrMarkList* _GetMarkList() const; SAL_DLLPRIVATE bool CheckHeadline( bool bRepeat ) const; @@ -263,7 +263,7 @@ public: bool Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt, bool bIsMove = false, bool bSelectInsert = true ); - void SelectFlyFrm( SwFlyFrm& rFrm, bool bNew = false ); + void SelectFlyFrame( SwFlyFrame& rFrame, bool bNew = false ); /// Is selected frame within another frame? const SwFrameFormat* IsFlyInFly(); @@ -301,15 +301,15 @@ public: sophisticated one day. */ bool IsDirectlyInSection() const; - /** For return values see above FrmType. + /** For return values see above FrameType. pPt: Cursr or DocPos respectively; bStopAtFly: Stop at flys or continue over anchor. Although (0,TRUE) is kind of a standard, the parameters are not defaulted here in order to force more conscious use especially of bStopAtFly. */ - FrmTypeFlags GetFrmType( const Point *pPt, bool bStopAtFly ) const; - FrmTypeFlags GetSelFrmType() const; //Selektion (Drawing) + FrameTypeFlags GetFrameType( const Point *pPt, bool bStopAtFly ) const; + FrameTypeFlags GetSelFrameType() const; //Selektion (Drawing) /** check whether selected frame contains a control; - * companion method to GetSelFrmType, used for preventing + * companion method to GetSelFrameType, used for preventing * drag&drop of controls into header */ bool IsSelContainsControl() const; @@ -334,7 +334,7 @@ public: bool _bMirror = false, Point* _opRef = nullptr, Size* _opPercent = nullptr, - const SwFormatFrmSize* pFormatFrmSize = nullptr ) const; + const SwFormatFrameSize* pFormatFrameSize = nullptr ) const; /// Set size of draw objects. void SetObjRect( const SwRect& rRect ); @@ -376,12 +376,12 @@ public: OUString GetObjDescription() const; void SetObjDescription( const OUString& rDescription ); - bool IsFrmSelected() const; - bool GetFlyFrmAttr( SfxItemSet &rSet ) const; - bool SetFlyFrmAttr( SfxItemSet &rSet ); + bool IsFrameSelected() const; + bool GetFlyFrameAttr( SfxItemSet &rSet ) const; + bool SetFlyFrameAttr( SfxItemSet &rSet ); static SfxItemSet makeItemSetFromFormatAnchor(SfxItemPool& rPool, const SwFormatAnchor &rAnchor); - bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = nullptr ); - const SwFrameFormat *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false, + bool ResetFlyFrameAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = nullptr ); + const SwFrameFormat *NewFlyFrame( const SfxItemSet &rSet, bool bAnchValid = false, SwFrameFormat *pParent = nullptr ); void SetFlyPos( const Point &rAbsPos); Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false ); @@ -389,19 +389,19 @@ public: /** Determines whether a frame or its environment is vertically formatted and right-to-left. also determines, if frame or its environmane is in mongolianlayout (vertical left-to-right) - add output parameter <bVertL2R> */ - bool IsFrmVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const; + bool IsFrameVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const; SwFrameFormat* GetSelectedFrameFormat() const; ///< If frame then frame style, else 0. void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point* pDocPos = nullptr ); ///< If frame then set frame style. // Get selected fly - SwFlyFrm* GetSelectedFlyFrm() const; + SwFlyFrame* GetSelectedFlyFrame() const; // Get current fly in which the cursor is positioned - SwFlyFrm* GetCurrFlyFrm(const bool bCalcFrm = true) const; + SwFlyFrame* GetCurrFlyFrame(const bool bCalcFrame = true) const; // Get selected fly, but if none Get current fly in which the cursor is positioned - SwFlyFrm* GetSelectedOrCurrFlyFrm(const bool bCalcFrm = true) const; + SwFlyFrame* GetSelectedOrCurrFlyFrame(const bool bCalcFrame = true) const; /// Find/delete fly containing the cursor. SwFrameFormat* WizardGetFly(); @@ -416,8 +416,8 @@ public: size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const; const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const; - /// If a fly is selected, it draws cursor into the first ContentFrm. - const SwFrameFormat* SelFlyGrabCrsr(); + /// If a fly is selected, it draws cursor into the first ContentFrame. + const SwFrameFormat* SelFlyGrabCursor(); /// Get FlyFrameFormat; fuer UI Macro Anbindung an Flys const SwFrameFormat* GetFlyFrameFormat() const; @@ -438,14 +438,14 @@ public: Else the size is provided via GetCurFlyRect(). */ virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = nullptr, - const SwRect *pFlyFrmRect = nullptr, - const bool bNoTextFrmPrtAreaChanged = false ) = 0; + const SwRect *pFlyFrameRect = nullptr, + const bool bNoTextFramePrtAreaChanged = false ) = 0; /** Connect objects with ActivateWhenVisible at Paint. Called by notxtfrm::Paint, implemented in wrtsh. */ virtual void ConnectObj( svt::EmbeddedObjectRef&, const SwRect &rPrt, - const SwRect &rFrm ) = 0; + const SwRect &rFrame ) = 0; /// Check resize of OLE-Object. bool IsCheckForOLEInCaption() const { return m_bCheckForOLEInCaption; } @@ -579,7 +579,7 @@ public: // --> #i972# /** for starmath formulas anchored 'as char' it aligns it baseline to baseline changing the previous vertical orientation */ - void AlignFormulaToBaseline( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = nullptr ); + void AlignFormulaToBaseline( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, SwFlyFrame * pFly = nullptr ); /// aligns all formulas with anchor 'as char' to baseline void AlignAllFormulasToBaseline(); @@ -590,13 +590,13 @@ public: /// Convert document position into position relative to the current page. Point GetRelativePagePosition(const Point& rDocPos); - /// Hide or show layout-selection and pass call to CrsrSh. + /// Hide or show layout-selection and pass call to CursorSh. void ShLooseFcs(); void ShGetFcs( bool bUpdate = true ); /// PageDescriptor-interface void ChgCurPageDesc( const SwPageDesc& ); - size_t GetCurPageDesc( const bool bCalcFrm = true ) const; + size_t GetCurPageDesc( const bool bCalcFrame = true ) const; size_t GetMousePageDesc( const Point &rPt ) const; size_t GetPageDescCnt() const; SwPageDesc* FindPageDescByName( const OUString& rName, @@ -616,7 +616,7 @@ public: /// Page number of the page containing Point, O if no page. sal_uInt16 GetPageNumber( const Point &rPoint ) const; - bool GetPageNumber( long nYPos, bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; + bool GetPageNumber( long nYPos, bool bAtCursorPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&, const SfxItemSet* pFlyAttrSet = nullptr, @@ -647,10 +647,10 @@ public: bool SplitTab( bool bVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false ); bool Sort(const SwSortOptions&); //Sortieren. - void SetRowHeight( const SwFormatFrmSize &rSz ); + void SetRowHeight( const SwFormatFrameSize &rSz ); /// Pointer must be destroyed by caller != 0. - void GetRowHeight( SwFormatFrmSize *&rpSz ) const; + void GetRowHeight( SwFormatFrameSize *&rpSz ) const; void SetRowSplit( const SwFormatRowSplit &rSz ); void GetRowSplit( SwFormatRowSplit *&rpSz ) const; @@ -702,7 +702,7 @@ public: sal_uInt16 GetRowsToRepeat() const; void SetRowsToRepeat( sal_uInt16 nNumOfRows ); - sal_uInt16 GetVirtPageNum( const bool bCalcFrm = true ); + sal_uInt16 GetVirtPageNum( const bool bCalcFrame = true ); /** @return the number of table rows currently selected if the selection start at the top of the table. */ diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx index f4d1a97b1d3f..f4bcdfb58ad3 100644 --- a/sw/inc/flypos.hxx +++ b/sw/inc/flypos.hxx @@ -27,28 +27,28 @@ class SwFrameFormat; class SwNodeIndex; /// For querying current flys in document. -class SW_DLLPUBLIC SwPosFlyFrm +class SW_DLLPUBLIC SwPosFlyFrame { const SwFrameFormat* m_pFrameFormat; ///< FlyFrameFormat SwNodeIndex* m_pNodeIndex; ///< Index for node is sufficient. sal_uInt32 m_nOrdNum; public: - SwPosFlyFrm( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos ); - virtual ~SwPosFlyFrm(); ///< Virtual for Writer (DLL !!) + SwPosFlyFrame( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos ); + virtual ~SwPosFlyFrame(); ///< Virtual for Writer (DLL !!) const SwFrameFormat& GetFormat() const { return *m_pFrameFormat; } const SwNodeIndex& GetNdIndex() const { return *m_pNodeIndex; } sal_uInt32 GetOrdNum() const { return m_nOrdNum; } }; -// define needed classes to safely handle an array of allocated SwPosFlyFrm(s). -// SwPosFlyFrms can be handled by value (as return value), only refcounts to -// contained SwPosFlyFrm* will be copied. When releasing the last SwPosFlyFrmPtr +// define needed classes to safely handle an array of allocated SwPosFlyFrame(s). +// SwPosFlyFrames can be handled by value (as return value), only refcounts to +// contained SwPosFlyFrame* will be copied. When releasing the last SwPosFlyFramePtr // instance the allocated instance will be freed. The array is sorted by // GetNdIndex by using a std::set container. -typedef std::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr; -struct SwPosFlyFrmCmp { bool operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr& rB) const; }; -typedef std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms; +typedef std::shared_ptr< SwPosFlyFrame > SwPosFlyFramePtr; +struct SwPosFlyFrameCmp { bool operator()(const SwPosFlyFramePtr& rA, const SwPosFlyFramePtr& rB) const; }; +typedef std::set< SwPosFlyFramePtr, SwPosFlyFrameCmp > SwPosFlyFrames; #endif // INCLUDED_SW_INC_FLYPOS_HXX diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 2fb7ee23177b..18b02ce24081 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -27,7 +27,7 @@ class IntlWrapper; -/// Connection (text flow) between two FlyFrms. +/// Connection (text flow) between two FlyFrames. class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem { SwClient aPrev, ///< Previous SwFlyFrameFormat (if existent). diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 06ad1f32f2ae..64480288334c 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -43,7 +43,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; inline SwFrameFormat *GetFrameFormat() const { return pFormat; } - /// For Undo: delete the FlyFrmFormat "logically"; it is kept in Undo-object. + /// For Undo: delete the FlyFrameFormat "logically"; it is kept in Undo-object. inline void SetFlyFormat( SwFrameFormat* pNew = nullptr ) { pFormat = pNew; } const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; } diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 4f77040ed410..e58cdda00d68 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -30,7 +30,7 @@ class IntlWrapper; //Frame size. -enum SwFrmSize +enum SwFrameSize { ATT_VAR_SIZE, ///< Frame is variable in Var-direction. ATT_FIX_SIZE, ///< Frame cannot be moved in Var-direction. @@ -38,11 +38,11 @@ enum SwFrmSize (can be exceeded but not be less). */ }; -class SW_DLLPUBLIC SwFormatFrmSize: public SfxPoolItem +class SW_DLLPUBLIC SwFormatFrameSize: public SfxPoolItem { Size m_aSize; - SwFrmSize m_eFrmHeightType; - SwFrmSize m_eFrmWidthType; + SwFrameSize m_eFrameHeightType; + SwFrameSize m_eFrameWidthType; sal_uInt8 m_nWidthPercent; sal_Int16 m_eWidthPercentRelation; sal_uInt8 m_nHeightPercent; @@ -60,9 +60,9 @@ class SW_DLLPUBLIC SwFormatFrmSize: public SfxPoolItem // minus borders in BrowseView if the environment is the page. public: - SwFormatFrmSize( SwFrmSize eSize = ATT_VAR_SIZE, + SwFormatFrameSize( SwFrameSize eSize = ATT_VAR_SIZE, SwTwips nWidth = 0, SwTwips nHeight = 0 ); - SwFormatFrmSize& operator=( const SwFormatFrmSize& rCpy ); + SwFormatFrameSize& operator=( const SwFormatFrameSize& rCpy ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; @@ -75,11 +75,11 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SwFrmSize GetHeightSizeType() const { return m_eFrmHeightType; } - void SetHeightSizeType( SwFrmSize eSize ) { m_eFrmHeightType = eSize; } + SwFrameSize GetHeightSizeType() const { return m_eFrameHeightType; } + void SetHeightSizeType( SwFrameSize eSize ) { m_eFrameHeightType = eSize; } - SwFrmSize GetWidthSizeType() const { return m_eFrmWidthType; } - void SetWidthSizeType( SwFrmSize eSize ) { m_eFrmWidthType = eSize; } + SwFrameSize GetWidthSizeType() const { return m_eFrameWidthType; } + void SetWidthSizeType( SwFrameSize eSize ) { m_eFrameWidthType = eSize; } const Size& GetSize() const { return m_aSize; } void SetSize( const Size &rNew ) { m_aSize = rNew; } @@ -104,11 +104,11 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; -inline const SwFormatFrmSize &SwAttrSet::GetFrmSize(bool bInP) const - { return static_cast<const SwFormatFrmSize&>(Get( RES_FRM_SIZE,bInP)); } +inline const SwFormatFrameSize &SwAttrSet::GetFrameSize(bool bInP) const + { return static_cast<const SwFormatFrameSize&>(Get( RES_FRM_SIZE,bInP)); } -inline const SwFormatFrmSize &SwFormat::GetFrmSize(bool bInP) const - { return m_aSet.GetFrmSize(bInP); } +inline const SwFormatFrameSize &SwFormat::GetFrameSize(bool bInP) const + { return m_aSet.GetFrameSize(bInP); } #endif diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 63d41185a8cf..d3350d9b6422 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -63,9 +63,9 @@ class SW_DLLPUBLIC SwFormat : public SwModify protected: SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich ); + const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrame, sal_uInt16 nFormatWhich ); SwFormat( SwAttrPool& rPool, const OUString &rFormatNm, const sal_uInt16* pWhichRanges, - SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich ); + SwFormat *pDrvdFrame, sal_uInt16 nFormatWhich ); SwFormat( const SwFormat& rFormat ); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override; @@ -190,7 +190,7 @@ public: /// Frame-attributes - implemented in frmatr.hxx. inline const SwFormatFillOrder &GetFillOrder( bool = true ) const; - inline const SwFormatFrmSize &GetFrmSize( bool = true ) const; + inline const SwFormatFrameSize &GetFrameSize( bool = true ) const; inline const SwFormatHeader &GetHeader( bool = true ) const; inline const SwFormatFooter &GetFooter( bool = true ) const; inline const SwFormatSurround &GetSurround( bool = true ) const; @@ -223,7 +223,7 @@ public: inline const SwFormatFootnoteAtTextEnd &GetFootnoteAtTextEnd( bool = true ) const; inline const SwFormatEndAtTextEnd &GetEndAtTextEnd( bool = true ) const; inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const; - inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const; + inline const SvxFrameDirectionItem &GetFrameDir( bool = true ) const; inline const SwTextGridItem &GetTextGrid( bool = true ) const; inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const; // #i18732# diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx index 4685e24ddbd1..d24eb57b8927 100644 --- a/sw/inc/frmatr.hxx +++ b/sw/inc/frmatr.hxx @@ -63,7 +63,7 @@ inline const SvxFormatBreakItem &SwAttrSet::GetBreak(bool bInP) const { return static_cast<const SvxFormatBreakItem&>(Get( RES_BREAK,bInP)); } inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const { return static_cast<const SvxMacroItem&>(Get( RES_FRMMACRO,bInP)); } -inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const +inline const SvxFrameDirectionItem &SwAttrSet::GetFrameDir(bool bInP) const { return static_cast<const SvxFrameDirectionItem&>(Get( RES_FRAMEDIR,bInP)); } inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const { return static_cast<const SdrTextVertAdjustItem&>(Get( RES_TEXT_VERT_ADJUST,bInP)); } @@ -91,8 +91,8 @@ inline const SvxFormatBreakItem &SwFormat::GetBreak(bool bInP) const { return m_aSet.GetBreak(bInP); } inline const SvxMacroItem &SwFormat::GetMacro(bool bInP) const { return m_aSet.GetMacro(bInP); } -inline const SvxFrameDirectionItem &SwFormat::GetFrmDir(bool bInP) const - { return m_aSet.GetFrmDir(bInP); } +inline const SvxFrameDirectionItem &SwFormat::GetFrameDir(bool bInP) const + { return m_aSet.GetFrameDir(bInP); } inline const SdrTextVertAdjustItem &SwFormat::GetTextVertAdjust(bool bInP) const { return m_aSet.GetTextVertAdjust(bInP); } diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 717f3702995a..52b0b1324850 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -25,7 +25,7 @@ #include <format.hxx> #include "swdllapi.h" -class SwFlyFrm; +class SwFlyFrame; class SwAnchoredObject; class Graphic; class ImageMap; @@ -51,14 +51,14 @@ protected: SwFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrm, + SwFrameFormat *pDrvdFrame, sal_uInt16 nFormatWhich = RES_FRMFMT, const sal_uInt16* pWhichRange = nullptr); SwFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, - SwFrameFormat *pDrvdFrm, + SwFrameFormat *pDrvdFrame, sal_uInt16 nFormatWhich = RES_FRMFMT, const sal_uInt16* pWhichRange = nullptr); @@ -67,11 +67,11 @@ protected: public: virtual ~SwFrameFormat(); - /// Destroys all Frms in aDepend (Frms are identified via dynamic_cast). - virtual void DelFrms(); + /// Destroys all Frames in aDepend (Frames are identified via dynamic_cast). + virtual void DelFrames(); /// Creates the views. - virtual void MakeFrms(); + virtual void MakeFrames(); virtual Graphic MakeGraphic( ImageMap* pMap = nullptr ); @@ -80,14 +80,14 @@ public: rPoint - test on DocPosition. pFly - optional FlyFrame, in case it is already known. */ IMapObject* GetIMapObject( const Point& rPoint, - const SwFlyFrm *pFly = nullptr ) const; + const SwFlyFrame *pFly = nullptr ) const; /** @return the real size of the frame - or an empty rectangle if no layout exists. If pPoint is given, look for the frame closest to it. */ SwRect FindLayoutRect( const bool bPrtArea = false, const Point* pPoint = nullptr, - const bool bCalcFrm = false ) const; + const bool bCalcFrame = false ) const; /** Searches SdrObject. SdrObjUserCall is client of the format. The UserCall knows its SdrObject. */ @@ -97,7 +97,7 @@ public: /** @return the SdrObject, that is connected to the ContactObject. Only DrawFrameFormats are connected to the "real SdrObject". FlyFrameFormats - are connected to a Master and all FlyFrms has the "real SdrObject". + are connected to a Master and all FlyFrames has the "real SdrObject". "Real SdrObject" has position and a Z-order. */ SdrObject *FindSdrObject(); const SdrObject *FindSdrObject() const @@ -152,32 +152,32 @@ class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat it stores the previous position of Prt rectangle from RequestObjectResize so it can be used to move frames of non-resizable objects to align them correctly when they get borders (this is done in SwWrtShell::CalcAndGetScale) */ - Point m_aLastFlyFrmPrtRectPos; + Point m_aLastFlyFramePrtRectPos; SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) = delete; SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) = delete; protected: SwFlyFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FLYFRMFMT ) + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FLYFRMFMT ) {} SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FLYFRMFMT ) + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FLYFRMFMT ) {} public: virtual ~SwFlyFrameFormat(); /// Creates the views. - virtual void MakeFrms() override; + virtual void MakeFrames() override; - SwFlyFrm* GetFrm( const Point* pDocPos = nullptr, - const bool bCalcFrm = false ) const; + SwFlyFrame* GetFrame( const Point* pDocPos = nullptr, + const bool bCalcFrame = false ) const; SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = nullptr, - const bool bCalcFrm = false ) const; + const bool bCalcFrame = false ) const; virtual Graphic MakeGraphic( ImageMap* pMap = nullptr ) override; @@ -214,8 +214,8 @@ public: */ bool IsBackgroundBrushInherited() const; - const Point & GetLastFlyFrmPrtRectPos() const { return m_aLastFlyFrmPrtRectPos; } - void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { m_aLastFlyFrmPrtRectPos = rPoint; } + const Point & GetLastFlyFramePrtRectPos() const { return m_aLastFlyFramePrtRectPos; } + void SetLastFlyFramePrtRectPos( const Point &rPoint ) { m_aLastFlyFramePrtRectPos = rPoint; } DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrameFormat) }; @@ -240,8 +240,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat protected: SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ), + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_DRAWFRMFMT ), m_pSdrObjectCached(nullptr), meLayoutDir( SwFrameFormat::HORI_L2R ), @@ -252,8 +252,8 @@ protected: {} SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ), + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_DRAWFRMFMT ), m_pSdrObjectCached(nullptr), meLayoutDir( SwFrameFormat::HORI_L2R ), @@ -267,11 +267,11 @@ public: /** DrawObjects are removed from the arrays at the layout. The DrawObjects are marked as deleted. */ - virtual void DelFrms() override; + virtual void DelFrames() override; /** Register DrawObjects in the arrays at layout. Reset delete marks. */ - virtual void MakeFrms() override; + virtual void MakeFrames() override; virtual Graphic MakeGraphic( ImageMap* pMap = nullptr ) override; diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 587cc747f139..e7ab19790e23 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion void ChangeText( const OUString &rNewText, const OUString& rOrigText, const css::uno::Sequence< sal_Int32 > *pOffsets, - SwPaM *pCrsr ); + SwPaM *pCursor ); void ChangeText_impl( const OUString &rNewText, bool bKeepAttributes ); inline bool IsDrawObj() { return m_bIsDrawObj; } diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 751dd5daae53..f5da6ee6c5c5 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -29,8 +29,8 @@ class SwTable; class SwNode; class SwNodes; class SwContentNode; -class SwPageFrm; -class SwFrm; +class SwPageFrame; +class SwFrame; class SwTextNode; class SwHistory; @@ -225,19 +225,19 @@ public: class SwVirtPageNumInfo: public SwMsgPoolItem { - const SwPageFrm *m_pPage; - const SwPageFrm *m_pOrigPage; - const SwFrm *m_pFrm; + const SwPageFrame *m_pPage; + const SwPageFrame *m_pOrigPage; + const SwFrame *m_pFrame; /** Multiple attributes can be attached to a single paragraph / table The frame, in the end, has to decide which attribute takes effect and which physical page it involves */ public: - SwVirtPageNumInfo( const SwPageFrm *pPg ); + SwVirtPageNumInfo( const SwPageFrame *pPg ); - const SwPageFrm *GetPage() { return m_pPage; } - const SwPageFrm *GetOrigPage() { return m_pOrigPage;} - const SwFrm *GetFrm() { return m_pFrm; } - void SetInfo( const SwPageFrm *pPg, - const SwFrm *pF ) { m_pFrm = pF, m_pPage = pPg; } + const SwPageFrame *GetPage() { return m_pPage; } + const SwPageFrame *GetOrigPage() { return m_pOrigPage;} + const SwFrame *GetFrame() { return m_pFrame; } + void SetInfo( const SwPageFrame *pPg, + const SwFrame *pF ) { m_pFrame = pF, m_pPage = pPg; } }; class SwFindNearestNode : public SwMsgPoolItem diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 2f6e98e42d79..5711d332ba96 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -327,7 +327,7 @@ public: static sal_uInt16 GetBrowseWidth( const SwDoc& rDoc ); /// Calculates available width by table-frame. - sal_uInt16 GetBrowseWidthByTabFrm( const SwTabFrm& rTabFrm ) const; + sal_uInt16 GetBrowseWidthByTabFrame( const SwTabFrame& rTabFrame ) const; /** Calculates available width by the table-frame or static GetBrowseWidth if no layout exists. */ diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx index 78932dcb5130..96fb0c15fc07 100644 --- a/sw/inc/init.hxx +++ b/sw/inc/init.hxx @@ -49,8 +49,8 @@ private: } // layout/newfrm.cxx -void _FrmInit(); -void _FrmFinit(); +void _FrameInit(); +void _FrameFinit(); void SetShell( SwViewShell *pSh ); // text/txtfrm.cxx diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 8850d62d1c3a..3b55ec5974f5 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -121,12 +121,12 @@ class SW_DLLPUBLIC SwNodes void DelNodes( const SwNodeIndex& rStart, sal_uLong nCnt = 1 ); void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize, - SwNodeIndex& rInsPos, bool bNewFrms ); + SwNodeIndex& rInsPos, bool bNewFrames ); void UpdateOutlineIdx( const SwNode& ); ///< Update all OutlineNodes starting from Node. void _CopyNodes( const SwNodeRange&, const SwNodeIndex&, - bool bNewFrms = true, bool bTableInsDummyNode = false ) const; + bool bNewFrames = true, bool bTableInsDummyNode = false ) const; void _DelDummyNodes( const SwNodeRange& rRg ); protected: @@ -171,12 +171,12 @@ public: void Delete(const SwNodeIndex &rPos, sal_uLong nNodes = 1); bool _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, - bool bNewFrms = true ); + bool bNewFrames = true ); void MoveRange( SwPaM&, SwPosition&, SwNodes& rNodes ); void _Copy( const SwNodeRange& rRg, const SwNodeIndex& rInsPos, - bool bNewFrms = true ) const - { _CopyNodes( rRg, rInsPos, bNewFrms ); } + bool bNewFrames = true ) const + { _CopyNodes( rRg, rInsPos, bNewFrames ); } void SectionUp( SwNodeRange *); void SectionDown( SwNodeRange *pRange, SwStartNodeType = SwNormalStartNode ); @@ -305,7 +305,7 @@ public: SwTOXBase const*const pTOXBase, SwNodeIndex const*const pEnde, bool const bInsAtStart = true, - bool const bCreateFrms = true); + bool const bCreateFrames = true); /// Which Doc contains the nodes-array? SwDoc* GetDoc() { return m_pMyDoc; } @@ -313,9 +313,9 @@ public: /** Search previous / next content node or table node with frames. If no end is given begin with the FrameIndex, else start search - with that before rFrmIdx and pEnd at the back. - If no valid node is found, return 0. rFrmIdx points to the node with frames. **/ - SwNode* FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx, + with that before rFrameIdx and pEnd at the back. + If no valid node is found, return 0. rFrameIdx points to the node with frames. **/ + SwNode* FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx, const SwNode* pEnd = nullptr ) const; SwNode * DocumentSectionStartNode(SwNode * pNode) const; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 885311d9f6d1..7b960c9c8a32 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -189,7 +189,7 @@ public: void ScaleImageMap(); /// Returns the with our graphic attributes filled Graphic-Attr-Structure. - GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const; + GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrame* pFrame ) const; std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;} bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;} diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 3c6b23439704..4a4e3c492672 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -28,7 +28,7 @@ namespace tools { class PolyPolygon; } class SW_DLLPUBLIC SwNoTextNode : public SwContentNode { friend class SwNodes; - friend class SwNoTextFrm; + friend class SwNoTextFrame; tools::PolyPolygon *pContour; bool bAutomaticContour : 1; // automatic contour polygon, not manipulated @@ -51,7 +51,7 @@ protected: public: virtual ~SwNoTextNode(); - virtual SwContentFrm *MakeFrm( SwFrm* ) override; + virtual SwContentFrame *MakeFrame( SwFrame* ) override; inline SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); } diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index bf0a17494684..4a58a1e3560e 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -45,7 +45,7 @@ namespace utl { } class SwTextFormatColl; -class SwContentFrm; +class SwContentFrame; class SwTextField; class SwTextInputField; class SfxItemSet; @@ -76,7 +76,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable /// For creating the first TextNode. friend class SwDoc; ///< CTOR and AppendTextNode() friend class SwNodes; - friend class SwTextFrm; + friend class SwTextFrame; friend class SwScriptInfo; /** May be 0. It is only then not 0 if it contains hard attributes. @@ -180,7 +180,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable const SwTextInputField* GetOverlappingInputField( const SwTextAttr& rTextAttr ) const; - void DelFrms_TextNodePart(); + void DelFrames_TextNodePart(); public: enum class WrongState { TODO, PENDING, DONE }; @@ -352,7 +352,7 @@ public: const css::uno::Sequence<sal_Int32>& rOffsets ); /// Virtual methods from ContentNode. - virtual SwContentFrm *MakeFrm( SwFrm* ) override; + virtual SwContentFrame *MakeFrame( SwFrame* ) override; virtual SwContentNode *SplitContentNode( const SwPosition & ) override; virtual SwContentNode *JoinNext() override; virtual SwContentNode *JoinPrev() override; @@ -674,7 +674,7 @@ public: bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx. virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const override; - /// Interactive hyphenation: we find TextFrm and call its CalcHyph. + /// Interactive hyphenation: we find TextFrame and call its CalcHyph. bool Hyphenate( SwInterHyphInfo &rHyphInf ); void DelSoftHyph( const sal_Int32 nStart, const sal_Int32 nEnd ); diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index bcadbfee7408..d1ef7366d0f4 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -32,11 +32,11 @@ #include <memory> #include <vector> -class SwContentFrm; +class SwContentFrame; class SwContentNode; class SwDoc; class SwEndNode; -class SwFrm; +class SwFrame; class SwFrameFormat; class SwGrfNode; class SwNoTextNode; @@ -48,8 +48,8 @@ class SwSectionFormat; class SwTOXBase; class SwSectionNode; class SwStartNode; -class SwTabFrm; -class SwRootFrm; +class SwTabFrame; +class SwRootFrame; class SwTable; class SwTableNode; class SwTableBox; @@ -380,9 +380,9 @@ protected: public: - /** MakeFrm will be called for a certain layout - pSib is another SwFrm of the same layout (e.g. the SwRootFrm itself, a sibling, the parent) */ - virtual SwContentFrm *MakeFrm( SwFrm* pSib ) = 0; + /** MakeFrame will be called for a certain layout + pSib is another SwFrame of the same layout (e.g. the SwRootFrame itself, a sibling, the parent) */ + virtual SwContentFrame *MakeFrame( SwFrame* pSib ) = 0; virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0; @@ -399,30 +399,30 @@ public: bool GoNext(SwIndex *, sal_uInt16 nMode ) const; bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const; - /// Replacement for good old GetFrm(..): - SwContentFrm *getLayoutFrm( const SwRootFrm*, + /// Replacement for good old GetFrame(..): + SwContentFrame *getLayoutFrame( const SwRootFrame*, const Point* pDocPos = nullptr, const SwPosition *pPos = nullptr, - const bool bCalcFrm = true ) const; + const bool bCalcFrame = true ) const; /** @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 bCalcFrm = false ) const; - SwRect FindPageFrmRect( const bool bPrtArea = false, + const bool bCalcFrame = false ) const; + SwRect FindPageFrameRect( const bool bPrtArea = false, const Point* pPoint = nullptr, - const bool bCalcFrm = false ) const; + const bool bCalcFrame = false ) const; /** Method creates all views of document for given node. The content frames that are created are put in the respective layout. */ - void MakeFrms( SwContentNode& rNode ); + void MakeFrames( SwContentNode& rNode ); /** Method deletes all views of document for the node. The content- frames are removed from the respective layout. Add an input param to identify if acc table should be disposed */ - void DelFrms( bool bIsAccTableDispose = true ); + void DelFrames( bool bIsAccTableDispose = true ); /** @return count of elements of node content. Default is 1. There are differences between text node and formula node. */ @@ -502,18 +502,18 @@ public: const SwTable& GetTable() const { return *m_pTable; } SwTable& GetTable() { return *m_pTable; } - SwTabFrm *MakeFrm( SwFrm* ); + SwTabFrame *MakeFrame( SwFrame* ); - /// Creates the frms for the table node (i.e. the TabFrms). - void MakeFrms( SwNodeIndex* pIdxBehind ); + /// Creates the frms for the table node (i.e. the TabFrames). + void MakeFrames( SwNodeIndex* pIdxBehind ); /** Method deletes all views of document for the node. The content frames are removed from the respective layout. */ - void DelFrms(); + void DelFrames(); /** Method creates all views of the document for the previous node. The content frames that are created are put into the respective layout. */ - void MakeFrms( const SwNodeIndex & rIdx ); + void MakeFrames( const SwNodeIndex & rIdx ); SwTableNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; void SetNewTable( SwTable* , bool bNewFrames=true ); @@ -547,21 +547,21 @@ public: const SwSection& GetSection() const { return *m_pSection; } SwSection& GetSection() { return *m_pSection; } - SwFrm *MakeFrm( SwFrm* ); + SwFrame *MakeFrame( SwFrame* ); - /** Creates the frms for the SectionNode (i.e. the SectionFrms). + /** Creates the frms for the SectionNode (i.e. the SectionFrames). On default the frames are created until the end of the range. - When another NodeIndex pEnd is passed a MakeFrms is called up to it. + When another NodeIndex pEnd is passed a MakeFrames is called up to it. Used by TableToText. */ - void MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* pEnd = nullptr ); + void MakeFrames( SwNodeIndex* pIdxBehind, SwNodeIndex* pEnd = nullptr ); /** Method deletes all views of document for the node. The content frames are removed from the respective layout. */ - void DelFrms(); + void DelFrames(); /** Method creates all views of document for the previous node. The content frames created are put into the respective layout. */ - void MakeFrms( const SwNodeIndex & rIdx ); + void MakeFrames( const SwNodeIndex & rIdx ); SwSectionNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 258f63464b81..db943eb00686 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -106,7 +106,7 @@ public: * Access to complete m_eUse including the information on header and footer * via ReadUseOn(), WriteUseOn() (for Filter and CopyCTor)! * - * The Frmformats for header/footer are adjusted by the UI according to + * The Frameformats for header/footer are adjusted by the UI according to * the attributes for header and footer at master (height, margin, back- * ground ...) * Header/footer for left hand pages are copied or mirrored (Chg at diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index c18a43738509..7c440bede8cc 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -30,8 +30,8 @@ #include <swtypes.hxx> class SwViewShell; -class SwRootFrm; -class SwPageFrm; +class SwRootFrame; +class SwPageFrame; class Fraction; struct PreviewPage; @@ -51,7 +51,7 @@ private: /// view shell the print preview is generated for. SwViewShell& mrParentViewShell; /// top layout frame of the layout for accessing the pages - const SwRootFrm& mrLayoutRootFrm; + const SwRootFrame& mrLayoutRootFrame; /** boolean indicating, if the layout information (number of columns and rows) are valid. */ @@ -183,7 +183,7 @@ private: @return boolean, indicating, if calculation was successful. */ - bool _CalcPreviewDataForPage( const SwPageFrm& _rPage, + bool _CalcPreviewDataForPage( const SwPageFrame& _rPage, const Point& _rPreviewOffset, PreviewPage* _opPreviewPage ); @@ -230,13 +230,13 @@ public: (2) Change of the zoom at the view options. (3) Preparations for paint of the page preview. - @param _rLayoutRootFrm + @param _rLayoutRootFrame input parameter - constant reference to the root frame of the layout. - Reference will be hold as member <mrLayoutRootFrm> in order to get + Reference will be hold as member <mrLayoutRootFrame> in order to get access to the page frames. */ SwPagePreviewLayout( SwViewShell& _rParentViewShell, - const SwRootFrm& _rLayoutRootFrm ); + const SwRootFrame& _rLayoutRootFrame ); /** destructor of <SwPagePreviewLayout> diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 554e5ebc6a43..373429b4782b 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -28,7 +28,7 @@ class SfxBroadcaster; class SwTextField; -class SwRootFrm; +class SwRootFrame; class SwPostItMgr; class SwEditWin; namespace sw { namespace sidebarwindows { @@ -41,7 +41,7 @@ typedef sal_Int64 SwPostItBits; struct SwLayoutInfo { - const SwFrm* mpAnchorFrm; + const SwFrame* mpAnchorFrame; SwRect mPosition; // optional start of the annotation @@ -57,7 +57,7 @@ struct SwLayoutInfo sal_uInt16 mRedlineAuthor; SwLayoutInfo() - : mpAnchorFrm(nullptr) + : mpAnchorFrame(nullptr) , mPosition() , mnStartNodeIdx( 0 ) , mnStartContent( -1 ) @@ -81,9 +81,9 @@ namespace SwPostItHelper const SwPosition& rAnchorPos, const SwPosition* pAnnotationStartPos = nullptr ); - long getLayoutHeight( const SwRootFrm* pRoot ); - void setSidebarChanged( SwRootFrm* pRoot, bool bBrowseMode ); - unsigned long getPageInfo( SwRect& rPageFrm, const SwRootFrm* , const Point& ); + long getLayoutHeight( const SwRootFrame* pRoot ); + void setSidebarChanged( SwRootFrame* pRoot, bool bBrowseMode ); + unsigned long getPageInfo( SwRect& rPageFrame, const SwRootFrame* , const Point& ); } class SwSidebarItem diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 793b4147f91d..b6008d9e3961 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -142,8 +142,8 @@ class SW_DLLPUBLIC SwSection { // In order to correctly maintain the flag when creating/deleting frames. friend class SwSectionNode; - // The "read CTOR" of SwSectionFrm have to change the Hiddenflag. - friend class SwSectionFrm; + // The "read CTOR" of SwSectionFrame have to change the Hiddenflag. + friend class SwSectionFrame; private: mutable SwSectionData m_Data; @@ -249,15 +249,15 @@ public: }; // #i117863# -class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint +class SwSectionFrameMoveAndDeleteHint : public SfxSimpleHint { public: - SwSectionFrmMoveAndDeleteHint( const bool bSaveContent ) + SwSectionFrameMoveAndDeleteHint( const bool bSaveContent ) : SfxSimpleHint( SFX_HINT_DYING ) , mbSaveContent( bSaveContent ) {} - virtual ~SwSectionFrmMoveAndDeleteHint() + virtual ~SwSectionFrameMoveAndDeleteHint() {} bool IsSaveContent() const @@ -286,17 +286,17 @@ class SW_DLLPUBLIC SwSectionFormat SAL_DLLPRIVATE void UpdateParent(); // Parent has been changed. protected: - SwSectionFormat( SwFrameFormat* pDrvdFrm, SwDoc *pDoc ); + SwSectionFormat( SwFrameFormat* pDrvdFrame, SwDoc *pDoc ); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override; public: virtual ~SwSectionFormat(); - // Deletes all Frms in aDepend (Frms are recognized via dynamic_cast). - virtual void DelFrms() override; + // Deletes all Frames in aDepend (Frames are recognized via dynamic_cast). + virtual void DelFrames() override; // Creates views. - virtual void MakeFrms() override; + virtual void MakeFrames() override; // Get information from Format. virtual bool GetInfo( SfxPoolItem& ) const override; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index bf6f001ef3d2..a234095086ee 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -48,7 +48,7 @@ class SvStream; class SvxFontItem; class SvxMacroTableDtor; class SwContentNode; -class SwCrsrShell; +class SwCursorShell; class SwDoc; class SwPaM; class SwTextBlocks; @@ -151,7 +151,7 @@ class SW_DLLPUBLIC SwReader: public SwDocFac css::uno::Reference < css::embed::XStorage > xStg; SfxMedium* pMedium; // Who wants to obtain a Medium (W4W). - SwPaM* pCrsr; + SwPaM* pCursor; OUString aFileName; OUString sBaseURL; bool mbSkipImages; @@ -227,8 +227,8 @@ public: virtual void SetFltName( const OUString& rFltNm ); - // Adapt item-set of a Frm-Format to the old format. - static void ResetFrameFormatAttrs( SfxItemSet &rFrmSet ); + // Adapt item-set of a Frame-Format to the old format. + static void ResetFrameFormatAttrs( SfxItemSet &rFrameSet ); // Adapt Frame-/Graphics-/OLE- styles to the old format // (without borders etc.). @@ -491,7 +491,7 @@ class SW_DLLPUBLIC SwWriter SfxMedium* pMedium; SwPaM* pOutPam; - SwCrsrShell *pShell; + SwCursorShell *pShell; SwDoc &rDoc; bool bWriteAll; @@ -499,13 +499,13 @@ class SW_DLLPUBLIC SwWriter public: sal_uLong Write( WriterRef& rxWriter, const OUString* = nullptr); - SwWriter( SvStream&, SwCrsrShell &, bool bWriteAll = false ); + SwWriter( SvStream&, SwCursorShell &, bool bWriteAll = false ); SwWriter( SvStream&, SwDoc & ); SwWriter( SvStream&, SwPaM &, bool bWriteAll = false ); SwWriter( const css::uno::Reference < css::embed::XStorage >&, SwDoc& ); - SwWriter( SfxMedium&, SwCrsrShell &, bool bWriteAll = false ); + SwWriter( SfxMedium&, SwCursorShell &, bool bWriteAll = false ); SwWriter( SfxMedium&, SwDoc & ); }; diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 40343400ac73..7010e6a54971 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -30,7 +30,7 @@ #include <functional> #include <limits.h> -class SwTextFrm; +class SwTextFrame; class SwTextNode; class SwIndex; namespace vcl { class Font; } @@ -107,12 +107,12 @@ struct SwSpellArgs : SwArgsBase // Parameter-class for Hyphenate. // docedt.cxx: SwDoc::Hyphenate() // txtedt.cxx: SwTextNode::Hyphenate() -// txthyph.cxx: SwTextFrm::Hyphenate() +// txthyph.cxx: SwTextFrame::Hyphenate() class SwInterHyphInfo { css::uno::Reference< css::linguistic2::XHyphenatedWord > xHyphWord; - const Point aCrsrPos; + const Point aCursorPos; bool bNoLang : 1; bool bCheck : 1; public: @@ -121,9 +121,9 @@ public: sal_Int32 nWordStart; sal_Int32 nWordLen; - SwInterHyphInfo( const Point &rCrsrPos, sal_Int32 nStartPos = 0, + SwInterHyphInfo( const Point &rCursorPos, sal_Int32 nStartPos = 0, sal_Int32 nLength = SAL_MAX_INT32 ) - : aCrsrPos(rCrsrPos) + : aCursorPos(rCursorPos) , bNoLang(false) , bCheck(false) , nStart(nStartPos) @@ -135,9 +135,9 @@ public: { return nEnd; } - const Point *GetCrsrPos() const + const Point *GetCursorPos() const { - return aCrsrPos.X() || aCrsrPos.Y() ? &aCrsrPos : nullptr; + return aCursorPos.X() || aCursorPos.Y() ? &aCursorPos : nullptr; } bool IsCheck() const { return bCheck; } void SetCheck( const bool bNew ) { bCheck = bNew; } @@ -155,8 +155,8 @@ public: namespace sw { -SwTextFrm * -SwHyphIterCacheLastTxtFrm(SwTextNode *, std::function<SwTextFrm * ()>); +SwTextFrame * +SwHyphIterCacheLastTextFrame(SwTextNode *, std::function<SwTextFrame * ()>); } diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 8919596a8198..6fd3e806bce1 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -387,10 +387,10 @@ public: virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0; virtual VclAbstractDialog* CreateTableMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0; - virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OUString &rDialogType, + virtual SfxAbstractTabDialog* CreateFrameTabDialog(const OUString &rDialogType, SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, - bool bNewFrm = true, + bool bNewFrame = true, bool bFormat = false, const OString& sDefPage = OString(), const OUString* pFormatStr = nullptr) = 0; diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index a0d08f2a20c2..5d6763ed98b0 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -58,7 +58,7 @@ class SvxCharHiddenItem; // Frame attributes class SwFormatFillOrder; -class SwFormatFrmSize; +class SwFormatFrameSize; class SvxPaperBinItem; class SvxLRSpaceItem; class SvxULSpaceItem; @@ -256,7 +256,7 @@ public: // Frame attributes. Implementation in frmatr.hxx. inline const SwFormatFillOrder &GetFillOrder( bool = true ) const; - inline const SwFormatFrmSize &GetFrmSize( bool = true ) const; + inline const SwFormatFrameSize &GetFrameSize( bool = true ) const; inline const SvxPaperBinItem &GetPaperBin( bool = true ) const; inline const SvxLRSpaceItem &GetLRSpace( bool = true ) const; inline const SvxULSpaceItem &GetULSpace( bool = true ) const; @@ -287,7 +287,7 @@ public: inline const SwFormatFootnoteAtTextEnd &GetFootnoteAtTextEnd( bool = true ) const; inline const SwFormatEndAtTextEnd &GetEndAtTextEnd( bool = true ) const; inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const; - inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const; + inline const SvxFrameDirectionItem &GetFrameDir( bool = true ) const; inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const; inline const SwFormatFollowTextFlow &GetFollowTextFlow(bool = true) const; inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const; diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 08b217e095fc..1d37cbfb960d 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -58,7 +58,7 @@ namespace nsSwCursorSelOverFlags class SW_DLLPUBLIC SwCursor : public SwPaM { - friend class SwCrsrSaveState; + friend class SwCursorSaveState; _SwCursor_SavePos* m_pSavePos; long m_nRowSpanOffset; // required for travelling in tabs with rowspans @@ -78,8 +78,8 @@ protected: const _SwCursor_SavePos* GetSavePos() const { return m_pSavePos; } - virtual const SwContentFrm* DoSetBidiLevelLeftRight( - bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr); + virtual const SwContentFrame* DoSetBidiLevelLeftRight( + bool & io_rbLeft, bool bVisualAllowed, bool bInsertCursor); virtual void DoSetBidiLevelUpDown(); virtual bool IsSelOvrCheck(int eFlags); @@ -157,7 +157,7 @@ public: bool ExpandToSentenceBorders(); virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, - bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ); + bool bAllowVisual, bool bSkipHidden, bool bInsertCursor ); bool UpDown( bool bUp, sal_uInt16 nCnt, Point* pPt, long nUpDownX ); bool LeftRightMargin( bool bLeftMargin, bool bAPI = false ); bool IsAtLeftRightMargin( bool bLeftMargin, bool bAPI = false ) const; @@ -190,10 +190,10 @@ public: nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); bool IsInProtectTable( bool bMove = false, - bool bChgCrsr = true ); + bool bChgCursor = true ); bool IsNoContent() const; - /** Restore cursor state to the one saved by SwCrsrSaveState **/ + /** Restore cursor state to the one saved by SwCursorSaveState **/ void RestoreSavePos(); // true: cursor can be set at this position. @@ -205,31 +205,31 @@ public: virtual bool IsSkipOverProtectSections() const; virtual bool IsSkipOverHiddenSections() const; - sal_uInt8 GetCrsrBidiLevel() const { return m_nCursorBidiLevel; } - void SetCrsrBidiLevel( sal_uInt8 nNewLevel ) { m_nCursorBidiLevel = nNewLevel; } + sal_uInt8 GetCursorBidiLevel() const { return m_nCursorBidiLevel; } + void SetCursorBidiLevel( sal_uInt8 nNewLevel ) { m_nCursorBidiLevel = nNewLevel; } bool IsColumnSelection() const { return m_bColumnSelection; } void SetColumnSelection( bool bNew ) { m_bColumnSelection = bNew; } - long GetCrsrRowSpanOffset() const { return m_nRowSpanOffset; } + long GetCursorRowSpanOffset() const { return m_nRowSpanOffset; } DECL_FIXEDMEMPOOL_NEWDEL( SwCursor ) }; /** - A helper class to save cursor state (position). Create SwCrsrSaveState + A helper class to save cursor state (position). Create SwCursorSaveState object to save current state, use SwCursor::RestoreSavePos() to actually - restore cursor state to the saved state (SwCrsrSaveState destructor only + restore cursor state to the saved state (SwCursorSaveState destructor only removes the saved state from an internal stack). It is possible to stack - several SwCrsrSaveState objects. + several SwCursorSaveState objects. **/ -class SwCrsrSaveState +class SwCursorSaveState { private: - SwCursor& m_rCrsr; + SwCursor& m_rCursor; public: - SwCrsrSaveState( SwCursor& rC ) : m_rCrsr( rC ) { rC.SaveState(); } - ~SwCrsrSaveState() { m_rCrsr.RestoreState(); } + SwCursorSaveState( SwCursor& rC ) : m_rCursor( rC ) { rC.SaveState(); } + ~SwCursorSaveState() { m_rCursor.RestoreState(); } }; // internal, used by SwCursor::SaveState() etc. @@ -239,9 +239,9 @@ struct _SwCursor_SavePos sal_Int32 nContent; _SwCursor_SavePos* pNext; - _SwCursor_SavePos( const SwCursor& rCrsr ) - : nNode( rCrsr.GetPoint()->nNode.GetIndex() ), - nContent( rCrsr.GetPoint()->nContent.GetIndex() ), + _SwCursor_SavePos( const SwCursor& rCursor ) + : nNode( rCursor.GetPoint()->nNode.GetIndex() ), + nContent( rCursor.GetPoint()->nContent.GetIndex() ), pNext( nullptr ) {} virtual ~_SwCursor_SavePos() {} @@ -269,7 +269,7 @@ public: virtual ~SwTableCursor(); virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, - bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ) override; + bool bAllowVisual, bool bSkipHidden, bool bInsertCursor ) override; virtual bool GotoTable( const OUString& rName ) override; void InsertBox( const SwTableBox& rTableBox ); @@ -278,14 +278,14 @@ public: const SwSelBoxes& GetSelectedBoxes() const { return m_SelectedBoxes; } // Creates cursor for all boxes. - SwCursor* MakeBoxSels( SwCursor* pAktCrsr ); + SwCursor* MakeBoxSels( SwCursor* pAktCursor ); // Any boxes protected? bool HasReadOnlyBoxSel() const; // Has table cursor been changed? If so, save new values immediately. - bool IsCrsrMovedUpdate(); + bool IsCursorMovedUpdate(); // Has table cursor been changed? - bool IsCrsrMoved() const + bool IsCursorMoved() const { return m_nTableMkNd != GetMark()->nNode.GetIndex() || m_nTablePtNd != GetPoint()->nNode.GetIndex() || @@ -296,7 +296,7 @@ public: bool IsChgd() const { return m_bChanged; } // Park table cursor at start node of boxes. - void ParkCrsr(); + void ParkCursor(); bool NewTableSelection(); void ActualizeSelection( const SwSelBoxes &rBoxes ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 0f1b4a8ec150..fd3928622e09 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -248,7 +248,7 @@ public: sal_uInt16 nCnt = 1, bool bBehind = true ); void PrepareDelBoxes( const SwSelBoxes& rBoxes ); bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged, - SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder ); + SwUndo* pUndo, const bool bDelMakeFrames, const bool bCorrBorder ); bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) @@ -496,13 +496,13 @@ public: void RegisterToFormat( SwFormat& rFormat ) ; }; -class SwCellFrm; +class SwCellFrame; class SW_DLLPUBLIC SwTableCellInfo : public ::boost::noncopyable { struct Impl; ::std::unique_ptr<Impl> m_pImpl; - const SwCellFrm * getCellFrm() const ; + const SwCellFrame * getCellFrame() const ; public: SwTableCellInfo(const SwTable * pTable); diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index 999b7c5fefe2..394716a89a20 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -29,12 +29,12 @@ class SW_DLLPUBLIC SwTableFormat : public SwFrameFormat protected: SwTableFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FRMFMT, aTableSetRange ) {} SwTableFormat( SwAttrPool& rPool, const OUString &rFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableSetRange ) {} public: @@ -50,12 +50,12 @@ class SwTableLineFormat : public SwFrameFormat protected: SwTableLineFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FRMFMT, aTableLineSetRange ) {} SwTableLineFormat( SwAttrPool& rPool, const OUString &rFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableLineSetRange ) {} public: @@ -71,12 +71,12 @@ class SW_DLLPUBLIC SwTableBoxFormat : public SwFrameFormat protected: SwTableBoxFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange ) + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FRMFMT, aTableBoxSetRange ) {} SwTableBoxFormat( SwAttrPool& rPool, const OUString &rFormatNm, - SwFrameFormat *pDrvdFrm ) - : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange ) + SwFrameFormat *pDrvdFrame ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableBoxSetRange ) {} // For recognition of changes (especially TableBoxAttribute). diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 5bff42792be2..5d99dae0ce41 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -68,8 +68,8 @@ const sal_Int32 COMPLETE_STRING = SAL_MAX_INT32; const SwTwips cMinHdFtHeight = 56; -#define MINFLY 23 // Minimal size for FlyFrms. -#define MINLAY 23 // Minimal size for other Frms. +#define MINFLY 23 // Minimal size for FlyFrames. +#define MINLAY 23 // Minimal size for other Frames. // Default column distance of two text columns corresponds to 0.3 cm. #define DEF_GUTTER_WIDTH (MM50 / 5 * 3) @@ -247,17 +247,17 @@ enum PrepareHint PREP_FIXSIZE_CHG, // FixSize has changed. PREP_FOLLOW_FOLLOWS, // Follow is now possibly adjacent. PREP_ADJUST_FRM, // Adjust size via grow/shrink without formatting. - PREP_FLY_CHGD, // A FlyFrm has changed its size. - PREP_FLY_ATTR_CHG, // A FlyFrm hat has changed its attributes + PREP_FLY_CHGD, // A FlyFrame has changed its size. + PREP_FLY_ATTR_CHG, // A FlyFrame hat has changed its attributes // (e. g. wrap). - PREP_FLY_ARRIVE, // A FlyFrm now overlaps range. - PREP_FLY_LEAVE, // A FlyFrm has left range. + PREP_FLY_ARRIVE, // A FlyFrame now overlaps range. + PREP_FLY_LEAVE, // A FlyFrame has left range. PREP_FTN, // Invalidation of footnotes. - PREP_POS_CHGD, // Position of Frm has changed. + PREP_POS_CHGD, // Position of Frame has changed. // (Check for Fly-break). In void* of Prepare() // a sal_Bool& is passed. If this is sal_True, // it indicateds that a format has been executed. - PREP_UL_SPACE, // UL-Space has changed, TextFrms have to + PREP_UL_SPACE, // UL-Space has changed, TextFrames have to // re-calculate line space. PREP_MUST_FIT, // Make frm fit (split) even if the attributes do // not allow that (e.g. "keep together"). @@ -267,7 +267,7 @@ enum PrepareHint PREP_QUOVADIS, // If a footnote has to be split between two paragraphs // the last on the page has to receive a QUOVADIS in // order to format the text into it. - PREP_BOSS_CHGD, // If a Frm changes its column/page this additional + PREP_BOSS_CHGD, // If a Frame changes its column/page this additional // Prepare is sended to POS_CHGD in MoveFwd/Bwd // (join Footnote-numbers etc.) // Direction is communicated via pVoid: @@ -279,7 +279,7 @@ enum PrepareHint PREP_MOVEFTN, // A footnote changes its page. Its contents receives at first a // height of zero in order to avoid too much noise. At formatting // it checks whether it fits and if necessary changes its page again. - PREP_ERGOSUM, // Needed because of movement in FootnoteFrms. Check QuoVadis/ErgoSum. + PREP_ERGOSUM, // Needed because of movement in FootnoteFrames. Check QuoVadis/ErgoSum. PREP_END // END. }; diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 524cb4ebd30f..dd4170893c60 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -29,21 +29,21 @@ #include <deque> #include <vector> -class SwCrsrShell; +class SwCursorShell; class SwCursor; class SwTableCursor; -class SwFrm; -class SwTabFrm; +class SwFrame; +class SwTabFrame; class SwTableBox; class SwTableLine; -class SwLayoutFrm; +class SwLayoutFrame; class SwPaM; class SwNode; class SwTable; class SwUndoTableMerge; -class SwCellFrm; +class SwCellFrame; -typedef ::std::deque< SwCellFrm* > SwCellFrms; +typedef ::std::deque< SwCellFrame* > SwCellFrames; struct CompareSwSelBoxes { @@ -70,23 +70,23 @@ namespace nsSwTableSearchType const SwTableSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union. } -SW_DLLPUBLIC void GetTableSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes, +SW_DLLPUBLIC void GetTableSel( const SwCursorShell& rShell, SwSelBoxes& rBoxes, const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); -void GetTableSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes, +void GetTableSel( const SwCursor& rCursor, SwSelBoxes& rBoxes, const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); -// As before, but don't start from selection but from Start- EndFrms. -void GetTableSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd, - SwSelBoxes& rBoxes, SwCellFrms* pCells, +// As before, but don't start from selection but from Start- EndFrames. +void GetTableSel( const SwLayoutFrame* pStart, const SwLayoutFrame* pEnd, + SwSelBoxes& rBoxes, SwCellFrames* pCells, const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); // As before but directly via PaMs. -void GetTableSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes ); -void GetTableSelCrs( const SwTableCursor& rTableCrsr, SwSelBoxes& rBoxes ); +void GetTableSelCrs( const SwCursorShell& rShell, SwSelBoxes& rBoxes ); +void GetTableSelCrs( const SwTableCursor& rTableCursor, SwSelBoxes& rBoxes ); // Collect boxes relevant for auto sum. -bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); +bool GetAutoSumSel( const SwCursorShell&, SwCellFrames& ); // Check if the SelBoxes contains protected Boxes. bool HasProtectedCells( const SwSelBoxes& rBoxes ); @@ -95,9 +95,9 @@ bool HasProtectedCells( const SwSelBoxes& rBoxes ); bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd); // Check if cell is part of SSelection. -// (Became a function, in order to make sure that GetTableSel() and MakeTableCrsr() +// (Became a function, in order to make sure that GetTableSel() and MakeTableCursor() // have always the same concept of the selection. -bool IsFrmInTableSel( const SwRect& rUnion, const SwFrm* pCell ); +bool IsFrameInTableSel( const SwRect& rUnion, const SwFrame* pCell ); // Determine boxes to be merged. // In this process the rectangle gets "adapted" on the base of the layout, @@ -113,25 +113,25 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes ); bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam ); // Check if Split or InsertCol lead to a box becoming smaller than MINLAY. -bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv, +bool CheckSplitCells( const SwCursorShell& rShell, sal_uInt16 nDiv, const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); -bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, +bool CheckSplitCells( const SwCursor& rCursor, sal_uInt16 nDiv, const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); // For working on tab selection also for split tables. class SwSelUnion { SwRect m_aUnion; // The rectangle enclosing the selection. - SwTabFrm *m_pTable; // The (Follow-)Table for the Union. + SwTabFrame *m_pTable; // The (Follow-)Table for the Union. public: - SwSelUnion( const SwRect &rRect, SwTabFrm *pTab ) : + SwSelUnion( const SwRect &rRect, SwTabFrame *pTab ) : m_aUnion( rRect ), m_pTable( pTab ) {} const SwRect& GetUnion() const { return m_aUnion; } SwRect& GetUnion() { return m_aUnion; } - const SwTabFrm *GetTable() const { return m_pTable; } - SwTabFrm *GetTable() { return m_pTable; } + const SwTabFrame *GetTable() const { return m_pTable; } + SwTabFrame *GetTable() { return m_pTable; } }; // Determines tables affected by a table selection and union rectangles @@ -142,8 +142,8 @@ typedef std::vector<SwSelUnion> SwSelUnions; // - also for split tables. // If a parameter is passed that != nsSwTableSearchType::TBLSEARCH_NONE // the selection is extended in the given direction. -void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart, - const SwLayoutFrm *pEnd, +void MakeSelUnions( SwSelUnions&, const SwLayoutFrame *pStart, + const SwLayoutFrame *pEnd, const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); // These classes copy the current table selections (rBoxes) into a @@ -181,9 +181,9 @@ public: void SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable ); void SetTableLines( const SwTable &rTable ); //Add an input param to identify if acc table should be disposed - void DelFrms ( SwTable &rTable, bool bAccTableDispose = false ); - void MakeFrms( SwTable &rTable ); - void MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber, + void DelFrames ( SwTable &rTable, bool bAccTableDispose = false ); + void MakeFrames( SwTable &rTable ); + void MakeNewFrames( SwTable &rTable, const sal_uInt16 nNumber, const bool bBehind ); bool AreLinesToRestore( const SwTable &rTable ) const; diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index f4fb97a3dc6d..d72ba4da5311 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -60,7 +60,7 @@ public: static void getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue); /// Similar to syncProperty(), but used by the internal API (e.g. for UI purposes). - static void syncFlyFrmAttr(SwFrameFormat& rShape, SfxItemSet& rSet); + static void syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet& rSet); /// If we have an associated TextFrame, then return that. static SwFrameFormat* findTextBox(const SwFrameFormat* pShape); @@ -73,7 +73,7 @@ public: /** * Look up TextFrames in a document, which are in fact TextBoxes. * - * If rNode has a matching SwContentFrm, then only TextBoxes of rNode are + * If rNode has a matching SwContentFrame, then only TextBoxes of rNode are * returned. */ static std::set<const SwFrameFormat*> findTextBoxes(const SwNode& rNode); diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx index 74f78691db0f..b4530d630124 100644 --- a/sw/inc/txtflcnt.hxx +++ b/sw/inc/txtflcnt.hxx @@ -21,36 +21,36 @@ #include <txatbase.hxx> -class SwFlyInCntFrm; -class SwFrm; +class SwFlyInContentFrame; +class SwFrame; class SwTextNode; class SwDoc; // Attribute for line-bound frames (without end index). class SwTextFlyCnt : public SwTextAttr { - SwFlyInCntFrm *_GetFlyFrm( const SwFrm *pCurrFrm ); + SwFlyInContentFrame *_GetFlyFrame( const SwFrame *pCurrFrame ); public: SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStart ); // Sets anchor in pFormat and void SetAnchor( const SwTextNode *pNode ); - inline SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm ); - inline const SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm ) const; + inline SwFlyInContentFrame *GetFlyFrame( const SwFrame *pCurrFrame ); + inline const SwFlyInContentFrame *GetFlyFrame( const SwFrame *pCurrFrame ) const; // creates for itself a new FlyFrameFormat. void CopyFlyFormat( SwDoc* pDoc ); }; -inline SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) +inline SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame( const SwFrame *pCurrFrame ) { - return _GetFlyFrm( pCurrFrm ); + return _GetFlyFrame( pCurrFrame ); } -inline const SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const +inline const SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame( const SwFrame *pCurrFrame ) const { - return (const_cast<SwTextFlyCnt*>(this))->_GetFlyFrm( pCurrFrm ); + return (const_cast<SwTextFlyCnt*>(this))->_GetFlyFrame( pCurrFrame ); } #endif diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx index 2d34daaabae6..daf1bb163bb0 100644 --- a/sw/inc/txtftn.hxx +++ b/sw/inc/txtftn.hxx @@ -27,7 +27,7 @@ class SwNodeIndex; class SwTextNode; class SwNodes; class SwDoc; -class SwFrm; +class SwFrame; class SW_DLLPUBLIC SwTextFootnote : public SwTextAttr { @@ -52,7 +52,7 @@ public: void MakeNewTextSection( SwNodes& rNodes ); // Delete the FootnoteFrame from page. - void DelFrms( const SwFrm* ); + void DelFrames( const SwFrame* ); // Check conditional paragraph styles. void CheckCondColl(); diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index f07aa30f3c74..d83db238ecc5 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -279,8 +279,8 @@ public: class SwUndoInsLayFormat : public SwUndoFlyBase { - sal_uLong mnCrsrSaveIndexPara; // Cursor position - sal_Int32 mnCrsrSaveIndexPos; // for undo + sal_uLong mnCursorSaveIndexPara; // Cursor position + sal_Int32 mnCursorSaveIndexPos; // for undo public: SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx ); @@ -296,7 +296,7 @@ public: class SwUndoDelLayFormat : public SwUndoFlyBase { - bool bShowSelFrm; + bool bShowSelFrame; public: SwUndoDelLayFormat( SwFrameFormat* pFormat ); @@ -305,7 +305,7 @@ public: void RedoForRollback(); - void ChgShowSel( bool bNew ) { bShowSelFrm = bNew; } + void ChgShowSel( bool bNew ) { bShowSelFrame = bNew; } virtual SwRewriter GetRewriter() const override; diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index 8cc22f416205..367af0c47b23 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -29,7 +29,7 @@ class SfxPoolItem; class SwClient; class SwDoc; -class SwUnoTableCrsr; +class SwUnoTableCursor; typedef ::cppu::WeakImplHelper < css::lang::XServiceInfo @@ -79,7 +79,7 @@ private: public: UnoActionRemoveContext(SwDoc *const pDoc); - UnoActionRemoveContext(SwUnoTableCrsr const& rCursor); + UnoActionRemoveContext(SwUnoTableCursor const& rCursor); ~UnoActionRemoveContext(); }; diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 899be66fd332..935db3d705e1 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -263,7 +263,7 @@ class SwChartDataSequence : css::uno::Reference< css::chart2::data::XDataProvider > m_xDataProvider; SwChartDataProvider * m_pDataProvider; - sw::UnoCursorPointer m_pTableCrsr; // cursor spanned over cells to use + sw::UnoCursorPointer m_pTableCursor; // cursor spanned over cells to use const SfxItemPropertySet* m_pPropSet; @@ -279,7 +279,7 @@ protected: public: SwChartDataSequence( SwChartDataProvider &rProvider, SwFrameFormat &rTableFormat, - std::shared_ptr<SwUnoCrsr> pTableCursor ); + std::shared_ptr<SwUnoCursor> pTableCursor ); virtual ~SwChartDataSequence(); static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 902e75530423..9ee9261de581 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -31,7 +31,7 @@ namespace sw }; } -class SwUnoCrsr : public virtual SwCursor, public SwModify +class SwUnoCursor : public virtual SwCursor, public SwModify { private: bool m_bRemainInSection : 1; @@ -39,13 +39,13 @@ private: bool m_bSkipOverProtectSections : 1; public: - SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing = nullptr ); - virtual ~SwUnoCrsr(); + SwUnoCursor( const SwPosition &rPos, SwPaM* pRing = nullptr ); + virtual ~SwUnoCursor(); protected: - virtual const SwContentFrm* DoSetBidiLevelLeftRight( - bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) override; + virtual const SwContentFrame* DoSetBidiLevelLeftRight( + bool & io_rbLeft, bool bVisualAllowed, bool bInsertCursor) override; virtual void DoSetBidiLevelUpDown() override; public: @@ -72,10 +72,10 @@ public: void SetSkipOverHiddenSections( bool bFlag ) { m_bSkipOverHiddenSections = bFlag; } - DECL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr ) + DECL_FIXEDMEMPOOL_NEWDEL( SwUnoCursor ) }; -class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor +class SwUnoTableCursor : public virtual SwUnoCursor, public virtual SwTableCursor { // The selection has the same order as the table boxes, i.e. // if something is deleted from the one array at a certain position @@ -85,8 +85,8 @@ class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor using SwTableCursor::MakeBoxSels; public: - SwUnoTableCrsr( const SwPosition& rPos ); - virtual ~SwUnoTableCrsr(); + SwUnoTableCursor( const SwPosition& rPos ); + virtual ~SwUnoTableCursor(); // Does a selection of content exist in table? // Return value indicates if the cursor remains at its old position. @@ -109,7 +109,7 @@ namespace sw UnoCursorPointer() : m_pCursor(nullptr), m_bSectionRestricted(false) {} - UnoCursorPointer(std::shared_ptr<SwUnoCrsr> pCursor, bool bSectionRestricted=false) + UnoCursorPointer(std::shared_ptr<SwUnoCursor> pCursor, bool bSectionRestricted=false) : m_pCursor(pCursor), m_bSectionRestricted(bSectionRestricted) { m_pCursor->Add(this); @@ -144,9 +144,9 @@ namespace sw if(!GetRegisteredIn()) m_pCursor.reset(); }; - SwUnoCrsr& operator*() const + SwUnoCursor& operator*() const { return *m_pCursor.get(); } - SwUnoCrsr* operator->() const + SwUnoCursor* operator->() const { return m_pCursor.get(); } UnoCursorPointer& operator=(UnoCursorPointer aOther) { @@ -157,7 +157,7 @@ namespace sw } explicit operator bool() const { return static_cast<bool>(m_pCursor); } - void reset(std::shared_ptr<SwUnoCrsr> pNew) + void reset(std::shared_ptr<SwUnoCursor> pNew) { if(pNew) pNew->Add(this); @@ -166,7 +166,7 @@ namespace sw m_pCursor = pNew; } private: - std::shared_ptr<SwUnoCrsr> m_pCursor; + std::shared_ptr<SwUnoCursor> m_pCursor; const bool m_bSectionRestricted; }; } diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 41f83af366ce..50154968fb00 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -35,8 +35,8 @@ struct SfxItemPropertySimpleEntry; class SdrObject; class SwTextNode; class SwCursor; -class SwUnoCrsr; -class SwUnoTableCrsr; +class SwUnoCursor; +class SwUnoTableCursor; class SwFormatColl; struct SwSortOptions; class SwDoc; @@ -81,7 +81,7 @@ namespace SwUnoCursorHelper GetNestedTextContent(SwTextNode & rTextNode, sal_Int32 const nIndex, bool const bParent); - bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry + bool getCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry , SwPaM& rPam , css::uno::Any *pAny , css::beans::PropertyState& eState @@ -89,14 +89,14 @@ namespace SwUnoCursorHelper void GetCurPageStyle(SwPaM& rPaM, OUString &rString); - inline bool IsStartOfPara(SwPaM& rUnoCrsr) - { return rUnoCrsr.GetPoint()->nContent == 0;} - inline bool IsEndOfPara(SwPaM& rUnoCrsr) - { return rUnoCrsr.GetContentNode() && - rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetContentNode()->Len();} + inline bool IsStartOfPara(SwPaM& rUnoCursor) + { return rUnoCursor.GetPoint()->nContent == 0;} + inline bool IsEndOfPara(SwPaM& rUnoCursor) + { return rUnoCursor.GetContentNode() && + rUnoCursor.GetPoint()->nContent == rUnoCursor.GetContentNode()->Len();} - void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam); - void InsertFile(SwUnoCrsr* pUnoCrsr, + void resetCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam); + void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL, const css::uno::Sequence< css::beans::PropertyValue >& rOptions) throw (css::lang::IllegalArgumentException, @@ -133,10 +133,10 @@ namespace SwUnoCursorHelper throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); /// @param bTableMode: attributes should be applied to a table selection - void SetCrsrAttr(SwPaM & rPam, const SfxItemSet & rSet, + void SetCursorAttr(SwPaM & rPam, const SfxItemSet & rSet, const SetAttrMode nAttrMode, const bool bTableMode = false); - void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet, + void GetCursorAttr(SwPaM & rPam, SfxItemSet & rSet, const bool bOnlyTextAttr = false, const bool bGetFromChrFormat = true); void GetTextFromPam(SwPaM & rPam, OUString & rBuffer); @@ -235,7 +235,7 @@ namespace SwUnoCursorHelper css::uno::Reference<css::uno::XInterface> const& xIfc, SwDoc & rTargetDoc, SwPaM *& o_rpPaM, std::pair<OUString, FlyCntType> & o_rFrame, - OUString & o_rTableName, SwUnoTableCrsr const*& o_rpTableCursor, + OUString & o_rTableName, SwUnoTableCursor const*& o_rpTableCursor, ::sw::mark::IMark const*& o_rpMark, std::vector<SdrObject *> & o_rSdrObjects); diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index 9a29e8b82178..4da09be3f151 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -41,7 +41,7 @@ struct SwPosition; class SwPaM; -class SwUnoCrsr; +class SwUnoCursor; class SwStartNode; class SwTextNode; class SwTable; @@ -277,7 +277,7 @@ struct SwXParagraphEnumeration { static SwXParagraphEnumeration* Create( css::uno::Reference< css::text::XText > const & xParent, - std::shared_ptr<SwUnoCrsr> pCursor, + std::shared_ptr<SwUnoCursor> pCursor, const CursorType eType, SwStartNode const*const pStartNode = nullptr, SwTable const*const pTable = nullptr); diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index c04b006e3720..96323c274809 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -270,9 +270,9 @@ public: virtual const SwDoc* GetDoc() const override; virtual SwDoc* GetDoc() override; - const SwUnoCrsr& GetCrsr() const; - SwUnoCrsr& GetCrsr(); - sw::UnoCursorPointer m_pUnoCrsr; + const SwUnoCursor& GetCursor() const; + SwUnoCursor& GetCursor(); + sw::UnoCursorPointer m_pUnoCursor; SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } virtual ~SwXTextTableCursor() { }; }; @@ -456,7 +456,7 @@ class SwXCellRange : public cppu::WeakImplHelper SwRangeDescriptor aRgDesc; const SfxItemPropertySet* m_pPropSet; - sw::UnoCursorPointer m_pTableCrsr; + sw::UnoCursorPointer m_pTableCursor; bool m_bFirstRowAsLabel; bool m_bFirstColumnAsLabel; @@ -465,7 +465,7 @@ class SwXCellRange : public cppu::WeakImplHelper void setLabelDescriptions(const css::uno::Sequence<OUString>& rDesc, bool bRow); public: - SwXCellRange(sw::UnoCursorPointer pCrsr, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc); + SwXCellRange(sw::UnoCursorPointer pCursor, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc); void SetLabels(bool bFirstRowAsLabel, bool bFirstColumnAsLabel) { m_bFirstRowAsLabel = bFirstRowAsLabel, m_bFirstColumnAsLabel = bFirstColumnAsLabel; } virtual ~SwXCellRange() {}; @@ -540,7 +540,7 @@ public: sal_uInt16 getRowCount(); sal_uInt16 getColumnCount(); - const SwUnoCrsr* GetTableCrsr() const; + const SwUnoCursor* GetTableCursor() const; }; class SwXTableRows final : public cppu::WeakImplHelper diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index f8fa7463d2e5..998a092e326d 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -45,7 +45,7 @@ class SwDoc; struct SwPosition; -class SwUnoCrsr; +class SwUnoCursor; typedef ::cppu::WeakImplHelper < css::lang::XServiceInfo @@ -89,7 +89,7 @@ public: SwPaM const& rSourceCursor, const enum CursorType eType = CURSOR_ALL); - SwUnoCrsr& GetCursor(); + SwUnoCursor& GetCursor(); bool IsAtEndOfMeta() const; void DeleteAndInsert(OUString const& rText, diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index 13b020957f0b..785d9dbac41d 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -36,7 +36,7 @@ #include <unobaseclass.hxx> class SwDoc; -class SwUnoCrsr; +class SwUnoCursor; class SwFrameFormat; class SW_DLLPUBLIC SwUnoInternalPaM @@ -252,8 +252,8 @@ typedef ::cppu::WeakImplHelper struct SwXTextRanges : public SwXTextRanges_Base { - virtual SwUnoCrsr* GetCursor() =0; - static SwXTextRanges* Create(SwPaM* const pCrsr); + virtual SwUnoCursor* GetCursor() =0; + static SwXTextRanges* Create(SwPaM* const pCursor); static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); }; diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 222114b118de..87386bbd193a 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -80,7 +80,7 @@ class SwDocShell; class UnoActionContext; class SwXBodyText; class SwXDrawPage; -class SwUnoCrsr; +class SwUnoCursor; class SwXDocumentPropertyHelper; class SfxViewFrame; class SwPrintUIOptions; @@ -448,9 +448,9 @@ public: void InitNewDoc(); - SwUnoCrsr* CreateCursorForSearch(css::uno::Reference< css::text::XTextCursor > & xCrsr); - SwUnoCrsr* FindAny(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc, - css::uno::Reference< css::text::XTextCursor > & xCrsr, bool bAll, + SwUnoCursor* CreateCursorForSearch(css::uno::Reference< css::text::XTextCursor > & xCursor); + SwUnoCursor* FindAny(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc, + css::uno::Reference< css::text::XTextCursor > & xCursor, bool bAll, sal_Int32& nResult, css::uno::Reference< css::uno::XInterface > xLastResult); diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 42b7f9d177d7..a757d79a0234 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -78,7 +78,7 @@ class Graphic; class GraphicFilter; class SwPostItMgr; enum class SotExchangeDest; -class SwCrsrShell; +class SwCursorShell; namespace com{ namespace sun { namespace star { namespace view{ class XSelectionSupplier; } @@ -170,7 +170,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell Timer m_aTimer; // for delayed ChgLnks during an action OUString m_sSwViewData, //and the new cursor position if the user double click in the PagePreview - m_sNewCrsrPos; + m_sNewCursorPos; // to support keyboard the number of the page to go to can be set too sal_uInt16 m_nNewPage; @@ -232,8 +232,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell bool m_bWheelScrollInProgress; - bool m_bCenterCrsr : 1, - m_bTopCrsr : 1, + bool m_bCenterCursor : 1, + m_bTopCursor : 1, m_bAlwaysShowSel : 1, m_bTabColFromDoc : 1, m_bTabRowFromDoc : 1, @@ -284,8 +284,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // scrollbar movements SAL_DLLPRIVATE long PageUp(); SAL_DLLPRIVATE long PageDown(); - SAL_DLLPRIVATE bool PageUpCrsr(bool bSelect); - SAL_DLLPRIVATE bool PageDownCrsr(bool bSelect); + SAL_DLLPRIVATE bool PageUpCursor(bool bSelect); + SAL_DLLPRIVATE bool PageDownCursor(bool bSelect); SAL_DLLPRIVATE long PhyPageUp(); SAL_DLLPRIVATE long PhyPageDown(); @@ -312,7 +312,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell ); SAL_DLLPRIVATE void SpellKontext(bool bOn = true) - { m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; } + { m_bCenterCursor = bOn; m_bAlwaysShowSel = bOn; } // for readonly switching SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -459,7 +459,7 @@ public: bool HandleWheelCommands( const CommandEvent& ); // insert frames - void InsFrmMode(sal_uInt16 nCols); + void InsFrameMode(sal_uInt16 nCols); void SetZoom( SvxZoomType eZoomType, short nFactor = 100, bool bViewOnly = false); virtual void SetZoomFactor( const Fraction &rX, const Fraction & ) override; @@ -539,7 +539,7 @@ public: void StateTabWin(SfxItemSet&); // attributes have changed - DECL_LINK_TYPED( AttrChangedNotify, SwCrsrShell*, void ); + DECL_LINK_TYPED( AttrChangedNotify, SwCursorShell*, void ); // form control has been activated DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void ); @@ -569,10 +569,10 @@ public: virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override; virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override; - void SetCrsrAtTop( bool bFlag, bool bCenter = false ) - { m_bTopCrsr = bFlag, m_bCenterCrsr = bCenter; } - bool IsCrsrAtTop() const { return m_bTopCrsr; } - bool IsCrsrAtCenter() const { return m_bCenterCrsr; } + void SetCursorAtTop( bool bFlag, bool bCenter = false ) + { m_bTopCursor = bFlag, m_bCenterCursor = bCenter; } + bool IsCursorAtTop() const { return m_bTopCursor; } + bool IsCursorAtCenter() const { return m_bCenterCursor; } bool JumpToSwMark( const OUString& rMark ); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index a3cf5b317eed..8f3179039d4d 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -138,7 +138,7 @@ protected: short m_nDivisionY; sal_uInt8 m_nPagePreviewRow; // Page Preview Row/Columns. sal_uInt8 m_nPagePreviewCol; // Page Preview Row/Columns. - sal_uInt8 m_nShadowCrsrFillMode; // FillMode for ShadowCrsr. + sal_uInt8 m_nShadowCursorFillMode; // FillMode for ShadowCursor. bool m_bReadonly : 1; // Readonly-Doc. bool m_bStarOneSetting : 1;// Prevent from UI automatics (no scrollbars in readonly documents). bool m_bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings. @@ -549,8 +549,8 @@ public: bool IsPagePreview() const {return m_bIsPagePreview; } void SetPagePreview(bool bSet) { m_bIsPagePreview= bSet; } - sal_uInt8 GetShdwCrsrFillMode() const { return m_nShadowCrsrFillMode; } - void SetShdwCrsrFillMode( sal_uInt8 nMode ) { m_nShadowCrsrFillMode = nMode; }; + sal_uInt8 GetShdwCursorFillMode() const { return m_nShadowCursorFillMode; } + void SetShdwCursorFillMode( sal_uInt8 nMode ) { m_nShadowCursorFillMode = nMode; }; bool IsShowPlaceHolderFields() const { return m_bShowPlaceHolderFields; } void SetShowPlaceHolderFields(bool bSet) { m_bShowPlaceHolderFields = bSet; } @@ -602,7 +602,7 @@ inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt ) { m_nUIOptions = rVOpt.m_nUIOptions; m_nTableDestination = rVOpt.m_nTableDestination; - m_nShadowCrsrFillMode = rVOpt.m_nShadowCrsrFillMode; + m_nShadowCursorFillMode = rVOpt.m_nShadowCursorFillMode; } // Helper function for checking HTML-capabilities. diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 254e4ec5b840..283ba948f009 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -53,7 +53,7 @@ class IDocumentListItems; class IDocumentOutlineNodes; class SfxPrinter; class SfxProgress; -class SwRootFrm; +class SwRootFrame; class SwNodes; class SdrView; class SfxItemPool; @@ -67,10 +67,10 @@ class OutputDevice; class SwLayIdle; struct ShellResource; class SwRegionRects; -class SwFrm; +class SwFrame; class SvtAccessibilityOptions; class SwPagePreviewLayout; -class SwTextFrm; +class SwTextFrame; class BitmapEx; struct SwAccessibilityOptions; @@ -89,7 +89,7 @@ namespace vcl // Currently the Preview flag is needed for DrawPage. #define VSHELLFLAG_ISPREVIEW ((long)0x1) #define VSHELLFLAG_SHARELAYOUT ((long)0x2) -typedef std::shared_ptr<SwRootFrm> SwRootFrmPtr; +typedef std::shared_ptr<SwRootFrame> SwRootFramePtr; class SwViewShell; class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell> @@ -158,7 +158,7 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell> SdrPaintWindow* mpTargetPaintWindow; VclPtr<OutputDevice> mpBufferedOut; - SwRootFrmPtr mpLayout; + SwRootFramePtr mpLayout; // Initialization; called by the diverse constructors. SAL_DLLPRIVATE void Init( const SwViewOption *pNewOpt ); @@ -278,7 +278,7 @@ public: // Invalidate first visible page for all Shells in ring. void SetFirstVisPageInvalid(); - SwRootFrm *GetLayout() const; + SwRootFrame *GetLayout() const; bool IsNewLayout() const; // Has Layout been loaded or created? Size GetDocSize() const; // Get document size. @@ -511,18 +511,18 @@ public: @author OD - @param _pFromTextFrm + @param _pFromTextFrame input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM has to be invalidated. If NULL, no CONTENT_FLOWS_FROM relation has to be invalidated - @param _pToTextFrm + @param _pToTextFrame input parameter - paragraph frame, for which the relation CONTENT_FLOWS_TO has to be invalidated. If NULL, no CONTENT_FLOWS_TO relation has to be invalidated */ - void InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm, - const SwTextFrm* _pToTextFrm ); + void InvalidateAccessibleParaFlowRelation( const SwTextFrame* _pFromTextFrame, + const SwTextFrame* _pToTextFrame ); /** invalidate text selection for paragraphs @@ -537,10 +537,10 @@ public: @author OD - @param rTextFrm + @param rTextFrame input parameter - paragraph frame, whose attributes have changed */ - void InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm ); + void InvalidateAccessibleParaAttrs( const SwTextFrame& rTextFrame ); SwAccessibleMap* GetAccessibleMap(); @@ -589,7 +589,7 @@ class CurrShell { public: SwViewShell *pPrev; - SwRootFrm *pRoot; + SwRootFrame *pRoot; CurrShell( SwViewShell *pNew ); ~CurrShell(); diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 0e2da96efe14..701e9cd486ed 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -26,22 +26,22 @@ #include "swrect.hxx" #include "swregion.hxx" -class SwCrsrShell; -class SwShellCrsr; +class SwCursorShell; +class SwShellCursor; class SwTextInputField; // From here classes/methods for non-text cursor. -class SwVisCrsr +class SwVisibleCursor { friend void _InitCore(); friend void _FinitCore(); bool m_bIsVisible; - bool m_bIsDragCrsr; + bool m_bIsDragCursor; - vcl::Cursor m_aTextCrsr; - const SwCrsrShell* m_pCrsrShell; + vcl::Cursor m_aTextCursor; + const SwCursorShell* m_pCursorShell; /// For LibreOfficeKit only - remember what page we were at the last time. sal_uInt16 m_nPageLastTime; @@ -49,14 +49,14 @@ class SwVisCrsr void _SetPosAndShow(); public: - SwVisCrsr( const SwCrsrShell * pCShell ); - ~SwVisCrsr(); + SwVisibleCursor( const SwCursorShell * pCShell ); + ~SwVisibleCursor(); void Show(); void Hide(); bool IsVisible() const { return m_bIsVisible; } - void SetDragCrsr( bool bFlag = true ) { m_bIsDragCrsr = bFlag; } + void SetDragCursor( bool bFlag = true ) { m_bIsDragCursor = bFlag; } }; // From here classes/methods for selections. @@ -72,7 +72,7 @@ class SwSelPaintRects : public SwRects static long s_nPixPtX, s_nPixPtY; static MapMode *s_pMapMode; - const SwCrsrShell* m_pCursorShell; + const SwCursorShell* m_pCursorShell; #if HAVE_FEATURE_DESKTOP || defined(ANDROID) sdr::overlay::OverlayObject* m_pCursorOverlay; @@ -88,14 +88,14 @@ class SwSelPaintRects : public SwRects void HighlightInputField(); public: - SwSelPaintRects( const SwCrsrShell& rCSh ); + SwSelPaintRects( const SwCursorShell& rCSh ); virtual ~SwSelPaintRects(); virtual void FillRects() = 0; /// Fill rStart and rEnd with a rectangle that represents the start and end for selection handles. virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) const = 0; - // #i75172# in SwCrsrShell::CreateCrsr() the content of SwSelPaintRects is exchanged. To + // #i75172# in SwCursorShell::CreateCursor() the content of SwSelPaintRects is exchanged. To // make a complete swap access to m_pCursorOverlay is needed there void swapContent(SwSelPaintRects& rSwap); @@ -108,14 +108,14 @@ public: m_bShowTextInputFieldOverlay = bShow; } - const SwCrsrShell* GetShell() const { return m_pCursorShell; } + const SwCursorShell* GetShell() const { return m_pCursorShell; } // check current MapMode of the shell and set possibly the static members. // Optional set the parameters pX, pY static void Get1PixelInLogic( const SwViewShell& rSh, long* pX = nullptr, long* pY = nullptr ); }; -class SwShellCrsr : public virtual SwCursor, public SwSelPaintRects +class SwShellCursor : public virtual SwCursor, public SwSelPaintRects { private: // Document positions of start/end characters of a SSelection. @@ -126,12 +126,12 @@ private: using SwCursor::UpDown; public: - SwShellCrsr( const SwCrsrShell& rCrsrSh, const SwPosition &rPos ); - SwShellCrsr( const SwCrsrShell& rCrsrSh, const SwPosition &rPos, + SwShellCursor( const SwCursorShell& rCursorSh, const SwPosition &rPos ); + SwShellCursor( const SwCursorShell& rCursorSh, const SwPosition &rPos, const Point& rPtPos, SwPaM* pRing = nullptr ); // note: *intentionally* links the new shell cursor into the old one's Ring - SwShellCrsr( SwShellCrsr& ); - virtual ~SwShellCrsr(); + SwShellCursor( SwShellCursor& ); + virtual ~SwShellCursor(); virtual void FillRects() override; // For Table- und normal cursors. /// @see SwSelPaintRects::FillStartEnd(), override for text selections. @@ -164,10 +164,10 @@ public: virtual bool IsReadOnlyAvailable() const override; - DECL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr ) + DECL_FIXEDMEMPOOL_NEWDEL( SwShellCursor ) }; -class SwShellTableCrsr : public virtual SwShellCrsr, public virtual SwTableCursor +class SwShellTableCursor : public virtual SwShellCursor, public virtual SwTableCursor { /// Left edge of the selection start (top left cell). SwRect m_aStart; @@ -178,11 +178,11 @@ class SwShellTableCrsr : public virtual SwShellCrsr, public virtual SwTableCurso // it has to be deleted from the other one as well!! public: - SwShellTableCrsr( const SwCrsrShell& rCrsrSh, const SwPosition& rPos ); - SwShellTableCrsr( const SwCrsrShell& rCrsrSh, + SwShellTableCursor( const SwCursorShell& rCursorSh, const SwPosition& rPos ); + SwShellTableCursor( const SwCursorShell& rCursorSh, const SwPosition &rMkPos, const Point& rMkPt, const SwPosition &rPtPos, const Point& rPtPt ); - virtual ~SwShellTableCrsr(); + virtual ~SwShellTableCursor(); virtual void FillRects() override; // For table and normal cursor. /// @see SwSelPaintRects::FillStartEnd(), override for table selections. |