include/oox/drawingml/effectproperties.hxx | 67 ---------------------
include/oox/drawingml/effectpropertiescontext.hxx | 44 --------------
oox/source/drawingml/effectproperties.cxx | 2
oox/source/drawingml/effectproperties.hxx | 69 ++++++++++++++++++++++
oox/source/drawingml/effectpropertiescontext.cxx | 4 -
oox/source/drawingml/effectpropertiescontext.hxx | 41 +++++++++++++
oox/source/drawingml/shape.cxx | 2
oox/source/drawingml/shapepropertiescontext.cxx | 2
oox/source/drawingml/themeelementscontext.cxx | 4 -
9 files changed, 117 insertions(+), 118 deletions(-)
New commits:
commit 503facc9c423ef307799bbc89f7a786853b7dc29
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Tue Jun 17 10:23:25 2014 +0200
These headers are private, also do not export symbols.
Change-Id: Ic63372285fecb6f1be22e92c36cdb6f94733f5c1
diff --git a/oox/source/drawingml/effectproperties.cxx
b/oox/source/drawingml/effectproperties.cxx
index be4af0c..f195932 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/include/oox/drawingml/effectproperties.hxx
b/oox/source/drawingml/effectproperties.hxx
similarity index 93%
rename from include/oox/drawingml/effectproperties.hxx
rename to oox/source/drawingml/effectproperties.hxx
index a25aa12..0b3527e 100644
--- a/include/oox/drawingml/effectproperties.hxx
+++ b/oox/source/drawingml/effectproperties.hxx
@@ -10,7 +10,9 @@
#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
-#include <oox/drawingml/fillproperties.hxx>
+#include <map>
+#include <oox/drawingml/color.hxx>
+#include <oox/helper/propertymap.hxx>
namespace oox {
namespace drawingml {
@@ -41,7 +43,7 @@ struct Effect
-struct OOX_DLLPUBLIC EffectProperties
+struct EffectProperties
{
EffectShadowProperties maShadow;
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx
b/oox/source/drawingml/effectpropertiescontext.cxx
index fa515d1..e803644 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/include/oox/drawingml/effectpropertiescontext.hxx
b/oox/source/drawingml/effectpropertiescontext.hxx
similarity index 88%
rename from include/oox/drawingml/effectpropertiescontext.hxx
rename to oox/source/drawingml/effectpropertiescontext.hxx
index 6106254..fb336e4 100644
--- a/include/oox/drawingml/effectpropertiescontext.hxx
+++ b/oox/source/drawingml/effectpropertiescontext.hxx
@@ -11,16 +11,13 @@
#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
#include <oox/core/contexthandler2.hxx>
-#include <oox/dllapi.h>
-#include <oox/drawingml/effectproperties.hxx>
namespace oox { namespace drawingml {
-
-
struct EffectProperties;
+struct Effect;
-class OOX_DLLPUBLIC EffectPropertiesContext : public
::oox::core::ContextHandler2
+class EffectPropertiesContext : public ::oox::core::ContextHandler2
{
public:
EffectPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 6fdbfe0..9d16c39 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 daf8731..e5b1924 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 cf76a3e..cc1c10e 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
