Move two include files to oox/inc as they are used only in oox

Change-Id: Ie13614c1977f45aa8086f4db65ca86b7d9212735

2 files changed, 0 insertions, 247 deletions

diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx
deleted file mode 100644
index bed67d6fcc46..000000000000
--- a/include/oox/drawingml/fillproperties.hxx
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIES_HXX
-#define INCLUDED_OOX_DRAWINGML_FILLPROPERTIES_HXX
-
-#include <map>
-
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <oox/dllapi.h>
-#include <oox/drawingml/color.hxx>
-#include <oox/helper/helper.hxx>
-#include <oox/ole/oleobjecthelper.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
-
-namespace com { namespace sun { namespace star {
-    namespace graphic { class XGraphic; }
-} } }
-
-namespace oox {
-    class GraphicHelper;
-}
-
-namespace oox {
-namespace drawingml {
-
-class ShapePropertyMap;
-
-struct GradientFillProperties
-{
-    typedef ::std::map< double, Color > GradientStopMap;
-
-    GradientStopMap     maGradientStops;        /// Gradient stops (colors/transparence).
-    OptValue< css::geometry::IntegerRectangle2D > moFillToRect;
-    OptValue< css::geometry::IntegerRectangle2D > moTileRect;
-    OptValue< sal_Int32 > moGradientPath;       /// If set, gradient follows rectangle, circle, or shape.
-    OptValue< sal_Int32 > moShadeAngle;         /// Rotation angle of linear gradients.
-    OptValue< sal_Int32 > moShadeFlip;          /// Flip mode of gradient, if not stretched to shape.
-    OptValue< bool >    moShadeScaled;          /// True = scale gradient into shape.
-    OptValue< bool >    moRotateWithShape;      /// True = rotate gradient with shape.
-
-    /** Overwrites all members that are explicitly set in rSourceProps. */
-    void                assignUsed( const GradientFillProperties& rSourceProps );
-};
-
-struct PatternFillProperties
-{
-    Color               maPattFgColor;          /// Pattern foreground color.
-    Color               maPattBgColor;          /// Pattern background color.
-    OptValue< sal_Int32 > moPattPreset;         /// Preset pattern type.
-
-    /** Overwrites all members that are explicitly set in rSourceProps. */
-    void                assignUsed( const PatternFillProperties& rSourceProps );
-};
-
-struct ArtisticEffectProperties
-{
-    OUString            msName;
-    std::map< OUString, css::uno::Any >
-                        maAttribs;
-    ::oox::ole::OleObjectInfo mrOleObjectInfo;  /// The original graphic as embedded object.
-
-    bool                isEmpty() const;
-
-    /** Returns the struct as a PropertyValue with Name = msName and
-     *  Value = maAttribs as a Sequence< PropertyValue >. */
-    css::beans::PropertyValue getEffect();
-
-    /** Overwrites all members that are explicitly set in rSourceProps. */
-    void                assignUsed( const ArtisticEffectProperties& rSourceProps );
-
-    /** Translate effect tokens to strings. */
-    static OUString     getEffectString( sal_Int32 nToken );
-
-    /** Translate effect strings to tokens. */
-    static sal_Int32    getEffectToken( const OUString& sName );
-};
-
-struct BlipFillProperties
-{
-    css::uno::Reference< css::graphic::XGraphic >
-                          mxGraphic;              /// The fill graphic.
-    OptValue< sal_Int32 > moBitmapMode;         /// Bitmap tile or stretch.
-    OptValue< css::geometry::IntegerRectangle2D >
-                          moFillRect;             /// Stretch fill offsets.
-    OptValue< css::geometry::IntegerRectangle2D >
-                          moClipRect;
-    OptValue< sal_Int32 > moTileOffsetX;        /// Width of bitmap tiles (EMUs).
-    OptValue< sal_Int32 > moTileOffsetY;        /// Height of bitmap tiles (EMUs).
-    OptValue< sal_Int32 > moTileScaleX;         /// Horizontal scaling of bitmap tiles (1/1000 percent).
-    OptValue< sal_Int32 > moTileScaleY;         /// Vertical scaling of bitmap tiles (1/1000 percent).
-    OptValue< sal_Int32 > moTileAlign;          /// Anchor point inside bitmap.
-    OptValue< sal_Int32 > moTileFlip;           /// Flip mode of bitmap tiles.
-    OptValue< bool >      moRotateWithShape;      /// True = rotate bitmap with shape.
-    // effects
-    OptValue< sal_Int32 > moColorEffect;        /// XML token for a color effect.
-    OptValue< sal_Int32 > moBrightness;         /// Brightness in the range [-100000,100000].
-    OptValue< sal_Int32 > moContrast;           /// Contrast in the range [-100000,100000].
-    Color                 maColorChangeFrom;      /// Start color of color transformation.
-    Color                 maColorChangeTo;        /// Destination color of color transformation.
-    Color                 maDuotoneColors[2];     /// Duotone Colors
-
-    ArtisticEffectProperties maEffect;          /// Artistic effect, not supported by core.
-    OptValue<sal_Int32> moAlphaModFix; ///< Alpha Modulate Fixed Effect.
-
-    /** Overwrites all members that are explicitly set in rSourceProps. */
-    void                assignUsed( const BlipFillProperties& rSourceProps );
-};
-
-struct OOX_DLLPUBLIC FillProperties
-{
-    OptValue< sal_Int32 > moFillType;           /// Fill type (OOXML token).
-    Color               maFillColor;            /// Solid fill color and transparence.
-    GradientFillProperties maGradientProps;     /// Properties for gradient fills.
-    PatternFillProperties maPatternProps;       /// Properties for pattern fills.
-    BlipFillProperties  maBlipProps;            /// Properties for bitmap fills.
-
-    /** Overwrites all members that are explicitly set in rSourceProps. */
-    void                assignUsed( const FillProperties& rSourceProps );
-
-    /** Tries to resolve current settings to a solid color, e.g. returns the
-        start color of a gradient. */
-    Color               getBestSolidColor() const;
-
-    /** Writes the properties to the passed property map. */
-    void                pushToPropMap(
-                            ShapePropertyMap& rPropMap,
-                            const GraphicHelper& rGraphicHelper,
-                            sal_Int32 nShapeRotation = 0,
-                            sal_Int32 nPhClr = API_RGB_TRANSPARENT,
-                            bool bFlipH = false,
-                            bool bFlipV = false ) const;
-};
-
-} // namespace drawingml
-} // namespace oox
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx
deleted file mode 100644
index f54642583715..000000000000
--- a/include/oox/drawingml/lineproperties.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
-#define INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
-
-#include <utility>
-#include <vector>
-
-#include <com/sun/star/drawing/LineJoint.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <oox/dllapi.h>
-#include <oox/helper/helper.hxx>
-#include <oox/drawingml/fillproperties.hxx>
-#include <sal/types.h>
-
-namespace oox { class GraphicHelper; }
-
-namespace oox {
-namespace drawingml {
-
-class ShapePropertyMap;
-
-struct LineArrowProperties
-{
-    OptValue< sal_Int32 > moArrowType;
-    OptValue< sal_Int32 > moArrowWidth;
-    OptValue< sal_Int32 > moArrowLength;
-
-    /** Overwrites all members that are explicitly set in rSourceProps. */
-    void                assignUsed( const LineArrowProperties& rSourceProps );
-};
-
-struct OOX_DLLPUBLIC LineProperties
-{
-    typedef ::std::pair< sal_Int32, sal_Int32 > DashStop;
-    typedef ::std::vector< DashStop >           DashStopVector;
-
-    LineArrowProperties maStartArrow;       /// Start line arrow style.
-    LineArrowProperties maEndArrow;         /// End line arrow style.
-    FillProperties      maLineFill;         /// Line fill (solid, gradient, ...).
-    DashStopVector      maCustomDash;       /// User-defined line dash style.
-    OptValue< sal_Int32 > moLineWidth;      /// Line width (EMUs).
-    OptValue< sal_Int32 > moPresetDash;     /// Preset dash (OOXML token).
-    OptValue< sal_Int32 > moLineCompound;   /// Line compound type (OOXML token).
-    OptValue< sal_Int32 > moLineCap;        /// Line cap (OOXML token).
-    OptValue< sal_Int32 > moLineJoint;      /// Line joint type (OOXML token).
-
-    /** Overwrites all members that are explicitly set in rSourceProps. */
-    void                assignUsed( const LineProperties& rSourceProps );
-
-    /** Writes the properties to the passed property map. */
-    void                pushToPropMap(
-                            ShapePropertyMap& rPropMap,
-                            const GraphicHelper& rGraphicHelper,
-                            sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
-
-    /** Calculates the line style attribute from the internal state of the object */
-    css::drawing::LineStyle  getLineStyle() const;
-    /** Calculates the line joint attribute from the internal state of the object */
-    css::drawing::LineJoint  getLineJoint() const;
-    /** Calculates the line width attribute from the internal state of the object */
-    sal_Int32           getLineWidth() const;
-};
-
-} // namespace drawingml
-} // namespace oox
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */