xmloff/qa/unit/data/tdf157018_CustomTheme.fodg | 338 +++++++++++++++++++++++++
xmloff/qa/unit/draw.cxx | 33 ++
xmloff/source/draw/ximpstyl.cxx | 7
3 files changed, 373 insertions(+), 5 deletions(-)
New commits:
commit f6004caf2c1f6b4935d6cb49284303ee34744919
Author: Regina Henschel <rb.hensc...@t-online.de>
AuthorDate: Thu Aug 31 01:15:26 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Sep 1 14:40:05 2023 +0200
tdf#157018 Enable import of color theme for Draw
Use the color theme import in Draw too, otherwise we will not be able
to detect theme colors.
Change-Id: I8f01ba69848a6265193407a952144b31e3a7fdb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156313
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156394
diff --git a/xmloff/qa/unit/data/tdf157018_CustomTheme.fodg
b/xmloff/qa/unit/data/tdf157018_CustomTheme.fodg
new file mode 100644
index 000000000000..49673ca66793
--- /dev/null
+++ b/xmloff/qa/unit/data/tdf157018_CustomTheme.fodg
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:ooow="http://openoffice.org/200
4/writer" xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns
:css3t="http://www.w3.org/TR/css3-text/";
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.3"
office:mimetype="application/vnd.oasis.opendocument.graphics">
+ <office:meta>
+ <dc:date>2023-08-29T21:49:18.192000000</dc:date>
+ <meta:editing-duration>PT1S</meta:editing-duration>
+ <meta:editing-cycles>1</meta:editing-cycles>
+ <meta:generator>B2020/24.2.0.0.alpha0$Windows_X86_64
LibreOffice_project/aa3eea21fcf302ef4ddbba5841037378945f9d5e</meta:generator>
+ <meta:document-statistic meta:object-count="0"/>
+ </office:meta>
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop"
config:type="int">13970</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft"
config:type="int">10795</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth"
config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight"
config:type="int">0</config:config-item>
+ <config:config-item-map-indexed config:name="Views">
+ <config:config-item-map-entry>
+ <config:config-item config:name="ViewId"
config:type="string">view1</config:config-item>
+ <config:config-item config:name="GridIsVisible"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="GridIsFront"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsSnapToGrid"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsSnapToPageMargins"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsSnapToSnapLines"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsSnapToObjectFrame"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsSnapToObjectPoints"
config:type="boolean">false</config:config-item>
+ <config:config-item
config:name="IsPlusHandlesAlwaysVisible"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsFrameDragSingles"
config:type="boolean">true</config:config-item>
+ <config:config-item
config:name="EliminatePolyPointLimitAngle"
config:type="int">1500</config:config-item>
+ <config:config-item config:name="IsEliminatePolyPoints"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="VisibleLayers"
config:type="base64Binary">Hw==</config:config-item>
+ <config:config-item config:name="PrintableLayers"
config:type="base64Binary">Hw==</config:config-item>
+ <config:config-item config:name="LockedLayers"
config:type="base64Binary"/>
+ <config:config-item config:name="NoAttribs"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="NoColors"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="RulerIsVisible"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PageKind"
config:type="short">0</config:config-item>
+ <config:config-item config:name="SelectedPage"
config:type="short">0</config:config-item>
+ <config:config-item config:name="IsLayerMode"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsDoubleClickTextEdit"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsClickChangeRotation"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SlidesPerRow"
config:type="short">4</config:config-item>
+ <config:config-item config:name="EditMode"
config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaTop"
config:type="int">-407</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft"
config:type="int">-9321</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth"
config:type="int">40625</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight"
config:type="int">29064</config:config-item>
+ <config:config-item config:name="GridCoarseWidth"
config:type="int">1270</config:config-item>
+ <config:config-item config:name="GridCoarseHeight"
config:type="int">1270</config:config-item>
+ <config:config-item config:name="GridFineWidth"
config:type="int">317</config:config-item>
+ <config:config-item config:name="GridFineHeight"
config:type="int">317</config:config-item>
+ <config:config-item config:name="GridSnapWidthXNumerator"
config:type="int">1270</config:config-item>
+ <config:config-item
config:name="GridSnapWidthXDenominator" config:type="int">4</config:config-item>
+ <config:config-item config:name="GridSnapWidthYNumerator"
config:type="int">1270</config:config-item>
+ <config:config-item
config:name="GridSnapWidthYDenominator" config:type="int">4</config:config-item>
+ <config:config-item config:name="IsAngleSnapEnabled"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SnapAngle"
config:type="int">1500</config:config-item>
+ <config:config-item config:name="ZoomOnPage"
config:type="boolean">true</config:config-item>
+ <config:config-item
config:name="AnchoredTextOverflowLegacy"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="LegacySingleLineFontwork"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ConnectorUseSnapRect"
config:type="boolean">false</config:config-item>
+ <config:config-item
config:name="IgnoreBreakAfterMultilineField"
config:type="boolean">false</config:config-item>
+ </config:config-item-map-entry>
+ </config:config-item-map-indexed>
+ </config:config-item-set>
+ <config:config-item-set config:name="ooo:configuration-settings">
+ <config:config-item config:name="IsPrintBookletBack"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="DefaultTabStop"
config:type="int">1270</config:config-item>
+ <config:config-item config:name="PrinterName"
config:type="string">EPSON6FC99C (WP-4025 Series)</config:config-item>
+ <config:config-item config:name="PrinterSetup"
config:type="base64Binary">iAv+/0VQU09ONkZDOTlDIChXUC00MDI1IFNlcmllcykAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARVBTT04gV1AtNDAyNSBTZXJpZXMAAAAAAAAAAAAAAAAWAAEAWgoAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAUABTAE8ATgA2AEYAQwA5ADkAQwAgACgAVwBQAC0ANAAwADIANQAgAFMAZQByAGkAZQBzACkAAAAAAAAAAAABBAAB3AB0CQ+bgAcBAAkAmgs0CGQAAQAHAFgCAgABAFgCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0CQAAAQEBAQABAAABAAAAAAAAAAAAAAA4AAAAfAgAALQIAABAAAAA9AgAAIAAAAAAAAAAAAAAAAMABwRFAFAAUwBPAE4AIABXAFAALQA0ADAAMgA1ACAAUwBlAHIAaQBlAHMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAABYAgAAAAAAAAAAAAABAAAAAgAAAAAAAQBYAlgCBwAAAAAACQA0CJoLHgAeAB4AHgA0CJoLOwORBAEAAAAOABYAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAYAAAAAAAAAAAACAAAAAAIAAAMAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAABkAGQANAiaCx4AHgAeAB4ACQAAAAAAAAAAAAAA//8AAAAAAAAAAB4AHgABAAAAAwDgAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAQAAgAAAAAAAAAAAAEAMgAyANT+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYACoAAAAgAAEAAAAgAAAAQAAAAAYAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs/wAAAAAAAAAAAABCAAAAAQAAALAAAAAAAAAAAAAAAAAAAAAeAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBARIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmYMAFBSSU5URVJfTkFNRRwARVBTT042RkM5OUMgKFdQLTQwMjUgU2VyaWVzKQsARFJJVkVSX0
5BTUUUAEVQU09OIFdQLTQwMjUgU2VyaWVz</config:config-item>
+ <config:config-item config:name="PrinterPaperFromSetup"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintPageName"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintDate"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="BitmapTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sob</config:config-item>
+ <config:config-item config:name="IsPrintTime"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ImagePreferredDPI"
config:type="int">0</config:config-item>
+ <config:config-item config:name="CharacterCompressionType"
config:type="short">0</config:config-item>
+ <config:config-item config:name="IsPrintHiddenPages"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsPrintFitPage"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintTilePage"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SaveThumbnail"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsPrintBooklet"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintBookletFront"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintQuality"
config:type="int">0</config:config-item>
+ <config:config-item config:name="ColorTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.soc</config:config-item>
+ <config:config-item config:name="DashTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sod</config:config-item>
+ <config:config-item config:name="LineEndTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.soe</config:config-item>
+ <config:config-item config:name="HatchTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.soh</config:config-item>
+ <config:config-item config:name="GradientTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sog</config:config-item>
+ <config:config-item config:name="ApplyUserData"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PageNumberFormat"
config:type="int">4</config:config-item>
+ <config:config-item config:name="ParagraphSummation"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsKernAsianPunctuation"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UpdateFromTemplate"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrinterIndependentLayout"
config:type="string">low-resolution</config:config-item>
+ <config:config-item config:name="LoadReadonly"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SaveVersionOnClose"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedComplexScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedOnlyUsedFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedLatinScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedAsianScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="MeasureUnit"
config:type="short">7</config:config-item>
+ <config:config-item config:name="ScaleNumerator"
config:type="int">1</config:config-item>
+ <config:config-item config:name="ScaleDenominator"
config:type="int">1</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:scripts>
+ <office:script script:language="ooo:Basic">
+ <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office";
xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ </office:script>
+ </office:scripts>
+ <office:font-face-decls>
+ <style:font-face style:name="DejaVu Sans"
svg:font-family="'DejaVu Sans'" style:font-family-generic="system"
style:font-pitch="variable"/>
+ <style:font-face style:name="Liberation Sans"
svg:font-family="'Liberation Sans'" style:font-family-generic="roman"
style:font-pitch="variable"/>
+ <style:font-face style:name="Liberation Serif"
svg:font-family="'Liberation Serif'"
style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Lucida Sans"
svg:font-family="'Lucida Sans'" style:font-family-generic="system"
style:font-pitch="variable"/>
+ <style:font-face style:name="Microsoft YaHei"
svg:font-family="'Microsoft YaHei'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Sans" svg:font-family="'Noto
Sans'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <draw:gradient draw:name="Filled" draw:style="linear"
draw:start-color="#ffffff" draw:end-color="#cccccc" draw:start-intensity="100%"
draw:end-intensity="100%" draw:angle="30deg" draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#ffffff"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#cccccc"/>
+ </draw:gradient>
+ <draw:gradient draw:name="Filled_20_Blue" draw:display-name="Filled
Blue" draw:style="linear" draw:start-color="#729fcf" draw:end-color="#355269"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#729fcf"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#355269"/>
+ </draw:gradient>
+ <draw:gradient draw:name="Filled_20_Green" draw:display-name="Filled
Green" draw:style="linear" draw:start-color="#77bc65" draw:end-color="#127622"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#77bc65"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#127622"/>
+ </draw:gradient>
+ <draw:gradient draw:name="Filled_20_Red" draw:display-name="Filled
Red" draw:style="linear" draw:start-color="#ff6d6d" draw:end-color="#c9211e"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#ff6d6d"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#c9211e"/>
+ </draw:gradient>
+ <draw:gradient draw:name="Filled_20_Yellow" draw:display-name="Filled
Yellow" draw:style="linear" draw:start-color="#ffde59" draw:end-color="#b47804"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#ffde59"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#b47804"/>
+ </draw:gradient>
+ <draw:gradient draw:name="Shapes" draw:style="rectangular"
draw:cx="50%" draw:cy="50%" draw:start-color="#cccccc" draw:end-color="#ffffff"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#cccccc"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#ffffff"/>
+ </draw:gradient>
+ <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10
0l-10 30h20z"/>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4"
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" style:writing-mode="lr-tb"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:punctuation-wrap="simple" style:line-break="strict"
loext:tab-stop-distance="0cm" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="24pt"
fo:language="en" fo:country="US" style:font-name-asian="DejaVu Sans"
style:font-size-asian="24pt" style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="DejaVu Sans" style:font-size-complex="24pt"
style:language-complex="hi" style:country-complex="IN"/>
+ </style:default-style>
+ <style:style style:name="standard" style:family="graphic">
+ <style:graphic-properties draw:stroke="solid"
svg:stroke-width="0cm" svg:stroke-color="#3465a4"
draw:marker-start-width="0.2cm" draw:marker-start-center="false"
draw:marker-end-width="0.2cm" draw:marker-end-center="false" draw:fill="solid"
draw:fill-color="#729fcf" draw:textarea-horizontal-align="justify"
fo:padding-top="0.125cm" fo:padding-bottom="0.125cm" fo:padding-left="0.25cm"
fo:padding-right="0.25cm" fo:wrap-option="wrap" draw:shadow="hidden"
draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm"
draw:shadow-color="#808080">
+ <text:list-style style:name="standard">
+ <text:list-level-style-bullet text:level="1"
text:bullet-char="●">
+ <style:list-level-properties
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="2"
text:bullet-char="●">
+ <style:list-level-properties text:space-before="0.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="3"
text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="4"
text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="5"
text:bullet-char="●">
+ <style:list-level-properties text:space-before="2.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="6"
text:bullet-char="●">
+ <style:list-level-properties text:space-before="3cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="7"
text:bullet-char="●">
+ <style:list-level-properties text:space-before="3.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="8"
text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="9"
text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="10"
text:bullet-char="●">
+ <style:list-level-properties text:space-before="5.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ </text:list-style>
+ </style:graphic-properties>
+ <style:paragraph-properties fo:margin-left="0cm"
fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm"
fo:line-height="100%" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-variant="normal"
fo:text-transform="none" style:use-window-font-color="true" loext:opacity="0%"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" style:font-name="Liberation Sans"
fo:font-family="'Liberation Sans'" style:font-family-generic="roman"
style:font-pitch="variable" fo:font-size="18pt" fo:font-style="normal"
fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal"
style:letter-kerning="true" style:font-name-asian="Microsoft YaHei"
style:font-family-asian="'Microsoft YaHei'"
style:font-family-generic-asian="system" style:font-pitch-asian="variable"
style:font-size-asian="18pt" style:font-style-asian="normal"
style:font-weight-asian="normal" style:font-name-complex="Lucida Sans"
style:font-family-complex="'Lucida Sans'"
style:font-family-generic-complex="system" style:font-pitch-complex="variable"
style:font-size-complex="18pt" sty
le:font-style-complex="normal" style:font-weight-complex="normal"
style:text-emphasize="none" style:font-relief="none"
style:text-overline-style="none" style:text-overline-color="font-color"/>
+ </style:style>
+ <style:style style:name="objectwithoutfill" style:family="graphic"
style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none"/>
+ </style:style>
+ <style:style
style:name="Object_20_with_20_no_20_fill_20_and_20_no_20_line"
style:display-name="Object with no fill and no line" style:family="graphic"
style:parent-style-name="standard">
+ <style:graphic-properties draw:stroke="none" draw:fill="none"/>
+ </style:style>
+ <style:style style:name="Text" style:family="graphic">
+ <style:graphic-properties draw:stroke="solid"
svg:stroke-color="#cccccc" draw:fill="solid" draw:fill-color="#eeeeee"/>
+ <style:text-properties style:font-name="Noto Sans"
fo:font-family="'Noto Sans'" style:font-family-generic="roman"
style:font-pitch="variable"/>
+ </style:style>
+ <style:style style:name="A4" style:family="graphic"
style:parent-style-name="Text">
+ <style:graphic-properties draw:fill="none"/>
+ <style:text-properties fo:font-size="18pt"/>
+ </style:style>
+ <style:style style:name="Title_20_A4" style:display-name="Title A4"
style:family="graphic" style:parent-style-name="A4">
+ <style:graphic-properties draw:stroke="none"/>
+ <style:text-properties fo:font-size="44pt"/>
+ </style:style>
+ <style:style style:name="Heading_20_A4" style:display-name="Heading
A4" style:family="graphic" style:parent-style-name="A4">
+ <style:graphic-properties draw:stroke="none"/>
+ <style:text-properties fo:font-size="24pt"/>
+ </style:style>
+ <style:style style:name="Text_20_A4" style:display-name="Text A4"
style:family="graphic" style:parent-style-name="A4">
+ <style:graphic-properties draw:stroke="none"/>
+ </style:style>
+ <style:style style:name="A0" style:family="graphic"
style:parent-style-name="Text">
+ <style:graphic-properties draw:fill="none"/>
+ <style:text-properties fo:font-size="48pt"/>
+ </style:style>
+ <style:style style:name="Title_20_A0" style:display-name="Title A0"
style:family="graphic" style:parent-style-name="A0">
+ <style:graphic-properties draw:stroke="none"/>
+ <style:text-properties fo:font-size="96pt"/>
+ </style:style>
+ <style:style style:name="Heading_20_A0" style:display-name="Heading
A0" style:family="graphic" style:parent-style-name="A0">
+ <style:graphic-properties draw:stroke="none"/>
+ <style:text-properties fo:font-size="71.9000015258789pt"/>
+ </style:style>
+ <style:style style:name="Text_20_A0" style:display-name="Text A0"
style:family="graphic" style:parent-style-name="A0">
+ <style:graphic-properties draw:stroke="none"/>
+ </style:style>
+ <style:style style:name="Graphic" style:family="graphic">
+ <style:graphic-properties draw:fill="solid"
draw:fill-color="#ffffff"/>
+ <style:text-properties style:font-name="Liberation Sans"
fo:font-family="'Liberation Sans'" style:font-family-generic="roman"
style:font-pitch="variable" fo:font-size="18pt"/>
+ </style:style>
+ <style:style style:name="Shapes" style:family="graphic"
style:parent-style-name="Graphic">
+ <style:graphic-properties draw:stroke="none" draw:fill="gradient"
draw:fill-gradient-name="Shapes"/>
+ <style:text-properties fo:font-size="14pt" fo:font-weight="bold"/>
+ </style:style>
+ <style:style style:name="Filled" style:family="graphic"
style:parent-style-name="Shapes">
+ <style:graphic-properties draw:fill="gradient"
draw:fill-gradient-name="Filled"/>
+ </style:style>
+ <style:style style:name="Filled_20_Blue" style:display-name="Filled
Blue" style:family="graphic" style:parent-style-name="Filled">
+ <style:graphic-properties
draw:fill-gradient-name="Filled_20_Blue"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Filled_20_Green" style:display-name="Filled
Green" style:family="graphic" style:parent-style-name="Filled">
+ <style:graphic-properties
draw:fill-gradient-name="Filled_20_Green"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"
style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'"
style:font-family-generic="roman" style:font-pitch="variable"/>
+ </style:style>
+ <style:style style:name="Filled_20_Red" style:display-name="Filled
Red" style:family="graphic" style:parent-style-name="Filled">
+ <style:graphic-properties draw:fill-gradient-name="Filled_20_Red"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Filled_20_Yellow" style:display-name="Filled
Yellow" style:family="graphic" style:parent-style-name="Filled">
+ <style:graphic-properties
draw:fill-gradient-name="Filled_20_Yellow"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Outlined" style:family="graphic"
style:parent-style-name="Shapes">
+ <style:graphic-properties draw:stroke="solid"
svg:stroke-width="0.081cm" svg:stroke-color="#000000" draw:fill="none"/>
+ </style:style>
+ <style:style style:name="Outlined_20_Blue"
style:display-name="Outlined Blue" style:family="graphic"
style:parent-style-name="Outlined">
+ <style:graphic-properties svg:stroke-color="#355269"/>
+ <style:text-properties fo:color="#355269" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Outlined_20_Green"
style:display-name="Outlined Green" style:family="graphic"
style:parent-style-name="Outlined">
+ <style:graphic-properties svg:stroke-color="#127622"/>
+ <style:text-properties fo:color="#127622" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Outlined_20_Red" style:display-name="Outlined
Red" style:family="graphic" style:parent-style-name="Outlined">
+ <style:graphic-properties svg:stroke-color="#c9211e"/>
+ <style:text-properties fo:color="#c9211e" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Outlined_20_Yellow"
style:display-name="Outlined Yellow" style:family="graphic"
style:parent-style-name="Outlined">
+ <style:graphic-properties draw:stroke="solid"
svg:stroke-color="#b47804"/>
+ <style:text-properties fo:color="#b47804" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Lines" style:family="graphic"
style:parent-style-name="Graphic">
+ <style:graphic-properties draw:stroke="solid"
svg:stroke-color="#000000" draw:fill="none"/>
+ </style:style>
+ <style:style style:name="Arrow_20_Line" style:display-name="Arrow
Line" style:family="graphic" style:parent-style-name="Lines">
+ <style:graphic-properties draw:marker-start="Arrow"
draw:marker-start-width="0.2cm" draw:marker-end="Arrow"
draw:marker-end-width="0.2cm" draw:show-unit="true"/>
+ </style:style>
+ <style:style style:name="Arrow_20_Dashed" style:display-name="Arrow
Dashed" style:family="graphic" style:parent-style-name="Lines">
+ <style:graphic-properties draw:stroke="dash"/>
+ </style:style>
+ </office:styles>
+ <office:automatic-styles>
+ <style:page-layout style:name="PM0">
+ <style:page-layout-properties fo:margin-top="1cm"
fo:margin-bottom="1cm" fo:margin-left="1cm" fo:margin-right="1cm"
fo:page-width="21.59cm" fo:page-height="27.94cm"
style:print-orientation="portrait"/>
+ </style:page-layout>
+ <style:style style:name="dp1" style:family="drawing-page">
+ <style:drawing-page-properties draw:background-size="border"
draw:fill="none"/>
+ </style:style>
+ <style:style style:name="dp2" style:family="drawing-page"/>
+ </office:automatic-styles>
+ <office:master-styles>
+ <draw:layer-set>
+ <draw:layer draw:name="layout"/>
+ <draw:layer draw:name="background"/>
+ <draw:layer draw:name="backgroundobjects"/>
+ <draw:layer draw:name="controls"/>
+ <draw:layer draw:name="measurelines"/>
+ </draw:layer-set>
+ <style:master-page style:name="Default" style:page-layout-name="PM0"
draw:style-name="dp1">
+ <loext:theme loext:name="Custom">
+ <loext:theme-colors loext:name="My Colors">
+ <loext:color loext:name="dark1" loext:color="#000000"/>
+ <loext:color loext:name="light1" loext:color="#ffff11"/>
+ <loext:color loext:name="dark2" loext:color="#002200"/>
+ <loext:color loext:name="light2" loext:color="#ff33ff"/>
+ <loext:color loext:name="accent1" loext:color="#440000"/>
+ <loext:color loext:name="accent2" loext:color="#005500"/>
+ <loext:color loext:name="accent3" loext:color="#000066"/>
+ <loext:color loext:name="accent4" loext:color="#777700"/>
+ <loext:color loext:name="accent5" loext:color="#880088"/>
+ <loext:color loext:name="accent6" loext:color="#009999"/>
+ <loext:color loext:name="hyperlink" loext:color="#0a0a0a"/>
+ <loext:color loext:name="followed-hyperlink"
loext:color="#b0b0b0"/>
+ </loext:theme-colors>
+ </loext:theme>
+ </style:master-page>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:name="page1" draw:style-name="dp2"
draw:master-page-name="Default"/>
+ </office:drawing>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx
index cfb68ed0a109..cd934cb4c88b 100644
--- a/xmloff/qa/unit/draw.cxx
+++ b/xmloff/qa/unit/draw.cxx
@@ -725,6 +725,39 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest,
testTdf156975_ThemeExport)
assertXPath(pXmlDoc, sThemeColorPath + "[12]", "name",
"followed-hyperlink");
assertXPath(pXmlDoc, sThemeColorPath + "[12]", "color", "#b0b0b0");
}
+
+CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testTdf157018_ThemeImportDraw)
+{
+ // Similar to testThemeImport but for Draw.
+ // Load document with custom color theme
+ loadFromURL(u"tdf157018_CustomTheme.fodg");
+
+ // First make sure the doc model has a master page with a theme:
+ uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<drawing::XMasterPageTarget> xDrawPage(
+ xDrawPagesSupplier->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet>
xMasterpage(xDrawPage->getMasterPage(), uno::UNO_QUERY);
+
+ uno::Reference<util::XTheme> xTheme;
+ xMasterpage->getPropertyValue("Theme") >>= xTheme;
+ CPPUNIT_ASSERT(xTheme.is());
+
+ // Then make sure it is the custom color theme
+ auto* pUnoTheme = dynamic_cast<UnoTheme*>(xTheme.get());
+ CPPUNIT_ASSERT(pUnoTheme);
+ auto pTheme = pUnoTheme->getTheme();
+ CPPUNIT_ASSERT(pTheme);
+
+ CPPUNIT_ASSERT_EQUAL(OUString("Custom"), pTheme->GetName());
+ auto pColorSet = pTheme->getColorSet();
+ CPPUNIT_ASSERT(pColorSet);
+ CPPUNIT_ASSERT_EQUAL(OUString("My Colors"), pColorSet->getName());
+
+ // and test some colors
+ CPPUNIT_ASSERT_EQUAL(Color(0xFFFF11),
pColorSet->getColor(model::ThemeColorType::Light1));
+ CPPUNIT_ASSERT_EQUAL(Color(0x0A0A0A),
pColorSet->getColor(model::ThemeColorType::Hyperlink));
+ CPPUNIT_ASSERT_EQUAL(Color(0x440000),
pColorSet->getColor(model::ThemeColorType::Accent1));
+}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 196aeb136a1e..052034a5f639 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -836,11 +836,8 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
SdXMLMasterPageContext
}
case XML_ELEMENT(LO_EXT, XML_THEME):
{
- if (GetSdImport().IsImpress())
- {
- uno::Reference<drawing::XDrawPage>
xMasterPage(GetLocalShapesContext(), uno::UNO_QUERY);
- return new XMLThemeContext(GetSdImport(), xAttrList,
xMasterPage);
- }
+ uno::Reference<drawing::XDrawPage>
xMasterPage(GetLocalShapesContext(), uno::UNO_QUERY);
+ return new XMLThemeContext(GetSdImport(), xAttrList, xMasterPage);
break;
}
}
