diff options
Diffstat (limited to 'sw/source/uibase/inc')
24 files changed, 151 insertions, 151 deletions
diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx index 789345253c14..0f47498307b6 100644 --- a/sw/source/uibase/inc/FrameControl.hxx +++ b/sw/source/uibase/inc/FrameControl.hxx @@ -10,8 +10,8 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROL_HXX class SwEditWin; -class SwPageFrm; -class SwFrm; +class SwPageFrame; +class SwFrame; class Point; /// Abstract interface to be implemented by writer FrameControls @@ -25,7 +25,7 @@ public: /// Returns true if the point is inside the control. virtual bool Contains( const Point &rDocPt ) const = 0; - virtual const SwFrm* GetFrame() = 0; + virtual const SwFrame* GetFrame() = 0; virtual SwEditWin* GetEditWin() = 0; }; @@ -51,18 +51,18 @@ public: class SwFrameMenuButtonBase : public MenuButton, public ISwFrameControl { VclPtr<SwEditWin> m_pEditWin; - const SwFrm* m_pFrm; + const SwFrame* m_pFrame; protected: virtual ~SwFrameMenuButtonBase() { disposeOnce(); } virtual void dispose() override; public: - SwFrameMenuButtonBase( SwEditWin* pEditWin, const SwFrm* pFrm ); + SwFrameMenuButtonBase( SwEditWin* pEditWin, const SwFrame* pFrame ); - virtual const SwFrm* GetFrame() override { return m_pFrm; } + virtual const SwFrame* GetFrame() override { return m_pFrame; } virtual SwEditWin* GetEditWin() override { return m_pEditWin; } - const SwPageFrm* GetPageFrame(); + const SwPageFrame* GetPageFrame(); }; #endif diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx b/sw/source/uibase/inc/FrameControlsManager.hxx index 0d9c726955c8..6f0c45f70bab 100644 --- a/sw/source/uibase/inc/FrameControlsManager.hxx +++ b/sw/source/uibase/inc/FrameControlsManager.hxx @@ -18,12 +18,12 @@ #include <memory> #include <vector> -class SwPageFrm; +class SwPageFrame; class SwEditWin; typedef std::shared_ptr< SwFrameControl > SwFrameControlPtr; -typedef std::map<const SwFrm*, SwFrameControlPtr> SwFrameControlPtrMap; +typedef std::map<const SwFrame*, SwFrameControlPtr> SwFrameControlPtrMap; /** A container for the Header/Footer, or PageBreak controls. */ @@ -41,15 +41,15 @@ class SwFrameControlsManager SwFrameControlsManager( const SwFrameControlsManager& rCopy ); const SwFrameControlsManager& operator=( const SwFrameControlsManager& rCopy ); - SwFrameControlPtr GetControl( FrameControlType eType, const SwFrm* pFrm ); - void RemoveControls( const SwFrm* pFrm ); - void RemoveControlsByType( FrameControlType eType, const SwFrm* pFrm ); + SwFrameControlPtr GetControl( FrameControlType eType, const SwFrame* pFrame ); + void RemoveControls( const SwFrame* pFrame ); + void RemoveControlsByType( FrameControlType eType, const SwFrame* pFrame ); void HideControls( FrameControlType eType ); void SetReadonlyControls( bool bReadonly ); // Helper methods - void SetHeaderFooterControl( const SwPageFrm* pPageFrm, FrameControlType eType, Point aOffset ); - void SetPageBreakControl( const SwPageFrm* pPageFrm ); + void SetHeaderFooterControl( const SwPageFrame* pPageFrame, FrameControlType eType, Point aOffset ); + void SetPageBreakControl( const SwPageFrame* pPageFrame ); }; #endif diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index b110421a6d38..ec0980bfaeb0 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -29,7 +29,7 @@ class SwHeaderFooterWin : public SwFrameMenuButtonBase Timer m_aFadeTimer; public: - SwHeaderFooterWin( SwEditWin *pEditWin, const SwFrm *pFrm, bool bHeader ); + SwHeaderFooterWin( SwEditWin *pEditWin, const SwFrame *pFrame, bool bHeader ); virtual ~SwHeaderFooterWin( ); virtual void dispose() override; diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 2302966cb991..6ee987f3e333 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -13,7 +13,7 @@ #include <vcl/menubtn.hxx> -class SwPageFrm; +class SwPageFrame; /** Class for the page break control window. @@ -33,7 +33,7 @@ class SwPageBreakWin : public SwFrameMenuButtonBase const Point* m_pMousePt; public: - SwPageBreakWin( SwEditWin* pEditWin, const SwFrm *pFrm ); + SwPageBreakWin( SwEditWin* pEditWin, const SwFrame *pFrame ); virtual ~SwPageBreakWin(); virtual void dispose() override; diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx index b730c04e45bf..d24a57b5568d 100644 --- a/sw/source/uibase/inc/basesh.hxx +++ b/sw/source/uibase/inc/basesh.hxx @@ -33,7 +33,7 @@ class SwWrtShell; class SwView; class SfxItemSet; -class SwCrsrShell; +class SwCursorShell; struct DBTextStruct_Impl; class SwBaseShell: public SfxShell @@ -50,7 +50,7 @@ class SwBaseShell: public SfxShell // Update-Timer for graphic std::set<sal_uInt16> aGrfUpdateSlots; - DECL_LINK_TYPED( GraphicArrivedHdl, SwCrsrShell&, void ); + DECL_LINK_TYPED( GraphicArrivedHdl, SwCursorShell&, void ); protected: SwWrtShell& GetShell(); @@ -109,9 +109,9 @@ public: void ExecField(SfxRequest& rReq); - static void SetFrmMode( FlyMode eMode, SwWrtShell *pShell ); // with update! - static void _SetFrmMode( FlyMode eMode ) { eFrameMode = eMode; } - static FlyMode GetFrmMode() { return eFrameMode; } + static void SetFrameMode( FlyMode eMode, SwWrtShell *pShell ); // with update! + static void _SetFrameMode( FlyMode eMode ) { eFrameMode = eMode; } + static FlyMode GetFrameMode() { return eFrameMode; } }; #endif diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index 2677f98bf355..41be1655e2d0 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -35,13 +35,13 @@ class SfxPrinter; class SwViewShell; class SwViewOption; class SwContentOptPage; -class SwShdwCrsrOptionsTabPage; +class SwShdwCursorOptionsTabPage; // OS 12.01.95 // Item for settings dialog - document view class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem { - friend class SwShdwCrsrOptionsTabPage; + friend class SwShdwCursorOptionsTabPage; friend class SwModule; bool bParagraphEnd :1; diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index cc6199355338..dbe87433b4f2 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -63,7 +63,7 @@ class SwCharURLPage : public SfxTabPage VclPtr<FixedText> m_pTextFT; VclPtr<Edit> m_pTextED; VclPtr<Edit> m_pNameED; - VclPtr<ComboBox> m_pTargetFrmLB; + VclPtr<ComboBox> m_pTargetFrameLB; VclPtr<PushButton> m_pURLPB; VclPtr<PushButton> m_pEventPB; VclPtr<ListBox> m_pVisitedLB; diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 76c5ee383af5..529c682add4f 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwColumnOnlyExample : public vcl::Window private: Size m_aWinSize; - Size m_aFrmSize; + Size m_aFrameSize; SwFormatCol m_aCols; protected: diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index d956356ba852..79e5939cbaa8 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -120,7 +120,7 @@ class SwColumnPage : public SfxTabPage // Example VclPtr<SwColExample> m_pPgeExampleWN; - VclPtr<SwColumnOnlyExample> m_pFrmExampleWN; + VclPtr<SwColumnOnlyExample> m_pFrameExampleWN; SwColMgr* pColMgr; @@ -134,7 +134,7 @@ class SwColumnPage : public SfxTabPage std::map<VclPtr<MetricField>, PercentField*> m_aPercentFieldsMap; bool bFormat; - bool bFrm; + bool bFrame; bool bHtmlMode; bool bLockUpdate; @@ -181,7 +181,7 @@ public: virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; - void SetFrmMode(bool bMod); + void SetFrameMode(bool bMod); void SetPageWidth(long nPageWidth); void SetFormatUsed(bool bFormatUsed) diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 56cc43888832..41db7bff8f97 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -102,7 +102,7 @@ friend void PageNumNotify( SwViewShell* pVwSh, SdrDropMarkerOverlay *m_pUserMarker; SdrObject *m_pUserMarkerObj; - SwShadowCursor *m_pShadCrsr; + SwShadowCursor *m_pShadCursor; Point *m_pRowColumnSelectionStart; // save position where table row/column selection has been started SwView &m_rView; @@ -114,11 +114,11 @@ friend void PageNumNotify( SwViewShell* pVwSh, SotExchangeDest m_nDropDestination; // destination from the last QueryDrop sal_uInt16 m_eBezierMode; - sal_uInt16 m_nInsFrmColCount; // column number for interactive frame + sal_uInt16 m_nInsFrameColCount; // column number for interactive frame SdrObjKind m_eDrawMode; bool m_bMBPressed : 1, m_bInsDraw : 1, - m_bInsFrm : 1, + m_bInsFrame : 1, m_bIsInMove : 1, m_bIsInDrag : 1, // don't execute StartExecuteDrag twice m_bOldIdle : 1, // to stop to idle @@ -126,7 +126,7 @@ friend void PageNumNotify( SwViewShell* pVwSh, m_bTableInsDelMode : 1, m_bTableIsInsMode : 1, m_bChainMode : 1, // connect frames - m_bWasShdwCrsr : 1, // ShadowCrsr was on in MouseButtonDown + m_bWasShdwCursor : 1, // ShadowCursor was on in MouseButtonDown m_bLockInput : 1, // lock while calc panel is active m_bIsRowDrag : 1, //selection of rows is used, in combination with m_pRowColumnSelectionStart /** #i42732# display status of font size/name depending on either the input language or the @@ -230,19 +230,19 @@ public: inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( false ); } void StdDrawMode( SdrObjKind eSdrObjectKind, bool bObjSelect ); - bool IsFrmAction() const { return m_bInsFrm; } + bool IsFrameAction() const { return m_bInsFrame; } sal_uInt16 GetBezierMode() const { return m_eBezierMode; } void SetBezierMode(sal_uInt16 eBezMode) { m_eBezierMode = eBezMode; } void EnterDrawTextMode(const Point& aDocPos); // turn on DrawTextEditMode - void InsFrm(sal_uInt16 nCols); - void StopInsFrm(); - sal_uInt16 GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame + void InsFrame(sal_uInt16 nCols); + void StopInsFrame(); + sal_uInt16 GetFrameColCount() const {return m_nInsFrameColCount;} // column number for interactive frame void SetChainMode( bool bOn ); bool IsChainMode() const { return m_bChainMode; } void FlushInBuffer(); - static bool IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ); + static bool IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCursor ); void SetApplyTemplate(const SwApplyTemplate &); SwApplyTemplate* GetApplyTemplate() const { return m_pApplyTempl; } diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index 387ba8853498..418bdcdcc4a9 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -25,7 +25,7 @@ class SwWrtShell; // frame dialog -class SwFrmDlg : public SfxTabDialog +class SwFrameDlg : public SfxTabDialog { bool m_bFormat; bool m_bNew; @@ -50,15 +50,15 @@ class SwFrmDlg : public SfxTabDialog virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: - SwFrmDlg( SfxViewFrame *pFrame, vcl::Window *pParent, + SwFrameDlg( SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, - bool bNewFrm = false, + bool bNewFrame = false, const OUString& sResType = OUString("FrameDialog"), bool bFormat = false, const OString& sDefPage = OString(), const OUString* pFormatStr = nullptr); - virtual ~SwFrmDlg(); + virtual ~SwFrameDlg(); SwWrtShell* GetWrtShell() { return m_pWrtShell; } }; diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx index 6ee012fd3727..4093edc8bdd1 100644 --- a/sw/source/uibase/inc/frmmgr.hxx +++ b/sw/source/uibase/inc/frmmgr.hxx @@ -45,14 +45,14 @@ const SwTwips DFLT_HEIGHT = MM50; #define FRMMGR_TYPE_OLE 0x04 #define FRMMGR_TYPE_ENVELP 0x10 -class SW_DLLPUBLIC SwFlyFrmAttrMgr +class SW_DLLPUBLIC SwFlyFrameAttrMgr { SfxItemSet m_aSet; Point m_aAbsPos; SwWrtShell* m_pOwnSh; bool m_bAbsPos, - m_bNewFrm; + m_bNewFrame; bool m_bIsInVertical; // --> OD 2009-09-01 #mongolianlayout# bool m_bIsInVerticalL2R; @@ -63,13 +63,13 @@ class SW_DLLPUBLIC SwFlyFrmAttrMgr SAL_DLLPRIVATE SwTwips CalcLeftSpace(); SAL_DLLPRIVATE SwTwips CalcRightSpace(); - SAL_DLLPRIVATE void _UpdateFlyFrm(); // post-treatment after insert or update + SAL_DLLPRIVATE void _UpdateFlyFrame(); // post-treatment after insert or update public: - SwFlyFrmAttrMgr( bool bNew, SwWrtShell* pSh, sal_uInt8 nType ); + SwFlyFrameAttrMgr( bool bNew, SwWrtShell* pSh, sal_uInt8 nType ); //CopyCtor for dialogs to check the metrics - SwFlyFrmAttrMgr( bool bNew, SwWrtShell *pSh, const SfxItemSet &rSet ); + SwFlyFrameAttrMgr( bool bNew, SwWrtShell *pSh, const SfxItemSet &rSet ); void SetAnchor(RndStdIds eId); inline RndStdIds GetAnchor() const; @@ -88,7 +88,7 @@ public: void SetSize(const Size& rLSize); inline const Size& GetSize() const; - void SetHeightSizeType(SwFrmSize eType); + void SetHeightSizeType(SwFrameSize eType); // space to content void SetLRSpace( long nLeft = LONG_MAX, @@ -100,11 +100,11 @@ public: // change and query attributes void UpdateAttrMgr(); - void UpdateFlyFrm(); + void UpdateFlyFrame(); // create new frame - bool InsertFlyFrm(); - void InsertFlyFrm(RndStdIds eAnchorType, + bool InsertFlyFrame(); + void InsertFlyFrame(RndStdIds eAnchorType, const Point &rPos, const Size &rSize, bool bAbsPos = false); @@ -125,42 +125,42 @@ public: inline const SwFormatHoriOrient &GetHoriOrient() const; inline const SvxShadowItem &GetShadow() const; inline const SvxBoxItem &GetBox() const; - inline const SwFormatFrmSize &GetFrmSize() const; + inline const SwFormatFrameSize &GetFrameSize() const; long CalcWidthBorder() { return CalcLeftSpace()+CalcRightSpace(); } long CalcHeightBorder() { return CalcTopSpace()+CalcBottomSpace(); } }; -inline const Size& SwFlyFrmAttrMgr::GetSize() const +inline const Size& SwFlyFrameAttrMgr::GetSize() const { - return static_cast<const SwFormatFrmSize&>(m_aSet.Get(RES_FRM_SIZE)).GetSize(); + return static_cast<const SwFormatFrameSize&>(m_aSet.Get(RES_FRM_SIZE)).GetSize(); } -inline const SwFormatVertOrient &SwFlyFrmAttrMgr::GetVertOrient() const +inline const SwFormatVertOrient &SwFlyFrameAttrMgr::GetVertOrient() const { return static_cast<const SwFormatVertOrient&>(m_aSet.Get(RES_VERT_ORIENT)); } -inline const SwFormatHoriOrient &SwFlyFrmAttrMgr::GetHoriOrient() const +inline const SwFormatHoriOrient &SwFlyFrameAttrMgr::GetHoriOrient() const { return static_cast<const SwFormatHoriOrient &>(m_aSet.Get(RES_HORI_ORIENT)); } -inline const SwFormatFrmSize& SwFlyFrmAttrMgr::GetFrmSize() const +inline const SwFormatFrameSize& SwFlyFrameAttrMgr::GetFrameSize() const { - return static_cast<const SwFormatFrmSize&>(m_aSet.Get(RES_FRM_SIZE)); + return static_cast<const SwFormatFrameSize&>(m_aSet.Get(RES_FRM_SIZE)); } -inline const SvxShadowItem &SwFlyFrmAttrMgr::GetShadow() const +inline const SvxShadowItem &SwFlyFrameAttrMgr::GetShadow() const { return static_cast<const SvxShadowItem&>(m_aSet.Get(RES_SHADOW)); } -inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const +inline const SvxBoxItem &SwFlyFrameAttrMgr::GetBox() const { return static_cast<const SvxBoxItem&>(m_aSet.Get(RES_BOX)); } -inline Point SwFlyFrmAttrMgr::GetPos() const +inline Point SwFlyFrameAttrMgr::GetPos() const { return Point( GetHoriOrient().GetPos(), GetVertOrient().GetPos() ); } -inline RndStdIds SwFlyFrmAttrMgr::GetAnchor() const +inline RndStdIds SwFlyFrameAttrMgr::GetAnchor() const { return static_cast<const SwFormatAnchor&>(m_aSet.Get(RES_ANCHOR)).GetAnchorId(); } diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 27ab4f4d5744..1a0594d8abc3 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -34,12 +34,12 @@ namespace sfx2{class FileDialogHelper;} class SwWrtShell; -struct FrmMap; +struct FrameMap; // OD 12.11.2003 #i22341# struct SwPosition; // frame dialog -class SwFrmPage: public SfxTabPage +class SwFramePage: public SfxTabPage { // size VclPtr<FixedText> m_pWidthFT; @@ -120,8 +120,8 @@ class SwFrmPage: public SfxTabPage sal_Int16 m_nOldV; sal_Int16 m_nOldVRel; - FrmMap* m_pVMap; - FrmMap* m_pHMap; + FrameMap* m_pVMap; + FrameMap* m_pHMap; bool m_bAllowVertPositioning; bool m_bIsMathOLE; @@ -154,29 +154,29 @@ class SwFrmPage: public SfxTabPage void Init(const SfxItemSet& rSet, bool bReset = false); // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous // in the alignment. - sal_Int32 FillPosLB( const FrmMap* _pMap, + sal_Int32 FillPosLB( const FrameMap* _pMap, const sal_Int16 _nAlign, const sal_Int16 _nRel, ListBox& _rLB ); // OD 14.11.2003 #i22341# - adjustment to handle maps, that are ambigous // in their string entries. - sal_uLong FillRelLB( const FrmMap* _pMap, + sal_uLong FillRelLB( const FrameMap* _pMap, const sal_uInt16 _nLBSelPos, const sal_Int16 _nAlign, const sal_Int16 _nRel, ListBox& _rLB, FixedText& _rFT ); - sal_Int32 GetMapPos( const FrmMap *pMap, ListBox &rAlignLB ); - static sal_Int16 GetAlignment(FrmMap *pMap, sal_Int32 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB); - static sal_Int16 GetRelation(FrmMap *pMap, ListBox &rRelationLB); + sal_Int32 GetMapPos( const FrameMap *pMap, ListBox &rAlignLB ); + static sal_Int16 GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB); + static sal_Int16 GetRelation(FrameMap *pMap, ListBox &rRelationLB); RndStdIds GetAnchor(); - void setOptimalFrmWidth(); + void setOptimalFrameWidth(); void setOptimalRelWidth(); void EnableGraficMode(); // hides auto check boxes and re-org controls for "Real Size" button - SwWrtShell *getFrmDlgParentShell(); + SwWrtShell *getFrameDlgParentShell(); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -184,8 +184,8 @@ class SwFrmPage: public SfxTabPage static const sal_uInt16 aPageRg[]; public: - SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet); - virtual ~SwFrmPage(); + SwFramePage(vcl::Window *pParent, const SfxItemSet &rSet); + virtual ~SwFramePage(); virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); @@ -196,7 +196,7 @@ public: void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } void SetFormatUsed(bool bFormat); - void SetFrmType(const OUString &rType) { m_sDlgType = rType; } + void SetFrameType(const OUString &rType) { m_sDlgType = rType; } inline bool IsInGraficMode() { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; } void EnableVerticalPositioning( bool bEnable ); }; @@ -243,7 +243,7 @@ public: virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; }; -class SwFrmURLPage : public SfxTabPage +class SwFrameURLPage : public SfxTabPage { // hyperlink VclPtr<Edit> pURLED; @@ -261,8 +261,8 @@ class SwFrmURLPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: - SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet); - virtual ~SwFrmURLPage(); + SwFrameURLPage(vcl::Window *pParent, const SfxItemSet &rSet); + virtual ~SwFrameURLPage(); virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); @@ -271,7 +271,7 @@ public: virtual void Reset(const SfxItemSet *rSet) override; }; -class SwFrmAddPage : public SfxTabPage +class SwFrameAddPage : public SfxTabPage { VclPtr<VclContainer> m_pNameFrame; VclPtr<FixedText> m_pNameFT; @@ -310,8 +310,8 @@ class SwFrmAddPage : public SfxTabPage static const sal_uInt16 aAddPgRg[]; public: - SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet); - virtual ~SwFrmAddPage(); + SwFrameAddPage(vcl::Window *pParent, const SfxItemSet &rSet); + virtual ~SwFrameAddPage(); virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); @@ -321,7 +321,7 @@ public: virtual void Reset(const SfxItemSet *rSet) override; void SetFormatUsed(bool bFormat); - void SetFrmType(const OUString &rType) { m_sDlgType = rType; } + void SetFrameType(const OUString &rType) { m_sDlgType = rType; } void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } void SetShell(SwWrtShell* pSh) { m_pWrtSh = pSh; } diff --git a/sw/source/uibase/inc/initui.hxx b/sw/source/uibase/inc/initui.hxx index 1cf7a3e75454..b98220511877 100644 --- a/sw/source/uibase/inc/initui.hxx +++ b/sw/source/uibase/inc/initui.hxx @@ -39,8 +39,8 @@ SW_DLLPUBLIC OUString GetOldGrfCat(); SW_DLLPUBLIC void SetOldGrfCat(const OUString& sStr); SW_DLLPUBLIC OUString GetOldTabCat(); SW_DLLPUBLIC void SetOldTabCat(const OUString& sStr); -SW_DLLPUBLIC OUString GetOldFrmCat(); -SW_DLLPUBLIC void SetOldFrmCat(const OUString& sStr); +SW_DLLPUBLIC OUString GetOldFrameCat(); +SW_DLLPUBLIC void SetOldFrameCat(const OUString& sStr); SW_DLLPUBLIC OUString GetOldDrwCat(); SW_DLLPUBLIC void SetOldDrwCat(const OUString& sStr); diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx index d462cf0a7736..96288ba467db 100644 --- a/sw/source/uibase/inc/navmgr.hxx +++ b/sw/source/uibase/inc/navmgr.hxx @@ -19,14 +19,14 @@ class SwWrtShell; struct SwPosition; -class SwUnoCrsr; +class SwUnoCursor; class SwNavigationMgr { private: /* * List of entries in the navigation history - * Entries are SwUnoCrsr because these gets corrected automatically + * Entries are SwUnoCursor because these gets corrected automatically * when nodes are deleted. * * The navigation history behaves as a stack, to which items are added when we jump to a new position diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index cb125f858d46..03d65cdfff5d 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -236,8 +236,8 @@ public: }; -// TabPage for ShadowCrsr -class SwShdwCrsrOptionsTabPage : public SfxTabPage +// TabPage for ShadowCursor +class SwShdwCursorOptionsTabPage : public SfxTabPage { //nonprinting characters VclPtr<CheckBox> m_pParaCB; @@ -259,7 +259,7 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage VclPtr<RadioButton> m_pFillSpaceRB; VclPtr<VclFrame> m_pCursorProtFrame; - VclPtr<CheckBox> m_pCrsrInProtCB; + VclPtr<CheckBox> m_pCursorInProtCB; VclPtr<CheckBox> m_pIgnoreProtCB; VclPtr<CheckBox> m_pMathBaselineAlignmentCB; @@ -267,8 +267,8 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage SwWrtShell * m_pWrtShell; public: - SwShdwCrsrOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SwShdwCrsrOptionsTabPage(); + SwShdwCursorOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SwShdwCursorOptionsTabPage(); virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 0c97e69b2d31..35cb5ef488fe 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -166,7 +166,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell //viewdata of the previous SwView and the new crsrposition OUString sSwViewData; //and the new cursor position if the user double click in the PagePreview - OUString sNewCrsrPos; + OUString sNewCursorPos; // to support keyboard the number of the page to go to can be set too sal_uInt16 nNewPage; // visible range @@ -256,8 +256,8 @@ public: bool HandleWheelCommands( const CommandEvent& ); OUString GetPrevSwViewData() const { return sSwViewData; } - void SetNewCrsrPos( const OUString& rStr ) { sNewCrsrPos = rStr; } - const OUString& GetNewCrsrPos() const { return sNewCrsrPos; } + void SetNewCursorPos( const OUString& rStr ) { sNewCursorPos = rStr; } + const OUString& GetNewCursorPos() const { return sNewCursorPos; } sal_uInt16 GetNewPage() const {return nNewPage;} void SetNewPage(sal_uInt16 nSet) {nNewPage = nSet;} diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx index 96002be9516d..46dae2953a6f 100644 --- a/sw/source/uibase/inc/shdwcrsr.hxx +++ b/sw/source/uibase/inc/shdwcrsr.hxx @@ -34,7 +34,7 @@ class SwShadowCursor sal_uInt16 nOldMode; void DrawTri( const Point& rPt, long nHeight, bool bLeft ); - void DrawCrsr( const Point& rPt, long nHeight, sal_uInt16 nMode ); + void DrawCursor( const Point& rPt, long nHeight, sal_uInt16 nMode ); public: SwShadowCursor( vcl::Window& rWin, const Color& rCol ) diff --git a/sw/source/uibase/inc/tabsh.hxx b/sw/source/uibase/inc/tabsh.hxx index 1ae2653d4964..607a65b0de99 100644 --- a/sw/source/uibase/inc/tabsh.hxx +++ b/sw/source/uibase/inc/tabsh.hxx @@ -41,7 +41,7 @@ private: public: void Execute(SfxRequest &); void GetState(SfxItemSet &); - void GetFrmBorderState(SfxItemSet &rSet); + void GetFrameBorderState(SfxItemSet &rSet); void GetLineStyleState(SfxItemSet &rSet); void ExecTableStyle(SfxRequest& rReq); diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx index e28067d44830..366a7ae2fed7 100644 --- a/sw/source/uibase/inc/textsh.hxx +++ b/sw/source/uibase/inc/textsh.hxx @@ -25,7 +25,7 @@ class AbstractSvxPostItDialog; class SwFieldMgr; -class SwFlyFrmAttrMgr; +class SwFlyFrameAttrMgr; class SvxHyperlinkItem; class SW_DLLPUBLIC SwTextShell: public SwBaseShell @@ -80,7 +80,7 @@ public: SwTextShell(SwView &rView); virtual ~SwTextShell(); /// Create item set for the insert frame dialog. - SfxItemSet CreateInsertFrameItemSet(SwFlyFrmAttrMgr& rMgr); + SfxItemSet CreateInsertFrameItemSet(SwFlyFrameAttrMgr& rMgr); }; void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ); diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index 3ae07ead1bd2..7713246fc059 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -151,15 +151,15 @@ public: #endif //#i33307# restore editing position - void SetRestorePosition(const Point& rCrsrPos, bool bSelectObj) + void SetRestorePosition(const Point& rCursorPos, bool bSelectObj) { - m_aEditingPosition = rCrsrPos; + m_aEditingPosition = rCursorPos; m_bSelectObject = bSelectObj; m_bEditingPositionSet = true; } - bool GetRestorePosition(Point& rCrsrPos, bool& rbSelectObj) + bool GetRestorePosition(Point& rCursorPos, bool& rbSelectObj) { - rCrsrPos = m_aEditingPosition; + rCursorPos = m_aEditingPosition; rbSelectObj = m_bSelectObject; return m_bEditingPositionSet; } diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 4164dd6dfe6d..f551e8f2efaa 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -36,11 +36,11 @@ class SwOneExampleFrame; -class SwFrmCtrlWindow : public VclEventBox +class SwFrameCtrlWindow : public VclEventBox { SwOneExampleFrame* pExampleFrame; public: - SwFrmCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame); + SwFrameCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame); virtual void Command( const CommandEvent& rCEvt ) override; virtual Size GetOptimalSize() const override; @@ -73,7 +73,7 @@ class SW_DLLPUBLIC SwOneExampleFrame css::uno::Reference< css::frame::XController > _xController; css::uno::Reference< css::text::XTextCursor > _xCursor; - VclPtr<SwFrmCtrlWindow> aTopWindow; + VclPtr<SwFrameCtrlWindow> aTopWindow; Idle aLoadedIdle; Link<SwOneExampleFrame&,void> aInitializedLink; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 17c2cb714c1c..940941870536 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -68,7 +68,7 @@ class SwWrapTabPage: public SfxTabPage RndStdIds m_nAnchorId; sal_uInt16 m_nHtmlMode; - Size m_aFrmSize; + Size m_aFrameSize; SwWrtShell* m_pWrtSh; bool m_bFormat; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 8ab49ef721d0..d5fd8817bb34 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -32,7 +32,7 @@ namespace vcl { class Window; } class SbxArray; class SwDoc; class SwViewOption; -class SwFlyFrmAttrMgr; +class SwFlyFrameAttrMgr; class SwField; class SwTOXBase; class SwView; @@ -80,22 +80,22 @@ string, and take care of undo etc. class SW_DLLPUBLIC SwWrtShell: public SwFEShell { private: - using SwCrsrShell::Left; - using SwCrsrShell::Right; - using SwCrsrShell::Up; - using SwCrsrShell::Down; - using SwCrsrShell::LeftMargin; - using SwCrsrShell::RightMargin; - using SwCrsrShell::SelectTextAttr; - using SwCrsrShell::GotoPage; + using SwCursorShell::Left; + using SwCursorShell::Right; + using SwCursorShell::Up; + using SwCursorShell::Down; + using SwCursorShell::LeftMargin; + using SwCursorShell::RightMargin; + using SwCursorShell::SelectTextAttr; + using SwCursorShell::GotoPage; using SwFEShell::InsertObject; using SwEditShell::AutoCorrect; - using SwCrsrShell::GotoMark; + using SwCursorShell::GotoMark; typedef long (SwWrtShell::*SELECTFUNC)(const Point *, bool bProp ); SELECTFUNC m_fnDrag; - SELECTFUNC m_fnSetCrsr; + SELECTFUNC m_fnSetCursor; SELECTFUNC m_fnEndDrag; SELECTFUNC m_fnKillSel; @@ -103,7 +103,7 @@ public: using SwEditShell::Insert; - long CallSetCursor(const Point* pPt, bool bProp) { return (this->*m_fnSetCrsr)(pPt, bProp); } + long CallSetCursor(const Point* pPt, bool bProp) { return (this->*m_fnSetCursor)(pPt, bProp); } long Drag (const Point* pPt, bool bProp) { return (this->*m_fnDrag)(pPt, bProp); } long EndDrag (const Point* pPt, bool bProp) { return (this->*m_fnEndDrag)(pPt, bProp); } long KillSelection(const Point* pPt, bool bProp) { return (this->*m_fnKillSel)(pPt, bProp); } @@ -124,9 +124,9 @@ public: bool IsInSelect() const { return m_bInSelect; } void SetInSelect(bool bSel = true) { m_bInSelect = bSel; } // is there a text- or frameselection? - bool HasSelection() const { return SwCrsrShell::HasSelection() || - IsMultiSelection() || IsSelFrmMode() || IsObjSelected(); } - bool Pop( bool bOldCrsr = true ); + bool HasSelection() const { return SwCursorShell::HasSelection() || + IsMultiSelection() || IsSelFrameMode() || IsObjSelected(); } + bool Pop( bool bOldCursor = true ); void EnterStdMode(); bool IsStdMode() const { return !m_bExtMode && !m_bAddMode && !m_bBlockMode; } @@ -151,11 +151,11 @@ public: bool IsInsMode() const { return m_bIns; } void SetRedlineModeAndCheckInsMode( sal_uInt16 eMode ); - void EnterSelFrmMode(const Point *pStartDrag = nullptr); - void LeaveSelFrmMode(); - bool IsSelFrmMode() const { return m_bLayoutMode; } + void EnterSelFrameMode(const Point *pStartDrag = nullptr); + void LeaveSelFrameMode(); + bool IsSelFrameMode() const { return m_bLayoutMode; } // reset selection of frames - void UnSelectFrm(); + void UnSelectFrame(); void Invalidate(); @@ -244,12 +244,12 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); // setting the cursor; remember the old position for turning back DECL_LINK_TYPED( ExecFlyMac, const SwFlyFrameFormat*, void ); - bool PageCrsr(SwTwips lOffset, bool bSelect); + bool PageCursor(SwTwips lOffset, bool bSelect); // update fields void UpdateInputFields( SwInputFieldList* pLst = nullptr ); - void NoEdit(bool bHideCrsr = true); + void NoEdit(bool bHideCursor = true); void Edit(); bool IsRetainSelection() const { return m_bRetainSelection; } @@ -264,7 +264,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); long DelLine(); long DelLeft(); - // also deletes the frame or sets the cursor in the frame when bDelFrm == false + // also deletes the frame or sets the cursor in the frame when bDelFrame == false long DelRight(); long DelToEndOfPara(); long DelToStartOfPara(); @@ -290,7 +290,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void Insert(const OUString &); // graphic void Insert( const OUString &rPath, const OUString &rFilter, - const Graphic &, SwFlyFrmAttrMgr * = nullptr, + const Graphic &, SwFlyFrameAttrMgr * = nullptr, bool bRule = false ); void InsertByWord( const OUString & ); @@ -329,10 +329,10 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) override; virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = nullptr, - const SwRect *pFlyFrmRect = nullptr, - const bool bNoTextFrmPrtAreaChanged = false ) override; + const SwRect *pFlyFrameRect = nullptr, + const bool bNoTextFramePrtAreaChanged = false ) override; virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt, - const SwRect &rFrm ) override; + const SwRect &rFrame ) override; // styles and formats @@ -349,7 +349,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void SetPageStyle(const OUString &rCollName); - OUString GetCurPageStyle( const bool bCalcFrm = true ) const; + OUString GetCurPageStyle( const bool bCalcFrame = true ) const; // change current style using the attributes in effect void QuickUpdateStyle(); @@ -384,7 +384,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); // action ahead of cursor movement // resets selection if applicable, triggers timer and GCAttr() - void MoveCrsr( bool bWithSelect = false ); + void MoveCursor( bool bWithSelect = false ); // update input fields bool StartInputFieldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = nullptr, OString* pWindowState = nullptr); @@ -500,35 +500,35 @@ private: MV_PAGE_DOWN } m_ePageMove; - struct CrsrStack + struct CursorStack { Point aDocPos; - CrsrStack *pNext; + CursorStack *pNext; bool bValidCurPos : 1; - bool bIsFrmSel : 1; + bool bIsFrameSel : 1; SwTwips lOffset; - CrsrStack( bool bValid, bool bFrmSel, const Point &rDocPos, - SwTwips lOff, CrsrStack *pN ) + CursorStack( bool bValid, bool bFrameSel, const Point &rDocPos, + SwTwips lOff, CursorStack *pN ) : aDocPos(rDocPos), pNext(pN), bValidCurPos( bValid ), - bIsFrmSel( bFrmSel ), + bIsFrameSel( bFrameSel ), lOffset(lOff) { } - } *m_pCrsrStack; + } *m_pCursorStack; SwView &m_rView; SwNavigationMgr m_aNavigationMgr; Point m_aDest; bool m_bDestOnStack; - bool HasCrsrStack() const { return nullptr != m_pCrsrStack; } - SAL_DLLPRIVATE bool PushCrsr(SwTwips lOffset, bool bSelect); - SAL_DLLPRIVATE bool PopCrsr(bool bUpdate, bool bSelect = false); + bool HasCursorStack() const { return nullptr != m_pCursorStack; } + SAL_DLLPRIVATE bool PushCursor(SwTwips lOffset, bool bSelect); + SAL_DLLPRIVATE bool PopCursor(bool bUpdate, bool bSelect = false); // take END cursor along when PageUp / -Down SAL_DLLPRIVATE bool _SttWrd(); @@ -563,10 +563,10 @@ private: // resets the cursor stack after movement by PageUp/-Down SAL_DLLPRIVATE void _ResetCursorStack(); - using SwCrsrShell::SetCrsr; - SAL_DLLPRIVATE long SetCrsr(const Point *, bool bProp=false ); + using SwCursorShell::SetCursor; + SAL_DLLPRIVATE long SetCursor(const Point *, bool bProp=false ); - SAL_DLLPRIVATE long SetCrsrKillSel(const Point *, bool bProp=false ); + SAL_DLLPRIVATE long SetCursorKillSel(const Point *, bool bProp=false ); SAL_DLLPRIVATE long BeginDrag(const Point *, bool bProp=false ); SAL_DLLPRIVATE long DefaultDrag(const Point *, bool bProp=false ); @@ -575,10 +575,10 @@ private: SAL_DLLPRIVATE long ExtSelWrd(const Point *, bool bProp=false ); SAL_DLLPRIVATE long ExtSelLn(const Point *, bool bProp=false ); - SAL_DLLPRIVATE long BeginFrmDrag(const Point *, bool bProp=false ); + SAL_DLLPRIVATE long BeginFrameDrag(const Point *, bool bProp=false ); // after SSize/Move of a frame update; Point is destination. - SAL_DLLPRIVATE long UpdateLayoutFrm(const Point *, bool bProp=false ); + SAL_DLLPRIVATE long UpdateLayoutFrame(const Point *, bool bProp=false ); SAL_DLLPRIVATE long SttLeaveSelect(const Point *, bool bProp=false ); SAL_DLLPRIVATE long AddLeaveSelect(const Point *, bool bProp=false ); @@ -603,7 +603,7 @@ private: inline void SwWrtShell::ResetCursorStack() { - if ( HasCrsrStack() ) + if ( HasCursorStack() ) _ResetCursorStack(); } |