diff options
| author | knordback <kurt.nordback@collabora.com> | 2025-04-22 11:09:50 -0600 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2025-05-09 14:41:45 +0200 |
| commit | 95b2c8b82e63ed9f6c0bdeeab2fe9e74ee6283c0 (patch) | |
| tree | 9e83e3b0c5c2102e17691da399b1bc452a1e3364 /include | |
| parent | fda2cfeb8e69ec95bb464301140999486d06b984 (diff) | |
tdf#165742 Step 4.3: Establish a narrow export path for chartex
This is a subtask of tdf#165742: Chartex charts are lost on input from OOXML
and re-export.
Fix various aspects of input and output for chartex (and specifically
for funnel charts). This now allows for loading and re-exporting a
very basic funnel chart, with the result that MS Office successfully
loads the exported chart, and it looks similar (though not quite
identical) to the original.
Change-Id: I6eeb277e31250031604f7cdd21b80848a9c642ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184758
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Jenkins
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/core/xmlfilterbase.hxx | 7 | ||||
| -rw-r--r-- | include/oox/export/drawingml.hxx | 3 | ||||
| -rw-r--r-- | include/oox/token/relationship.hxx | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 1afa282f3346..1fcbf06bdaeb 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -201,12 +201,17 @@ public: The media type string, used in [Content_Types].xml stream in base storage. + @param bNoHeader + If true, do not include a header line in the output. If false, + potentially include a header line based on the media type string. + @return newly created serializer helper. */ ::sax_fastparser::FSHelperPtr openFragmentStreamWithSerializer( const OUString& rStreamName, - const OUString& rMediaType ); + const OUString& rMediaType, + bool bNoHeader = false); /** Returns new unique ID for exported document. diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index d0b08d8bb305..810fc4ff492e 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -525,7 +525,8 @@ public: const css::uno::Reference< css::io::XOutputStream >& xParentRelation, const OUString& sContentType, const OUString& sRelationshipType, - OUString* pRelationshipId ); + OUString* pRelationshipId, + bool bNoHeader = false); // Don't write a <?xml... header line OOX_DLLPUBLIC std::shared_ptr<GraphicExport> createGraphicExport(); }; diff --git a/include/oox/token/relationship.hxx b/include/oox/token/relationship.hxx index 3a5e69a5a0f5..cc97340583f1 100644 --- a/include/oox/token/relationship.hxx +++ b/include/oox/token/relationship.hxx @@ -20,7 +20,9 @@ enum class Relationship { ACTIVEXCONTROLBINARY, CHART, + CHARTCOLORSTYLE, // for chartex CHARTEX, + CHARTSTYLE, // for chartex CHARTUSERSHAPES, COMMENTS, COMMENTAUTHORS, |