[Libreoffice-commits] libvisio.git: 2 commits - src/lib src/test

[Andras Timar]

 src/lib/VSDXTheme.cpp          |    7 +++++++
 src/test/data/color-boxes.vsdx |binary
 src/test/importtest.cpp        |   14 ++++++++++++++
 3 files changed, 21 insertions(+)

New commits:
commit fb715bb8a9154731e1629289cc6d43d7473dc460
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jun 29 14:58:44 2015 +0200

    unit test of VSDX theme color import fix
    
    Change-Id: I8b1466b83801e61c2d0c1b1a588f9d3867a063d1

diff --git a/src/test/data/color-boxes.vsdx b/src/test/data/color-boxes.vsdx
new file mode 100644
index 0000000..ef8f6a1
Binary files /dev/null and b/src/test/data/color-boxes.vsdx differ
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index 7aba7bc..f7b8972 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -126,6 +126,7 @@ class ImportTest : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST(testVsdMetadataTitleUtf8);
   CPPUNIT_TEST(testVsdUserDefinedMetadata);
   CPPUNIT_TEST(testVsdxUserDefinedMetadata);
+  CPPUNIT_TEST(testVsdxImportBgColorFromTheme);
   CPPUNIT_TEST_SUITE_END();
 
   void testVsdxMetadataTitle();
@@ -133,6 +134,7 @@ class ImportTest : public CPPUNIT_NS::TestFixture
   void testVsdMetadataTitleUtf8();
   void testVsdUserDefinedMetadata();
   void testVsdxUserDefinedMetadata();
+  void testVsdxImportBgColorFromTheme();
 
   xmlBufferPtr m_buffer;
   xmlDocPtr m_doc;
@@ -224,6 +226,18 @@ void ImportTest::testVsdxUserDefinedMetadata()
   assertXPath(m_doc, "/document/setDocumentMetaData", "template", "BASICD_M.VSTX");
 }
 
+void ImportTest::testVsdxImportBgColorFromTheme()
+{
+  m_doc = parse("color-boxes.vsdx", m_buffer);
+  assertXPath(m_doc, "/document/page/layer[1]//setStyle[2]", "fill-color", "#759fcc");
+  assertXPath(m_doc, "/document/page/layer[2]//setStyle[2]", "fill-color", "#70ad47");
+  assertXPath(m_doc, "/document/page/layer[3]//setStyle[2]", "fill-color", "#fec000");
+  assertXPath(m_doc, "/document/page/layer[4]//setStyle[2]", "fill-color", "#41719c");
+  assertXPath(m_doc, "/document/page/layer[5]//setStyle[2]", "fill-color", "#ed7d31");
+  assertXPath(m_doc, "/document/page/layer[6]//setStyle[2]", "fill-color", "#bdd0e9");
+  assertXPath(m_doc, "/document/page/layer[7]//setStyle[2]", "fill-color", "#5b9bd5");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest);
 
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
commit 5dc37c653ccb25f0353c2665899b1a0d94553745
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jun 29 13:22:08 2015 +0200

    tdf#92270 VSDX theme color import fix
    
    Change-Id: I4843762646c204d5c898d0f0dea503196a1e414a

diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp
index 3def5fb..85cf0ac 100644
--- a/src/lib/VSDXTheme.cpp
+++ b/src/lib/VSDXTheme.cpp
@@ -341,18 +341,25 @@ boost::optional<libvisio::Colour> libvisio::VSDXTheme::getThemeColour(unsigned v
     switch (value)
     {
     case 100:
+    case 200:
       return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor1;
     case 101:
+    case 201:
       return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor2;
     case 102:
+    case 202:
       return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor3;
     case 103:
+    case 203:
       return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor4;
     case 104:
+    case 204:
       return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor5;
     case 105:
+    case 205:
       return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor6;
     case 106:
+    case 206:
       return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor7;
     default:
       break;