summaryrefslogtreecommitdiffstats
path: root/include/svx
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2021-09-28 19:12:40 +0200
committerTomaž Vajngerl <quikee@gmail.com>2021-10-07 23:40:05 +0200
commit93115d2c54d645bcf2f80fde325e3ede39dee4d5 (patch)
treec7310399494b388016df181e54ae47a700961666 /include/svx
parentMatch order of the beginning of fldunit.hxx with FieldUnit.idl (diff)
downloadcore-93115d2c54d645bcf2f80fde325e3ede39dee4d5.tar.gz
core-93115d2c54d645bcf2f80fde325e3ede39dee4d5.zip
svx: add "m" prefix to some member variables in SdrObjEditView
Change-Id: I2877f63d97ff6d15f08bd2dbaee6128b8a689cc5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123219 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/svdedxv.hxx54
1 files changed, 36 insertions, 18 deletions
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 7f25e3cfc459..a4f457c9aeba 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -76,16 +76,16 @@ class SVXCORE_DLLPUBLIC SdrObjEditView : public SdrGlueEditView, public EditView
// The OverlayObjects used for visualizing active TextEdit (currently
// using TextEditOverlayObject, but not limited to it
- sdr::overlay::OverlayObjectList maTEOverlayGroup;
+ sdr::overlay::OverlayObjectList maTEOverlayGroup;
protected:
// TextEdit
- tools::WeakReference<SdrTextObj>
- mxTextEditObj; // current object in TextEdit
- SdrPageView* pTextEditPV;
- std::unique_ptr<SdrOutliner> pTextEditOutliner; // outliner for the TextEdit
- OutlinerView* pTextEditOutlinerView; // current view of the outliners
- VclPtr<vcl::Window> pTextEditWin; // matching window to pTextEditOutlinerView
+ tools::WeakReference<SdrTextObj> mxTextEditObj; // current object in TextEdit
+ SdrPageView* mpTextEditPV;
+ std::unique_ptr<SdrOutliner> mpTextEditOutliner; // outliner for the TextEdit
+ OutlinerView* mpTextEditOutlinerView; // current view of the outliners
+ VclPtr<vcl::Window> mpTextEditWin; // matching window to pTextEditOutlinerView
+
vcl::Cursor* pTextEditCursorBuffer; // to restore the cursor in each window
SdrObject* pMacroObj;
SdrPageView* pMacroPV;
@@ -98,11 +98,11 @@ protected:
sal_uInt16 nMacroTol;
- bool bTextEditDontDelete : 1; // do not delete outliner and view of SdrEndTextEdit (f. spellchecking)
- bool bTextEditOnlyOneView : 1; // a single OutlinerView (f. spellchecking)
- bool bTextEditNewObj : 1; // current edited object was just recreated
- bool bQuickTextEditMode : 1; // persistent(->CrtV). Default=TRUE
- bool bMacroDown : 1;
+ bool mbTextEditDontDelete : 1; // do not delete outliner and view of SdrEndTextEdit (f. spellchecking)
+ bool mbTextEditOnlyOneView : 1; // a single OutlinerView (f. spellchecking)
+ bool mbTextEditNewObj : 1; // current edited object was just recreated
+ bool mbQuickTextEditMode : 1; // persistent(->CrtV). Default=TRUE
+ bool mbMacroDown : 1;
rtl::Reference< sdr::SelectionController > mxSelectionController;
rtl::Reference< sdr::SelectionController > mxLastSelectionController;
@@ -184,8 +184,14 @@ public:
// TextEdit over an outliner
// QuickTextEditMode = edit the text straight after selection. Default=TRUE. Persistent.
- void SetQuickTextEditMode(bool bOn) { bQuickTextEditMode=bOn; }
- bool IsQuickTextEditMode() const { return bQuickTextEditMode; }
+ void SetQuickTextEditMode(bool bOn)
+ {
+ mbQuickTextEditMode = bOn;
+ }
+ bool IsQuickTextEditMode() const
+ {
+ return mbQuickTextEditMode;
+ }
// Start the TextEditMode. If pWin==NULL, use the first window, which is logged at the View.
// The cursor of the currently edited window is stored with SdrBeginTextEdit()
@@ -233,10 +239,22 @@ public:
// Now at this outliner, events can be send, attributes can be set,
// call Cut/Copy/Paste, call Undo/Redo, and so on...
- const SdrOutliner* GetTextEditOutliner() const { return pTextEditOutliner.get(); }
- SdrOutliner* GetTextEditOutliner() { return pTextEditOutliner.get(); }
- const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; }
- OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; }
+ const SdrOutliner* GetTextEditOutliner() const
+ {
+ return mpTextEditOutliner.get();
+ }
+ SdrOutliner* GetTextEditOutliner()
+ {
+ return mpTextEditOutliner.get();
+ }
+ const OutlinerView* GetTextEditOutlinerView() const
+ {
+ return mpTextEditOutlinerView;
+ }
+ OutlinerView* GetTextEditOutlinerView()
+ {
+ return mpTextEditOutlinerView;
+ }
virtual bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) override;
virtual bool MouseButtonDown(const MouseEvent& rMEvt, OutputDevice* pWin) override;