diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2022-05-13 08:12:17 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-05-27 18:32:38 +0200 |
| commit | 855a56fea4561135a63cb729d7a625a950b210e7 (patch) | |
| tree | 96dd057f2ab6917041ee43e943c321880e57a5bf /include/oox | |
| parent | b3c965ccaa896b12b33ff5b7ccea0eb20d560116 (diff) | |
tdf#148965 PPTX import: fix internal hyperlinks on shapes
Locale dependent code path resulted broken hyperlinks
on shapes in a non-English build.
Change-Id: I045bbe4246ab5336e2b967bf252b5fbca5b17706
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134266
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 6 | ||||
| -rw-r--r-- | include/oox/ppt/slidepersist.hxx | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 4318c1e24d2d..e845b399f5f8 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -140,6 +140,9 @@ public: void setConnectorShape(bool bConnector) { mbConnector = bConnector; } bool isConnectorShape() const { return mbConnector; } + void setBookmark(bool bBookmark) { mbHasBookmark = bBookmark; } + bool hasBookmark() const { return mbHasBookmark; } + Shape3DProperties& get3DProperties() { return *mp3DPropertiesPtr; } const Shape3DProperties& get3DProperties() const { return *mp3DPropertiesPtr; } @@ -410,6 +413,9 @@ private: // Is this a connector shape? bool mbConnector = false; + // Is shape has bookmark? + bool mbHasBookmark = false; + // temporary space for DiagramHelper in preparation for collecting data // Note: I tried to use a unique_ptr here, but existing constructor func does not allow that svx::diagram::IDiagramHelper* mpDiagramHelper; diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index 1b0a92c70783..4ba48637c66a 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -127,6 +127,9 @@ public: void createConnectorShapeConnection(); + void addURLShapeId(const OUString& rShapeId) { maURLShapeId.push_back(rShapeId); } + std::vector<OUString>& getURLShapeId() { return maURLShapeId; } + private: OUString maPath; OUString maLayoutPath; @@ -160,6 +163,7 @@ private: CommentAuthorList maCommentAuthors; std::vector<OUString> maConnectorShapeId; + std::vector<OUString> maURLShapeId; }; } |