vcl, sd: various small cleanups

Change-Id: Ic7ad2e044cc1807b105bcad2daf978224b96f298
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100956
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/include/vcl/pdfread.hxx b/include/vcl/pdfread.hxx
index f1534c326ee6..4b76d9360f2b 100644
--- a/include/vcl/pdfread.hxx
+++ b/include/vcl/pdfread.hxx
@@ -42,7 +42,7 @@ struct PDFGraphicAnnotation
     css::util::DateTime maDateTime;
 };
 
-struct PDFGraphicResult
+class PDFGraphicResult
 {
     Graphic maGraphic;
     // Size in HMM
@@ -50,13 +50,18 @@ struct PDFGraphicResult
 
     std::vector<PDFGraphicAnnotation> maAnnotations;
 
-    PDFGraphicResult(Graphic const& rGraphic, Size const& rSize,
-                     std::vector<PDFGraphicAnnotation> const& aAnnotations)
-        : maGraphic(rGraphic)
+public:
+    PDFGraphicResult(Graphic aGraphic, Size const& rSize,
+                     std::vector<PDFGraphicAnnotation> aAnnotations)
+        : maGraphic(std::move(aGraphic))
         , maSize(rSize)
-        , maAnnotations(aAnnotations)
+        , maAnnotations(std::move(aAnnotations))
     {
     }
+
+    const Graphic& GetGraphic() const { return maGraphic; }
+    const Size& GetSize() const { return maSize; }
+    const std::vector<PDFGraphicAnnotation>& GetAnnotations() const { return maAnnotations; }
 };
 
 /// Import PDF as Graphic images (1 per page), but not loaded yet.