include/vcl/graphicfilter.hxx | 7 -------
oox/source/drawingml/shape.cxx | 2 +-
vcl/source/filter/graphicfilter.cxx | 13 -------------
3 files changed, 1 insertion(+), 21 deletions(-)
New commits:
commit 602299b92b7452fd47303c4de8945af2725fb255
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed May 18 08:30:51 2022 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed May 18 21:29:05 2022 +0200
Remove 1 ImportGraphic method
and replace its only use in Shape::renderDiagramToGraphic
(oox/source/drawingml/shape.cxx)
by an existing one.
It became quite useless since 2876a0f79f94cdd139cc8fa40669acde9674bf8c
(2020/03/03)
graphic: remove preview when importing with GraphicFilter
Change-Id: Iec3b13d85297bbe7cbfefe91a2a88e33e53d506b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134503
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 7880d1c2e910..f1568680660c 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -328,13 +328,6 @@ public:
*/
void MakeGraphicsAvailableThreaded(std::vector< Graphic* >& rGraphics);
- ErrCode ImportGraphic( Graphic& rGraphic, std::u16string_view
rPath,
- SvStream& rStream,
- sal_uInt16 nFormat,
- sal_uInt16 * pDeterminedFormat,
GraphicFilterImportFlags nImportFlags,
- const css::uno::Sequence<
css::beans::PropertyValue >* pFilterData,
- WmfExternal const *pExtHeader = nullptr );
-
// Setting sizeLimit limits how much will be read from the stream.
Graphic ImportUnloadedGraphic(SvStream& rIStream, sal_uInt64 sizeLimit =
0, const Size* pSizeHint = nullptr);
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 3951fdc8e7df..8739d4d8989d 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1947,7 +1947,7 @@ Reference < XShape > Shape::renderDiagramToGraphic(
XmlFilterBase const & rFilte
Graphic aGraphic;
GraphicFilter aFilter( false );
- if ( aFilter.ImportGraphic( aGraphic, u"", aTempStream,
GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast
< Sequence < PropertyValue >* > ( nullptr ) ) != ERRCODE_NONE )
+ if ( aFilter.ImportGraphic( aGraphic, u"", aTempStream,
GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE ) !=
ERRCODE_NONE )
{
SAL_WARN( "oox.drawingml", "Shape::renderDiagramToGraphic: Unable
to import rendered stream into graphic object" );
return xShape;
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 44534025337a..da436ed634f2 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -536,18 +536,6 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic,
const INetURLObject& rP
return nRetValue;
}
-ErrCode GraphicFilter::ImportGraphic(
- Graphic& rGraphic,
- std::u16string_view rPath,
- SvStream& rIStream,
- sal_uInt16 nFormat,
- sal_uInt16* pDeterminedFormat,
- GraphicFilterImportFlags nImportFlags,
- WmfExternal const *pExtHeader)
-{
- return ImportGraphic( rGraphic, rPath, rIStream, nFormat,
pDeterminedFormat, nImportFlags, nullptr, pExtHeader );
-}
-
namespace {
/// Contains a stream and other associated data to import pixels into a
@@ -1377,7 +1365,6 @@ ErrCode GraphicFilter::readWEBP(SvStream & rStream,
Graphic & rGraphic, GfxLinkT
ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, std::u16string_view
rPath, SvStream& rIStream,
sal_uInt16 nFormat, sal_uInt16*
pDeterminedFormat, GraphicFilterImportFlags nImportFlags,
- const css::uno::Sequence<
css::beans::PropertyValue >* /*pFilterData*/,
WmfExternal const *pExtHeader )
{
OUString aFilterName;
