Skip to content

Commit

Permalink
Graphic: cleanup private, public declarations, remove friend
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
quikee committed Apr 27, 2020
1 parent 32b8f5b commit 5cff641
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions include/vcl/graph.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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;
Expand All @@ -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.
Expand Down

0 comments on commit 5cff641

Please sign in to comment.