PPTX export: remember color schemes in theme

Remember color scheme from loaded pptx file
or use default values.

Change-Id: Icb69c51603afc5f332c20c75e4ed5f659f4b5614
Reviewed-on: https://gerrit.libreoffice.org/43470
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>

3 files changed, 35 insertions, 1 deletions

diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index ccb1517e44eb..ccf918d7ba74 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -28,9 +28,42 @@
 
 #include <oox/dllapi.h>
 #include <sal/types.h>
+#include <rtl/ustring.hxx>
 
 namespace oox { namespace drawingml {
 
+enum PredefinedClrSchemeId {
+    //dk1,
+    //lt1,
+    dk2 = 0,
+    lt2,
+    accent1,
+    accent2,
+    accent3,
+    accent4,
+    accent5,
+    accent6,
+    hlink,
+    folHlink,
+    Count
+};
+
+static std::map<PredefinedClrSchemeId, rtl::OUString> PredefinedClrNames =
+{
+    //{ dk1,  "dk1" },
+    //{ lt1, "lt1" },
+    { dk2, "dk2" },
+    { lt2, "lt2" },
+    { accent1, "accent1" },
+    { accent2, "accent2" },
+    { accent3, "accent3" },
+    { accent4, "accent4" },
+    { accent5, "accent5" },
+    { accent6, "accent6" },
+    { hlink, "hlink" },
+    { folHlink, "folHlink" }
+};
+
 class ClrMap
 {
     std::map < sal_Int32, sal_Int32 > maClrMap;
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 6bca2edcbd16..74e78a37da33 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -28,7 +28,7 @@ inline OString I32S_(sal_Int32 x) { return OString::number(x); }
 inline OString I32SHEX_(sal_Int32 x)
 {
     OString aStr = OString::number(x, 16);
-    if (aStr.getLength() % 2 != 0)
+    while (aStr.getLength() < 6)
         aStr = OString("0") + aStr;
     return aStr.getStr();
 }
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index aeda119cd2f1..637e70643be7 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -53,6 +53,7 @@ protected:
 private:
 
     void importSlide(sal_uInt32 nSlide, bool bFirstSlide, bool bImportNotes);
+    void saveThemeToGrabBag(oox::drawingml::ThemePtr pThemePtr, const OUString& sTheme);
 
     std::vector< OUString > maSlideMasterVector;
     std::vector< OUString > maSlidesVector;