diff options
| author | tundet <tundeth@gmail.com> | 2019-04-12 10:21:42 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-04-17 10:17:47 +0200 |
| commit | dc091e7fd952b0530db8583247c2f910d627700a (patch) | |
| tree | b9f9e791329be94147fb932806a98ec897fa57b6 /include | |
| parent | 185e01c015528cafbddcda5dfdabf816ce8be20e (diff) | |
tdf#123645 XLSX export: fix hyperlink inserted to chart
Hyperlink inserted to chart lost after export.
chart_hyperlink.xlsx: Test file from Excel 2016.
Change-Id: Ideca10e544193ba43d7c2ef6e9dd8e393383edc1
Reviewed-on: https://gerrit.libreoffice.org/70648
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/chartexport.hxx | 3 | ||||
| -rw-r--r-- | include/oox/export/drawingml.hxx | 10 | ||||
| -rw-r--r-- | include/oox/export/shapes.hxx | 10 |
3 files changed, 13 insertions, 10 deletions
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index c5f9e6ebd188..b39b3f52b455 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -101,6 +101,7 @@ private: css::uno::Reference< css::frame::XModel > mxChartModel; css::uno::Reference< css::chart::XDiagram > mxDiagram; css::uno::Reference< css::chart2::XDiagram > mxNewDiagram; + std::shared_ptr<URLTransformer> mpURLTransformer; // members filled by InitRangeSegmentationProperties (retrieved from DataProvider) bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false @@ -214,6 +215,8 @@ public: ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType ); virtual ~ChartExport() {} + void SetURLTranslator(const std::shared_ptr<URLTransformer>& pTransformer); + const css::uno::Reference< css::frame::XModel >& getModel(){ return mxChartModel; } void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nID, sal_Int32 nChartCount ); diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index b3cdbb3600ba..8ed1aaf0d702 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -96,6 +96,16 @@ namespace core { namespace drawingml { +class OOX_DLLPUBLIC URLTransformer +{ +public: + virtual ~URLTransformer(); + + virtual OUString getTransformedString(const OUString& rURL) const; + + virtual bool isExternalURL(const OUString& rURL) const; +}; + // Our rotation is counter-clockwise and is in 100ths of a degree. // drawingML rotation is clockwise and is in 60000ths of a degree. template <typename T> T ExportRotateClockwisify(T input) diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index aa0ca2cd1a62..b7755ccee9d2 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -78,16 +78,6 @@ OOX_DLLPUBLIC css::uno::Reference<css::io::XInputStream> GetOLEObjectStream( namespace oox { namespace drawingml { -class OOX_DLLPUBLIC URLTransformer -{ -public: - virtual ~URLTransformer(); - - virtual OUString getTransformedString(const OUString& rURL) const; - - virtual bool isExternalURL(const OUString& rURL) const; -}; - class OOX_DLLPUBLIC ShapeExport : public DrawingML { private: |