diff options
author | Armin Le Grand <Armin.Le.Grand@me.com> | 2019-04-18 19:25:06 +0200 |
---|---|---|
committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2019-04-25 19:59:04 +0200 |
commit | 1e2682235cded9a7cd90e55f0bfc60a1285e9a46 (patch) | |
tree | 17457bc49d6faf37270c8a481b94765f58a5f434 /include/editeng/fhgtitem.hxx | |
parent | 5e4c1e6ba425ce0b75864e4584a846957b032e61 (diff) |
WIP: Further preparations for deeper Item changes
(1) Migrated all still existing binary load/save stuff
in SfxPoolItem to legacy files. Isolated from Item
implementations. Adapted all usages. No more methods
Create/Store needed, also GetVersion removed
(2) Removed operator= for SfxPoolItem. Adapted all
usages. Goal ist to handle Items more as Objects
('Object-Oriented') in the sense to move/handle
instances, not to copy one instance over another one
(which is more and more problematic with hard to copy
content as UNO API stuff or similar). This lead to
much more usages of std::shared_ptr which correlates
well with future plans fr Items (see dev branch).
Next logic step will be to also remove copy constructor
Linux build and corrections done
Fixed Writer test and removed unused defines
Fixed another unused m,acro
Started to unify the AutoFormat stuff
Changes to OUString constructor usages, tests completely
No idea why, but SfxStringItem constructor which
takes a OUString& now insists of not getting ::OUString's
handed in - changed all 'SfxStringItem.*OUString.*".*"'
accordingly
Change-Id: Ibed7358b18fb019994a7490332b9d797a6694c29
Reviewed-on: https://gerrit.libreoffice.org/71075
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'include/editeng/fhgtitem.hxx')
-rw-r--r-- | include/editeng/fhgtitem.hxx | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 686eed994ff0..5e67a71f0676 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -41,6 +41,11 @@ class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem sal_uInt32 nHeight; sal_uInt16 nProp; // default 100% MapUnit ePropUnit; // Percent, Twip, ... + +private: + friend void Create_legacy_direct_set(SvxFontHeightItem& rItem, sal_uInt32 nH, sal_uInt16 nP, MapUnit eP); + void legacy_direct_set(sal_uInt32 nH, sal_uInt16 nP, MapUnit eP) { nHeight = nH; nProp = nP; ePropUnit = eP; } + public: static SfxPoolItem* CreateDefault(); @@ -58,22 +63,9 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nItemVersion) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; - SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nHeight = rSize.nHeight; - nProp = rSize.nProp; - ePropUnit = rSize.ePropUnit; - return *this; - } - SvxFontHeightItem(SvxFontHeightItem const &) = default; // SfxPoolItem copy function dichotomy - void SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp = 100, MapUnit eUnit = MapUnit::MapRelative ); |