diff options
| author | Tünde Tóth <toth.tunde@nisz.hu> | 2022-04-04 11:49:59 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-04-26 18:07:40 +0200 |
| commit | cf2dc247ff5f726238856e9b46a4926a30430e14 (patch) | |
| tree | 8c319026977124ce3c6bbd1fdef418d09149325d /include/oox/export | |
| parent | 2fbf0f418ccb25010add33449d4e42b8b3f7fd0b (diff) | |
DOCX export: image deduplication and clean up
Follow-up to commit aea8043bc5f5187498fa450505d6de9d6986e2a6
"tdf#74670 tdf#91286 PPTX XLSX export: save image once".
This reverts commit 797fef38612fb2fd62d1f6591619b9361e526bca
"tdf#118535 DOCX export: save header image once"
and commit 32ada80a9f47b095d7b0c4d16e3422f6ef7f2ac2
"DOCX export: make sure a graphic is only written once"
and commit b484e9814c66d8d51cea974390963a6944bc9d73
"tdf#83227 oox: reuse RelId in DML/VML export for the same graphic".
Change-Id: I2d90249808174290b6b3e4eb957b3ac87ad41f95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132506
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include/oox/export')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 8 | ||||
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 9a7f744520c8..43aba83b6531 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -130,12 +130,6 @@ public: virtual void WriteOutliner(const OutlinerParaObject& rParaObj) = 0; /// Write the contents of the textbox that is associated to this shape. virtual void WriteTextBox(css::uno::Reference<css::drawing::XShape> xShape) = 0; - /// Look up the RelId of a graphic based on its checksum. - virtual OUString FindRelId(BitmapChecksum nChecksum) = 0; - /// Look up the filename of a graphic based on its checksum. - virtual OUString FindFileName(BitmapChecksum nChecksum) = 0; - /// Store the RelId and filename of a graphic based on its checksum. - virtual void CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId, const OUString& rFileName) = 0; /// Get textbox which belongs to the shape. virtual css::uno::Reference<css::text::XTextFrame> GetUnoTextFrame( css::uno::Reference<css::drawing::XShape> xShape) = 0; @@ -224,7 +218,7 @@ public: void SetBackgroundDark(bool bIsDark) { mbIsBackgroundDark = bIsDark; } /// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship - OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia = false, OUString* pFileName = nullptr ); + OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia = false ); void WriteColor( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT ); void WriteColor( const OUString& sColorSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT ); diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 5efdb34a90ff..fa54f27aa250 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -65,10 +65,6 @@ public: virtual oox::drawingml::DrawingML& GetDrawingML() = 0; /// Write the contents of the textbox that is associated to this shape in VML format. virtual void WriteVMLTextBox(css::uno::Reference<css::drawing::XShape> xShape) = 0; - /// Look up the RelId of a graphic based on its checksum. - virtual OUString FindRelId(BitmapChecksum nChecksum) = 0; - /// Store the RelId and filename of a graphic based on its checksum. - virtual void CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId, const OUString& rFileName) = 0; protected: VMLTextExport() {} virtual ~VMLTextExport() {} |