include/vcl/graph.hxx | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
New commits: commit 5cff6410222c04f47661ca07a1bbe6e6337633be Author: Tomaž Vajngerl <[email protected]> AuthorDate: Thu Apr 23 21:59:32 2020 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Mon Apr 27 09:50:05 2020 +0200 Graphic: cleanup private, public declarations, remove friend Friend GraphicObject doesn't seem to be needed anymore. Change-Id: I629ddaabf0c1802e986af42b457cd6322d2fd04d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92949 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index b304cfb7ac97..17fdd6336e2d 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -83,15 +83,12 @@ class Image; class VCL_DLLPUBLIC Graphic { private: - std::shared_ptr<ImpGraphic> mxImpGraphic; + SAL_DLLPRIVATE void ImplTestRefCount(); public: - - SAL_DLLPRIVATE void ImplTestRefCount(); SAL_DLLPRIVATE ImpGraphic* ImplGetImpGraphic() const { return mxImpGraphic.get(); } -public: Graphic(); Graphic( const GraphicExternalLink& rGraphicLink ); Graphic( const Graphic& rGraphic ); @@ -180,16 +177,11 @@ public: OString getUniqueID() const; -public: - std::shared_ptr<GraphicReader>& GetReaderContext(); void SetReaderContext( const std::shared_ptr<GraphicReader> &pReader ); void SetDummyContext(bool value); bool IsDummyContext() const; -private: - friend class GraphicObject; -public: void SetGfxLink(const std::shared_ptr<GfxLink>& rGfxLink); std::shared_ptr<GfxLink> GetSharedGfxLink() const; GfxLink GetGfxLink() const; @@ -200,8 +192,6 @@ public: friend VCL_DLLPUBLIC void WriteGraphic(SvStream& rOStream, const Graphic& rGraphic); friend VCL_DLLPUBLIC void ReadGraphic(SvStream& rIStream, Graphic& rGraphic); -public: - const std::shared_ptr<VectorGraphicData>& getVectorGraphicData() const; /// Get the page number of the multi-page source this Graphic is rendered from. _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
