[Libreoffice-commits] core.git: Branch 'private/Ashod/cd-5.3.3.2' - 3 commits - drawinglayer/source filter/source include/vcl oox/source sfx2/source svtools/source svx/source sw/source vcl/source
Jan Holesovsky
kendy at collabora.com
Fri May 11 16:00:04 UTC 2018
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2 -
filter/source/msfilter/escherex.cxx | 4 +-
include/vcl/graph.hxx | 6 +--
oox/source/export/drawingml.cxx | 2 -
sfx2/source/appl/fileobj.cxx | 4 +-
svtools/source/graphic/descriptor.cxx | 4 +-
svtools/source/graphic/grfcache.cxx | 10 ++---
svx/source/core/graphichelper.cxx | 23 -------------
svx/source/dialog/compressgraphicdialog.cxx | 2 -
svx/source/gallery2/galtheme.cxx | 2 -
svx/source/svdraw/svdograf.cxx | 4 +-
svx/source/svdraw/svdpdf.hxx | 6 +--
svx/source/unodraw/unoshap4.cxx | 4 +-
svx/source/unodraw/unoshape.cxx | 4 +-
svx/source/xml/xmlgrhlp.cxx | 8 ++--
svx/source/xoutdev/_xoutbmp.cxx | 6 +--
sw/source/core/graphic/ndgrf.cxx | 2 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 4 +-
vcl/source/filter/GraphicNativeMetadata.cxx | 2 -
vcl/source/filter/GraphicNativeTransform.cxx | 6 +--
vcl/source/filter/graphicfilter.cxx | 4 +-
vcl/source/gdi/graph.cxx | 6 +--
vcl/source/gdi/impgraph.cxx | 2 -
vcl/source/gdi/pdfextoutdevdata.cxx | 16 ++++-----
vcl/source/gdi/pdfwriter_impl2.cxx | 2 -
25 files changed, 57 insertions(+), 78 deletions(-)
New commits:
commit d2a317e2b89a7cfade1668ddb321f81832380997
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri May 11 17:59:06 2018 +0200
fixup! svx: import PDF text using PDFium
Change-Id: I9dc76a45cd73020247ab00fed39d39200b1fddbf
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx
index a668239a9faf..bb8dfb159b30 100644
--- a/svx/source/svdraw/svdpdf.hxx
+++ b/svx/source/svdraw/svdpdf.hxx
@@ -157,7 +157,7 @@ class ImpSdrPdfImport final
/// PDF coordinate system has orign at the bottom right.
double correctVertOrigin(double offsetPts) const { return mdPageHeightPts - offsetPts; }
/// Convert PDF points to logic (twips).
- tools::Rectangle PointsToLogic(double left, double right, double top, double bottom) const;
+ Rectangle PointsToLogic(double left, double right, double top, double bottom) const;
Point PointsToLogic(double x, double y) const;
// check for clip and evtl. fill maClip
commit bc0518e76f9594e90f765f874a7b1dc8ea5b1974
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri May 11 17:58:43 2018 +0200
fixup! svx: support breaking PDFs imported as images
Change-Id: Ia2ba1cd3226657a7b7ab1f401c09a6329408b34f
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx
index 53e00a305a39..a668239a9faf 100644
--- a/svx/source/svdraw/svdpdf.hxx
+++ b/svx/source/svdraw/svdpdf.hxx
@@ -111,7 +111,7 @@ class ImpSdrPdfImport final
::std::vector<SdrObject*> maTmpList;
ScopedVclPtr<VirtualDevice> mpVD;
- tools::Rectangle maScaleRect;
+ Rectangle maScaleRect;
const std::shared_ptr<css::uno::Sequence<sal_Int8>> mpPdfData;
size_t mnMapScalingOfs; // from here on, not edited with MapScaling
std::unique_ptr<SfxItemSet> mpLineAttr;
@@ -188,7 +188,7 @@ class ImpSdrPdfImport final
ImpSdrPdfImport& operator=(const ImpSdrPdfImport&) = delete;
public:
- ImpSdrPdfImport(SdrModel& rModel, SdrLayerID nLay, const tools::Rectangle& rRect,
+ ImpSdrPdfImport(SdrModel& rModel, SdrLayerID nLay, const Rectangle& rRect,
const std::shared_ptr<css::uno::Sequence<sal_Int8>>& pPdfData);
~ImpSdrPdfImport();
commit 988ab49fe6410d6d6d9cd6aba0692da58dbc06f3
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri May 11 17:47:06 2018 +0200
Revert "graphic: rename Set{Get,Is}Link to Set{Get,Is}GfxLink"
This reverts commit 34f4b0d2b47871548d22040742b35301c83a71ea.
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 1cb3f94bc920..172b82bf00e6 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -774,7 +774,7 @@ namespace drawinglayer
// svtools/source/graphic/grfmgr.cxx
const Graphic& rGraphic = rGraphicPrimitive.getGraphicObject().GetGraphic();
- if(rGraphic.IsGfxLink())
+ if(rGraphic.IsLink())
{
const GraphicAttr& rAttr = rGraphicPrimitive.getGraphicAttr();
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 5539908e2d9f..9dc283e501ff 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4228,9 +4228,9 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
const sal_uInt8* pGraphicAry = nullptr;
- if ( p_EscherBlibEntry->mbIsNativeGraphicPossible && aGraphic.IsGfxLink() )
+ if ( p_EscherBlibEntry->mbIsNativeGraphicPossible && aGraphic.IsLink() )
{
- aGraphicLink = aGraphic.GetGfxLink();
+ aGraphicLink = aGraphic.GetLink();
p_EscherBlibEntry->mnSize = aGraphicLink.GetDataSize();
pGraphicAry = aGraphicLink.GetData();
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 7aec891e05ff..1902da49d60f 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -210,9 +210,9 @@ private:
bool IsSwapOut() const;
public:
- void SetGfxLink(const GfxLink& rGfxLink);
- GfxLink GetGfxLink() const;
- bool IsGfxLink() const;
+ void SetLink( const GfxLink& );
+ GfxLink GetLink() const;
+ bool IsLink() const;
bool ExportNative( SvStream& rOStream ) const;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 7d3414414f69..986c71ffee06 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -839,7 +839,7 @@ const char* DrawingML::GetRelationCompPrefix()
OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia )
{
- GfxLink aLink = rGraphic.GetGfxLink ();
+ GfxLink aLink = rGraphic.GetLink ();
OUString sMediaType;
const char* pExtension = "";
OUString sRelId;
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 3d8b8d2942e3..e7ced1bfa4f9 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -299,9 +299,9 @@ bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
int nRes;
// To avoid that a native link is created
- if( !rGrf.IsGfxLink() &&
+ if( !rGrf.IsLink() &&
!rGrf.GetContext() && !bNativFormat )
- rGrf.SetGfxLink( GfxLink() );
+ rGrf.SetLink( GfxLink() );
if( !pStream )
nRes = xMed.Is() ? GRFILTER_OPENERROR
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 0a6728d25bd1..5b00e0215808 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -300,11 +300,11 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
if( mpGraphic )
{
- if( mpGraphic->IsGfxLink() )
+ if( mpGraphic->IsLink() )
{
const char* pMimeType;
- switch( mpGraphic->GetGfxLink().GetType() )
+ switch( mpGraphic->GetLink().GetType() )
{
case GfxLinkType::NativeGif: pMimeType = MIMETYPE_GIF; break;
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 518c2c24bbaf..7886ffc013bf 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -260,8 +260,8 @@ bool GraphicCacheEntry::ImplInit( const GraphicObject& rObj )
break;
}
- if( rGraphic.IsGfxLink() )
- maGfxLink = ( (Graphic&) rGraphic ).GetGfxLink();
+ if( rGraphic.IsLink() )
+ maGfxLink = ( (Graphic&) rGraphic ).GetLink();
else
maGfxLink = GfxLink();
@@ -280,8 +280,8 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute )
const GraphicType eOldType = rSubstitute.GetType();
const bool bDefaultType = ( rSubstitute.GetType() == GraphicType::Default );
- if( rSubstitute.IsGfxLink() && ( GfxLinkType::NONE == maGfxLink.GetType() ) )
- maGfxLink = rSubstitute.GetGfxLink();
+ if( rSubstitute.IsLink() && ( GfxLinkType::NONE == maGfxLink.GetType() ) )
+ maGfxLink = rSubstitute.GetLink();
if(maSvgData.get())
{
@@ -315,7 +315,7 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute )
if( GfxLinkType::NONE != maGfxLink.GetType() )
{
- rSubstitute.SetGfxLink( maGfxLink );
+ rSubstitute.SetLink( maGfxLink );
}
if( bDefaultType )
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index b07703f88a99..39d3c56ecc82 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -70,28 +70,7 @@ namespace drawing = com::sun::star::drawing;
void GraphicHelper::GetPreferredExtension( OUString& rExtension, const Graphic& rGraphic )
{
OUString aExtension = "png";
- const VectorGraphicDataPtr& aVectorGraphicDataPtr(rGraphic.getVectorGraphicData());
-
- if (aVectorGraphicDataPtr.get() && aVectorGraphicDataPtr->getVectorGraphicDataArrayLength())
- {
- switch (aVectorGraphicDataPtr->getVectorGraphicDataType())
- {
- case VectorGraphicDataType::Wmf:
- aExtension = "wmf";
- break;
- case VectorGraphicDataType::Emf:
- aExtension = "emf";
- break;
- default: // case VectorGraphicDataType::Svg:
- aExtension = "svg";
- break;
- }
-
- rExtension = aExtension;
- return;
- }
-
- switch( rGraphic.GetGfxLink().GetType() )
+ switch( rGraphic.GetLink().GetType() )
{
case GfxLinkType::NativeGif:
aExtension = "gif";
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index b763654933ff..4188b85a79e8 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -143,7 +143,7 @@ void CompressGraphicsDialog::Initialize()
void CompressGraphicsDialog::Update()
{
- GfxLinkType aLinkType = m_aGraphic.GetGfxLink().GetType();
+ GfxLinkType aLinkType = m_aGraphic.GetLink().GetType();
OUString aGraphicTypeString;
switch(aLinkType)
{
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 0b946497bc12..d28d4b67c5d8 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -846,7 +846,7 @@ bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPo
if( rGraphic.GetType() != GraphicType::NONE )
{
ConvertDataFormat nExportFormat = ConvertDataFormat::Unknown;
- const GfxLink aGfxLink( rGraphic.GetGfxLink() );
+ const GfxLink aGfxLink( ( (Graphic&) rGraphic ).GetLink() );
if( aGfxLink.GetDataSize() )
{
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index ed522072b5be..604f87a64b3a 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1457,10 +1457,10 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
if( pModel )
{
- if( pGraphic && GetGraphic().IsGfxLink() )
+ if( pGraphic && GetGraphic().IsLink() )
{
Graphic aGraphic( GetGraphic() );
- GfxLink aLink( aGraphic.GetGfxLink() );
+ GfxLink aLink( aGraphic.GetLink() );
sal_uInt32 nSize = aLink.GetDataSize();
const void* pSourceData = static_cast<const void*>(aLink.GetData());
if( nSize && pSourceData )
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 0b3bbafaa801..c806e75e27e2 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -226,9 +226,9 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro
if( pGraphic )
{
bool bIsWMF = false;
- if ( pGraphic->IsGfxLink() )
+ if ( pGraphic->IsLink() )
{
- GfxLink aLnk = pGraphic->GetGfxLink();
+ GfxLink aLnk = pGraphic->GetLink();
if ( aLnk.GetType() == GfxLinkType::NativeWmf )
{
bIsWMF = true;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 97fce1a606d3..ca6d8e9e027a 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2868,9 +2868,9 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
if( pGraphic )
{
bool bIsWMF = false;
- if ( pGraphic->IsGfxLink() )
+ if ( pGraphic->IsLink() )
{
- GfxLink aLnk = pGraphic->GetGfxLink();
+ GfxLink aLnk = pGraphic->GetLink();
if ( aLnk.GetType() == GfxLinkType::NativeWmf )
{
bIsWMF = true;
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 4fe253cb188f..147cdf4cfd8e 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -107,9 +107,9 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId )
if( pStm )
{
- Graphic aGraphic(aGrfObject.GetGraphic());
- const GfxLink aGfxLink(aGraphic.GetGfxLink());
- bool bRet = false;
+ Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() );
+ const GfxLink aGfxLink( aGraphic.GetLink() );
+ bool bRet = false;
if( aGfxLink.GetDataSize() && aGfxLink.GetData() )
{
@@ -668,7 +668,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt
{
OUString aStreamName( aPictureStreamName );
Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() );
- const GfxLink aGfxLink( aGraphic.GetGfxLink() );
+ const GfxLink aGfxLink( aGraphic.GetLink() );
OUString aExtension;
bool bUseGfxLink( true );
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index f8cd67ff94b2..e3aa97156e53 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -197,10 +197,10 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileNam
if( ( nFlags & XOutFlags::UseNativeIfPossible ) &&
!( nFlags & XOutFlags::MirrorHorz ) &&
!( nFlags & XOutFlags::MirrorVert ) &&
- ( rGraphic.GetType() != GraphicType::GdiMetafile ) && rGraphic.IsGfxLink() )
+ ( rGraphic.GetType() != GraphicType::GdiMetafile ) && rGraphic.IsLink() )
{
// try to write native link
- const GfxLink aGfxLink( rGraphic.GetGfxLink() );
+ const GfxLink aGfxLink( ( (Graphic&) rGraphic ).GetLink() );
switch( aGfxLink.GetType() )
{
@@ -352,7 +352,7 @@ bool XOutBitmap::GraphicToBase64(const Graphic& rGraphic, OUString& rOUString)
{
SvMemoryStream aOStm;
OUString aMimeType;
- GfxLink aLink = rGraphic.GetGfxLink();
+ GfxLink aLink = rGraphic.GetLink();
ConvertDataFormat aCvtType;
switch( aLink.GetType() )
{
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 82f0678a1843..9739f0aaab2a 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -741,7 +741,7 @@ void SwGrfNode::ReleaseLink()
{
const OUString aFileName(maGrfObj.GetLink());
const Graphic aLocalGraphic(maGrfObj.GetGraphic());
- const bool bHasOriginalData(aLocalGraphic.IsGfxLink());
+ const bool bHasOriginalData(aLocalGraphic.IsLink());
{
bInSwapIn = true;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 0494a605dada..3eaf92920382 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3840,9 +3840,9 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat
GfxLink aGraphicLink;
const sal_Char* pBLIPType = nullptr;
- if (rGraphic.IsGfxLink())
+ if (rGraphic.IsLink())
{
- aGraphicLink = rGraphic.GetGfxLink();
+ aGraphicLink = rGraphic.GetLink();
nSize = aGraphicLink.GetDataSize();
pGraphicAry = aGraphicLink.GetData();
switch (aGraphicLink.GetType())
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx b/vcl/source/filter/GraphicNativeMetadata.cxx
index e58a449ece68..aea930d7174f 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -34,7 +34,7 @@ GraphicNativeMetadata::~GraphicNativeMetadata()
bool GraphicNativeMetadata::read(Graphic& rGraphic)
{
- GfxLink aLink = rGraphic.GetGfxLink();
+ GfxLink aLink = rGraphic.GetLink();
if ( aLink.GetType() != GfxLinkType::NativeJpg )
return false;
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index 94ab0112cdde..fc6143296072 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -36,7 +36,7 @@ GraphicNativeTransform::~GraphicNativeTransform()
bool GraphicNativeTransform::canBeRotated()
{
- GfxLink aLink = mrGraphic.GetGfxLink();
+ GfxLink aLink = mrGraphic.GetLink();
// Don't allow rotation on animations for now
if (mrGraphic.IsAnimated())
@@ -69,7 +69,7 @@ bool GraphicNativeTransform::rotate(sal_uInt16 aInputRotation)
return false;
}
- GfxLink aLink = mrGraphic.GetGfxLink();
+ GfxLink aLink = mrGraphic.GetLink();
if ( aLink.GetType() == GfxLinkType::NativeJpg )
{
return rotateJPEG(aRotation);
@@ -149,7 +149,7 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation)
}
else
{
- GfxLink aLink = mrGraphic.GetGfxLink();
+ GfxLink aLink = mrGraphic.GetLink();
SvMemoryStream aSourceStream;
aSourceStream.WriteBytes(aLink.GetData(), aLink.GetDataSize());
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 286152370d41..a8f1b276f45e 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1336,7 +1336,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
std::shared_ptr<GraphicReader> pContext = rGraphic.GetContext();
GfxLinkType eLinkType = GfxLinkType::NONE;
bool bDummyContext = rGraphic.IsDummyContext();
- const bool bLinkSet = rGraphic.IsGfxLink();
+ const bool bLinkSet = rGraphic.IsLink();
FilterConfigItem* pFilterConfigItem = nullptr;
Size aPreviewSizeHint( 0, 0 );
@@ -1778,7 +1778,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
}
if( nStatus == GRFILTER_OK )
{
- rGraphic.SetGfxLink( GfxLink( std::move(pGraphicContent), nGraphicContentSize, eLinkType ) );
+ rGraphic.SetLink( GfxLink( std::move(pGraphicContent), nGraphicContentSize, eLinkType ) );
}
}
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 4c111067ce49..c410998ec6ca 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -546,18 +546,18 @@ bool Graphic::IsSwapOut() const
return mxImpGraphic->ImplIsSwapOut();
}
-void Graphic::SetGfxLink( const GfxLink& rGfxLink )
+void Graphic::SetLink( const GfxLink& rGfxLink )
{
ImplTestRefCount();
mxImpGraphic->ImplSetLink( rGfxLink );
}
-GfxLink Graphic::GetGfxLink() const
+GfxLink Graphic::GetLink() const
{
return mxImpGraphic->ImplGetLink();
}
-bool Graphic::IsGfxLink() const
+bool Graphic::IsLink() const
{
return mxImpGraphic->ImplIsLink();
}
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index daaa834185fc..beb950b79d81 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1465,7 +1465,7 @@ void ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
// set dummy link to avoid creation of additional link after filtering;
// we set a default link to avoid unnecessary swapping of native data
- aGraphic.SetGfxLink( GfxLink() );
+ aGraphic.SetLink( GfxLink() );
if( !rIStm.GetError() && aLink.LoadNative( aGraphic ) )
{
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 9bdb64294570..fc92bbf19472 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -437,9 +437,9 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc
else if ( aBeg->eAct == PDFExtOutDevDataSync::EndGroupGfxLink )
{
Graphic& rGraphic = mGraphics.front();
- if ( rGraphic.IsGfxLink() )
+ if ( rGraphic.IsLink() )
{
- GfxLinkType eType = rGraphic.GetGfxLink().GetType();
+ GfxLinkType eType = rGraphic.GetLink().GetType();
if ( eType == GfxLinkType::NativeJpg && mParaRects.size() >= 2 )
{
mbGroupIgnoreGDIMtfActions =
@@ -482,7 +482,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc
{
bool bClippingNeeded = ( aOutputRect != aVisibleOutputRect ) && !aVisibleOutputRect.IsEmpty();
- GfxLink aGfxLink( aGraphic.GetGfxLink() );
+ GfxLink aGfxLink( aGraphic.GetLink() );
if ( aGfxLink.GetType() == GfxLinkType::NativeJpg )
{
if ( bClippingNeeded )
@@ -862,10 +862,10 @@ bool PDFExtOutDevData::HasAdequateCompression( const Graphic &rGraphic,
{
bool bReduceResolution = false;
- assert(rGraphic.IsGfxLink() &&
- (rGraphic.GetGfxLink().GetType() == GfxLinkType::NativeJpg ||
- rGraphic.GetGfxLink().GetType() == GfxLinkType::NativePng ||
- rGraphic.GetGfxLink().GetType() == GfxLinkType::NativePdf));
+ assert(rGraphic.IsLink() &&
+ (rGraphic.GetLink().GetType() == GfxLinkType::NativeJpg ||
+ rGraphic.GetLink().GetType() == GfxLinkType::NativePng ||
+ rGraphic.GetLink().GetType() == GfxLinkType::NativePdf));
// small items better off as PNG anyway
if ( rGraphic.GetSizePixel().Width() < 32 &&
@@ -876,7 +876,7 @@ bool PDFExtOutDevData::HasAdequateCompression( const Graphic &rGraphic,
Size aSize = rGraphic.GetSizePixel();
sal_Int32 nCurrentRatio = (100 * aSize.Width() * aSize.Height() * 4) /
- rGraphic.GetGfxLink().GetDataSize();
+ rGraphic.GetLink().GetDataSize();
if ( GetIsLosslessCompression() )
return !bReduceResolution && !GetIsReduceImageResolution();
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 62facafc2a39..c7fd2a4031df 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -99,7 +99,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz
bool bIsJpeg = false, bIsPng = false;
if( i_Graphic.GetType() != GraphicType::NONE && i_Graphic.GetBitmapEx() == aBitmapEx )
{
- GfxLinkType eType = i_Graphic.GetGfxLink().GetType();
+ GfxLinkType eType = i_Graphic.GetLink().GetType();
bIsJpeg = (eType == GfxLinkType::NativeJpg);
bIsPng = (eType == GfxLinkType::NativePng);
}
More information about the Libreoffice-commits
mailing list