summaryrefslogtreecommitdiff
path: root/writerperfect/source/writer/exp/xmlimp.hxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-01-18 11:49:45 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-01-19 09:07:45 +0100
commit5c4d5021000584ac541e4d0323586c4ff926173f (patch)
tree7116ade1f81d473579374e8d023576dbea47b086 /writerperfect/source/writer/exp/xmlimp.hxx
parentcc2ee044d9fc34d112842ca6e4150567238c7e4f (diff)
EPUB export: fix validation error on invalid relative links
It's valid to have a relative link that points nowhere in ODF, but the same is not true for EPUB. Change-Id: I7884032e277a0c53d0c513cea70dd2ee29ccd85c
Diffstat (limited to 'writerperfect/source/writer/exp/xmlimp.hxx')
-rw-r--r--writerperfect/source/writer/exp/xmlimp.hxx15
1 files changed, 14 insertions, 1 deletions
diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx
index 9de89810f458..246eb45dbd16 100644
--- a/writerperfect/source/writer/exp/xmlimp.hxx
+++ b/writerperfect/source/writer/exp/xmlimp.hxx
@@ -33,6 +33,19 @@ namespace exp
class XMLImportContext;
+/// States describing the result of a link -> popup conversion.
+enum class PopupState
+{
+ /// Conversion did not happen yet.
+ NONE,
+ /// The relative link was converted to a popup.
+ Consumed,
+ /// The absolute link was not handled.
+ NotConsumed,
+ /// The relative link is invalid and should be ignored.
+ Ignore
+};
+
/// ODT export feeds this class to make librevenge calls.
class XMLImport : public cppu::WeakImplHelper
<
@@ -85,7 +98,7 @@ public:
std::map<OUString, librevenge::RVNGPropertyList> &GetGraphicStyles();
const librevenge::RVNGPropertyListVector &GetCoverImages();
const librevenge::RVNGPropertyList &GetMetaData();
- bool FillPopupData(const OUString &rURL, librevenge::RVNGPropertyList &rPropList);
+ PopupState FillPopupData(const OUString &rURL, librevenge::RVNGPropertyList &rPropList);
const std::vector<std::pair<css::uno::Sequence<sal_Int8>, Size>> &GetPageMetafiles() const;
const css::uno::Reference<css::uno::XComponentContext> &GetComponentContext() const;