diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2018-09-08 00:41:47 +0200 |
|---|---|---|
| committer | Regina Henschel <rb.henschel@t-online.de> | 2018-09-12 09:24:05 +0200 |
| commit | d52c8fd4cc025ca9da474a20aa0f5514032273e2 (patch) | |
| tree | 33e628c6ef9c4bd707edbe360edac69fd5a76fb9 /sd/source/ui/view | |
| parent | 1b267db43b35cc0dcd6d50712efe52ed32fa6e7b (diff) | |
tdf#119392 write bitfield in <draw:layer-set> order
The view uses the SdrLayerIDSet bitfield in layer ID order.
But file format knows no layer IDs and on loading the
bitfield is interpreted in the layer order given by
<draw:layer-set> element. Therefore reorder the bits on
saving according <draw:layer-set>, which is order in
SdrLayerAdmin.
Change-Id: Id349dc7f42338e35ca8cc3b6409d061213b01691
Reviewed-on: https://gerrit.libreoffice.org/60178
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/frmview.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 1232d9f23692..aa4f7af1a51e 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -395,14 +395,15 @@ void FrameView::WriteUserDataSequence ( css::uno::Sequence < css::beans::Propert aUserData.addValue( sUNO_View_EliminatePolyPointLimitAngle, makeAny( static_cast<sal_Int32>(GetEliminatePolyPointLimitAngle()) ) ); aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( IsEliminatePolyPoints() ) ); + SdrLayerAdmin& rLayerAdmin = getSdrModelFromSdrView().GetLayerAdmin(); Any aAny; - GetVisibleLayers().QueryValue( aAny ); + rLayerAdmin.QueryValue(GetVisibleLayers(), aAny); aUserData.addValue( sUNO_View_VisibleLayers, aAny ); - GetPrintableLayers().QueryValue( aAny ); + rLayerAdmin.QueryValue(GetPrintableLayers(), aAny); aUserData.addValue( sUNO_View_PrintableLayers, aAny ); - GetLockedLayers().QueryValue( aAny ); + rLayerAdmin.QueryValue(GetLockedLayers(), aAny); aUserData.addValue( sUNO_View_LockedLayers, aAny ); aUserData.addValue( sUNO_View_NoAttribs, makeAny( IsNoAttribs() ) ); |