diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-03-29 08:59:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-29 14:21:39 +0200 |
| commit | dc7f4b0002769308d38e6c6e9b714ef7766d2ae7 (patch) | |
| tree | 9306c6e9510d8b2a49e3cf4f46489127012f1b91 /xmloff | |
| parent | d4c9e2130f6f065b4a97fc98cf1029593e725e65 (diff) | |
tdf#131632 animation effects are missing features
regression from
commit 5352d45dd4a04f8f02cf7f6ad4169126d3b3586a
Date: Tue Feb 18 15:45:08 2020 +0200
convert AnimationImport to fast-parser APIs
Change-Id: I7227b122213c877b8ea5db25239eae8151597a8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91320
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/animationimport.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/token/tokens.txt | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 92abc4cef73e..a9cf682e7d5d 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -1878,6 +1878,7 @@ namespace xmloff::token { TOKEN( "text-input", XML_TEXT_INPUT ), TOKEN( "text-justify", XML_TEXT_JUSTIFY ), TOKEN( "text-outline", XML_TEXT_OUTLINE ), + TOKEN( "text-only", XML_TEXT_ONLY ), TOKEN( "text-position", XML_TEXT_POSITION ), TOKEN( "text-rotation-angle", XML_TEXT_ROTATION_ANGLE ), TOKEN( "text-rotation-scale", XML_TEXT_ROTATION_SCALE ), @@ -2972,6 +2973,7 @@ namespace xmloff::token { TOKEN( "preset-id", XML_PRESET_ID ), TOKEN( "preset-sub-type", XML_PRESET_SUB_TYPE ), TOKEN( "preset-class", XML_PRESET_CLASS ), + TOKEN( "preset-property", XML_PRESET_PROPERTY ), TOKEN( "custom", XML_CUSTOM ), TOKEN( "entrance", XML_ENTRANCE ), TOKEN( "exit", XML_EXIT ), diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 00e67ab20f20..e2a6c012e9a3 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -1142,6 +1142,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: // push all unknown attributes within the presentation namespace as user data if (nNamespace == NAMESPACE_TOKEN(XML_NAMESPACE_PRESENTATION) || nNamespace == NAMESPACE_TOKEN(XML_NAMESPACE_PRESENTATION_SO52) + || nNamespace == NAMESPACE_TOKEN(XML_NAMESPACE_PRESENTATION_OASIS) || nNamespace == NAMESPACE_TOKEN(XML_NAMESPACE_PRESENTATION_OOO)) { aUserData.emplace_back( SvXMLImport::getNameFromToken(aIter.getToken()), makeAny( rValue ) ); diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt index 5d14dd65c820..cd94bd5228d6 100644 --- a/xmloff/source/token/tokens.txt +++ b/xmloff/source/token/tokens.txt @@ -1791,6 +1791,7 @@ text-indent text-input text-justify text-outline +text-only text-position text-rotation-angle text-rotation-scale @@ -2790,6 +2791,7 @@ node-type preset-id preset-sub-type preset-class +preset-property custom entrance exit |