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 /include/svx | |
| 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 'include/svx')
| -rw-r--r-- | include/svx/svdlayer.hxx | 4 | ||||
| -rw-r--r-- | include/svx/svdsob.hxx | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index 2f2a32f33bd7..b36a1e9fdb1e 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -163,6 +163,10 @@ public: void getVisibleLayersODF( SdrLayerIDSet& rOutSet) const; void getPrintableLayersODF( SdrLayerIDSet& rOutSet) const; void getLockedLayersODF( SdrLayerIDSet& rOutSet) const; + + // Generates a bitfield for settings.xml from the SdrLayerIDSet. + // Output is a uno sequence of BYTE (which is 'short' in API). + void QueryValue(const SdrLayerIDSet& rViewLayerSet, css::uno::Any& rAny); }; #endif // INCLUDED_SVX_SVDLAYER_HXX diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index 21ef323040ff..3d3f8c03488d 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -82,11 +82,9 @@ public: void operator&=(const SdrLayerIDSet& r2ndSet); - // initialize this set with a uno sequence of sal_Int8 + // initialize this set with a uno sequence of sal_Int8 (e.g. as stored in settings.xml) void PutValue(const css::uno::Any & rAny); - // returns a uno sequence of sal_Int8 - void QueryValue(css::uno::Any & rAny) const; }; #endif // INCLUDED_SVX_SVDSOB_HXX |