simplify and flatten OutDevStateStack

Change-Id: Ic2ee5c2e122244e11770ab5fb73f65800828439a
Reviewed-on: https://gerrit.libreoffice.org/75128
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 4 insertions, 4 deletions

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index cf1d5c09c685..b3159396f9a4 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -322,8 +322,8 @@ private:
     mutable std::shared_ptr<PhysicalFontCollection> mxFontCollection;
     mutable std::unique_ptr<ImplDeviceFontList>     mpDeviceFontList;
     mutable std::unique_ptr<ImplDeviceFontSizeList> mpDeviceFontSizeList;
-    std::unique_ptr<OutDevStateStack>               mpOutDevStateStack;
-    std::unique_ptr<ImplOutDevData>                 mpOutDevData;
+    std::vector<OutDevState>        maOutDevStateStack;
+    std::unique_ptr<ImplOutDevData> mpOutDevData;
     std::vector< VCLXGraphics* >*   mpUnoGraphicsList;
     vcl::ExtOutDevData*             mpExtOutDevData;
 
diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index d3c469eff513..493855248db0 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -75,10 +75,10 @@ namespace o3tl {
     template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x000f> {};
 }
 
-class OutDevState
+struct OutDevState
 {
-public:
     OutDevState();
+    OutDevState(OutDevState&&);
     ~OutDevState();
 
     boost::optional<MapMode>        mpMapMode;