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/source/svdraw/svdpagv.cxx | |
| 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/source/svdraw/svdpagv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdpagv.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index b8fd9863cfde..fd94f4388877 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -605,7 +605,7 @@ void SdrPageView::AdjHdl() GetView().AdjustMarkHdl(); } -void SdrPageView::SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa) +void SdrPageView::SetLayer(const OUString& rName, SdrLayerIDSet& rBS, bool bJa) { if(!GetPage()) return; @@ -616,7 +616,7 @@ void SdrPageView::SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa) rBS.Set(nID, bJa); } -bool SdrPageView::IsLayer(const OUString& rName, const SetOfByte& rBS) const +bool SdrPageView::IsLayer(const OUString& rName, const SdrLayerIDSet& rBS) const { if(!GetPage()) return false; @@ -674,9 +674,9 @@ bool SdrPageView::IsObjMarkable(SdrObject* pObj) const return false; // Obj suddenly in different Page // the layer has to be visible and must not be locked SdrLayerID nL = pObj->GetLayer(); - if (!aLayerVisi.IsSet(sal_uInt8(nL))) + if (!aLayerVisi.IsSet(nL)) return false; - if (aLayerLock.IsSet(sal_uInt8(nL))) + if (aLayerLock.IsSet(nL)) return false; return true; } |