diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-10 13:52:51 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-12 09:54:23 +0200 |
commit | a651dbcfca9e198b5c2561076961504586bc6bea (patch) | |
tree | 812eee16af9bc3c4c75b8b45a4c126f99ad1bab3 /svx/inc | |
parent | 9b5ce4023d35c4cc82f7b17e79b8fedbcb1367dd (diff) |
convert SdrLayerId to strong_int
Also
- rename SetOfByte to SdrLayerIDSet
- add asserts in SdrLayerAdmin::GetUniqueLayerID so that we don't
allocate overlapping SdrLayerID values
- add a new constant SDRLAYERPOS_NOTFOUND to be returned from
SdrLayerAdmin::GetLayerPos
Change-Id: I3bb3489f9338e3d02c4040bcbd811744699941c8
Reviewed-on: https://gerrit.libreoffice.org/37467
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/inc')
-rw-r--r-- | svx/inc/sdr/contact/viewobjectcontactofgroup.hxx | 2 | ||||
-rw-r--r-- | svx/inc/sxlayitm.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx index 416ca0fb633b..af2dd6644998 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx @@ -37,7 +37,7 @@ namespace sdr virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override; private: - virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const override; + virtual bool isPrimitiveVisibleOnAnyLayer(const SdrLayerIDSet& aLayers) const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sxlayitm.hxx b/svx/inc/sxlayitm.hxx index 47fba3a9b616..9516f4efb9de 100644 --- a/svx/inc/sxlayitm.hxx +++ b/svx/inc/sxlayitm.hxx @@ -26,8 +26,8 @@ class SdrLayerIdItem: public SfxUInt16Item { public: - SdrLayerIdItem(sal_uInt16 nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {} - SdrLayerID GetValue() const { return (SdrLayerID)SfxUInt16Item::GetValue(); } + SdrLayerIdItem(SdrLayerID nId): SfxUInt16Item(SDRATTR_LAYERID,sal_uInt8(nId)) {} + SdrLayerID GetValue() const { return SdrLayerID(SfxUInt16Item::GetValue()); } virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; |