diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-06-25 21:06:27 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-06-27 03:52:58 +0200 |
| commit | f15d50b5ff6f0c8ed1a647a4efa92f5c67077326 (patch) | |
| tree | d54b8c152505296a04231841ddd039eba6538ad4 /include/svx | |
| parent | 00a658ff104623d4e7fc984b5fc82d1a7e2607f2 (diff) | |
svx: clean-up, init in constructor, rename master pages variable
- maMaPag to maMasterPages
- cleanup the constructor variable initialization
- change degree chart from define to const variable
Change-Id: Idc607b8b386855b90001ed389df2c7849969ee86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117887
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svdmodel.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 5a7aadd7b65a..c681c4878a42 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -48,7 +48,7 @@ class OutputDevice; #include <unordered_set> #endif -#define DEGREE_CHAR u'\x00B0' /* U+00B0 DEGREE SIGN */ +constexpr const sal_Unicode DEGREE_CHAR = u'\x00B0'; /* U+00B0 DEGREE SIGN */ class SdrOutliner; class SdrLayerAdmin; @@ -162,7 +162,7 @@ private: std::unordered_set< const SdrObject* > maAllIncarnatedObjects; #endif protected: - std::vector<rtl::Reference<SdrPage>> maMaPag; // master pages + std::vector<rtl::Reference<SdrPage>> maMasterPages; std::vector<rtl::Reference<SdrPage>> maPages; std::function<void(std::unique_ptr<SdrUndoAction>)> m_aUndoLink; // link to a NotifyUndo-Handler Size m_aMaxObjSize; // e.g. for auto-growing text @@ -176,8 +176,7 @@ protected: std::unique_ptr<SdrLayerAdmin> m_pLayerAdmin; rtl::Reference<SfxItemPool> m_pItemPool; - comphelper::IEmbeddedHelper* - m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell + comphelper::IEmbeddedHelper* m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell std::unique_ptr<SdrOutliner> m_pDrawOutliner; // an Outliner for outputting text std::unique_ptr<SdrOutliner> m_pHitTestOutliner;// an Outliner for the HitTest std::unique_ptr<SdrOutliner> m_pChainingOutliner; // an Outliner for chaining overflowing text |