diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-09 09:05:57 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-09 11:15:16 +0000 |
commit | 17076d8ecf77f313b7a93912528f9cb0fd0d3ea8 (patch) | |
tree | cb77cae87f0a07e729deb9a66679a4cfec434768 /include/svx | |
parent | 70d5cd845d4fe218588155cf43bdf854e8fc54f3 (diff) |
convert OUTLINER_MODE to scoped enum
Change-Id: I7ac45d7fbd5e77a105cbe942c6d4fd6cfc8ff909
Reviewed-on: https://gerrit.libreoffice.org/24789
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/svdetc.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdmodel.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdoutl.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdtext.hxx | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 6f92187dcb53..577a1d93571d 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star { namespace lang { * The resulting default font height, however, stays the same (the logical * font height is converted). */ -SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner(sal_uInt16 nOutlinerMode, SdrModel& rMod); +SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner(OutlinerMode nOutlinerMode, SdrModel& rMod); /** * Global default settings for the DrawingEngine. @@ -95,7 +95,7 @@ public: // Create an Outliner with the engine-global default values on the heap. // If pMod != nullptr, the MapMode of the passed model is used. // The resulting default font height, however, stays the same (the logical font height is converted). - friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner(sal_uInt16 nOutlinerMode, SdrModel& rMod); + friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner(OutlinerMode nOutlinerMode, SdrModel& rMod); }; class SfxItemSet; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 350acefe74dc..d90671311e76 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -580,7 +580,7 @@ public: void ReformatAllTextObjects(); - SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode ); + SdrOutliner* createOutliner( OutlinerMode nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); bool IsWriter() const { return !bMyPool; } diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx index 902574138518..c76fbb9c2345 100644 --- a/include/svx/svdoutl.hxx +++ b/include/svx/svdoutl.hxx @@ -34,7 +34,7 @@ protected: const SdrPage* mpVisualizedPage; public: - SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode ); + SdrOutliner( SfxItemPool* pItemPool, OutlinerMode nMode ); virtual ~SdrOutliner() ; void SetTextObj( const SdrTextObj* pObj ); diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index b2f6ce112b3d..8338428fe241 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -30,6 +30,7 @@ class SdrOutliner; class SdrTextObj; class SdrModel; class SfxItemSet; +enum class OutlinerMode; namespace sdr { namespace properties { class TextProperties; @@ -46,7 +47,7 @@ public: virtual ~SdrText(); virtual void SetModel(SdrModel* pNewModel); - void ForceOutlinerParaObject( sal_uInt16 nOutlMode ); + void ForceOutlinerParaObject( OutlinerMode nOutlMode ); virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject ); OutlinerParaObject* GetOutlinerParaObject() const; |