These headers are private, also do not export symbols.

Change-Id: Ic63372285fecb6f1be22e92c36cdb6f94733f5c1

7 files changed, 117 insertions, 7 deletions

diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx
index be4af0c252d2..f195932aed5a 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "oox/drawingml/effectproperties.hxx"
+#include "effectproperties.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/helper/graphichelper.hxx"
diff --git a/oox/source/drawingml/effectproperties.hxx b/oox/source/drawingml/effectproperties.hxx
new file mode 100644
index 000000000000..0b3527ec5f85
--- /dev/null
+++ b/oox/source/drawingml/effectproperties.hxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
+
+#include <map>
+#include <oox/drawingml/color.hxx>
+#include <oox/helper/propertymap.hxx>
+
+namespace oox {
+namespace drawingml {
+
+
+
+struct EffectShadowProperties
+{
+    OptValue< sal_Int64 > moShadowDist;
+    OptValue< sal_Int64 > moShadowDir;
+    OptValue< sal_Int64 > moShadowAlpha;
+    Color moShadowColor;
+
+    /** Overwrites all members that are explicitly set in rSourceProps. */
+    void                assignUsed( const EffectShadowProperties& rSourceProps );
+};
+
+
+
+struct Effect
+{
+    OUString msName;
+    std::map< OUString, css::uno::Any > maAttribs;
+    Color moColor;
+
+    css::beans::PropertyValue getEffect();
+};
+
+
+
+struct EffectProperties
+{
+    EffectShadowProperties maShadow;
+
+    /** Stores all effect properties, including those not supported by core yet */
+    std::vector< Effect* > maEffects;
+
+    /** Overwrites all members that are explicitly set in rSourceProps. */
+    void                assignUsed( const EffectProperties& rSourceProps );
+
+    /** Writes the properties to the passed property map. */
+    void                pushToPropMap(
+                            PropertyMap& rPropMap,
+                            const GraphicHelper& rGraphicHelper ) const;
+};
+
+
+
+} // namespace drawingml
+} // namespace oox
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index fa515d1ca568..e803644fb16d 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -7,10 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "oox/drawingml/effectpropertiescontext.hxx"
+#include "effectpropertiescontext.hxx"
+#include "effectproperties.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
-#include "oox/drawingml/effectproperties.hxx"
 #include "oox/helper/attributelist.hxx"
 
 using namespace ::oox::core;
diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/source/drawingml/effectpropertiescontext.hxx
new file mode 100644
index 000000000000..fb336e42a6f5
--- /dev/null
+++ b/oox/source/drawingml/effectpropertiescontext.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+
+#include <oox/core/contexthandler2.hxx>
+
+namespace oox { namespace drawingml {
+
+struct EffectProperties;
+struct Effect;
+
+class EffectPropertiesContext : public ::oox::core::ContextHandler2
+{
+public:
+    EffectPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+            EffectProperties& rEffectProperties ) throw();
+    virtual ~EffectPropertiesContext();
+
+    virtual ::oox::core::ContextHandlerRef
+        onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
+
+protected:
+    EffectProperties& mrEffectProperties;
+
+private:
+    void saveUnsupportedAttribs( Effect& rEffect, const AttributeList& rAttribs );
+};
+
+} }
+
+#endif // INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 6fdbfe0eeae6..9d16c3979c2c 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -22,7 +22,7 @@
 #include "oox/drawingml/theme.hxx"
 #include "oox/drawingml/fillproperties.hxx"
 #include "oox/drawingml/lineproperties.hxx"
-#include "oox/drawingml/effectproperties.hxx"
+#include "effectproperties.hxx"
 #include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/drawingml/textbody.hxx"
 #include "oox/drawingml/table/tableproperties.hxx"
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index daf87312402c..e5b19249e62c 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -30,7 +30,7 @@
 #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
 #include "oox/drawingml/transform2dcontext.hxx"
 #include "oox/drawingml/customshapegeometry.hxx"
-#include "oox/drawingml/effectpropertiescontext.hxx"
+#include "effectpropertiescontext.hxx"
 
 using namespace oox::core;
 using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx
index cf76a3eea731..cc1c10e3b8e4 100644
--- a/oox/source/drawingml/themeelementscontext.cxx
+++ b/oox/source/drawingml/themeelementscontext.cxx
@@ -21,12 +21,12 @@
 #include "oox/drawingml/clrschemecontext.hxx"
 #include "oox/drawingml/lineproperties.hxx"
 #include "oox/drawingml/linepropertiescontext.hxx"
-#include "oox/drawingml/effectproperties.hxx"
-#include "oox/drawingml/effectpropertiescontext.hxx"
 #include "oox/drawingml/fillproperties.hxx"
 #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
 #include "oox/drawingml/theme.hxx"
 #include "oox/helper/attributelist.hxx"
+#include "effectproperties.hxx"
+#include "effectpropertiescontext.hxx"
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;