summaryrefslogtreecommitdiff
path: root/oox/inc/oox/vml/vmlformatting.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'oox/inc/oox/vml/vmlformatting.hxx')
-rw-r--r--oox/inc/oox/vml/vmlformatting.hxx21
1 files changed, 13 insertions, 8 deletions
diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx
index b997c7451fe4..1a9c1811cf6b 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -30,8 +30,11 @@
#include "oox/helper/helper.hxx"
-namespace oox { class PropertyMap; }
-namespace oox { namespace core { class FilterBase; } }
+namespace oox {
+ class GraphicHelper;
+ class ModelObjectHelper;
+ class PropertyMap;
+}
namespace oox {
namespace vml {
@@ -71,7 +74,7 @@ public:
/** Converts the passed VML measure string to EMU (English Metric Units).
- @param rFilter The core filter object needed to perform pixel
+ @param rGraphicHelper The graphic helper needed to perform pixel
conversion according to the current output device.
@param rValue The VML measure value. This is a floating-point value
@@ -88,7 +91,7 @@ public:
pixel. Set to false if omitted measure unit means EMU.
*/
static sal_Int32 decodeMeasureToEmu(
- const ::oox::core::FilterBase& rFilter,
+ const GraphicHelper& rGraphicHelper,
const ::rtl::OUString& rValue,
sal_Int32 nRefValue,
bool bPixelX,
@@ -96,14 +99,14 @@ public:
/** Converts the passed VML measure string to 1/100 mm.
- @param rFilter See above.
+ @param rGraphicHelper See above.
@param rValue See above.
@param nRefValue See above.
@param bPixelX See above.
@param bDefaultAsPixel See above.
*/
static sal_Int32 decodeMeasureToHmm(
- const ::oox::core::FilterBase& rFilter,
+ const GraphicHelper& rGraphicHelper,
const ::rtl::OUString& rValue,
sal_Int32 nRefValue,
bool bPixelX,
@@ -147,7 +150,8 @@ struct StrokeModel
/** Writes the properties to the passed property map. */
void pushToPropMap(
PropertyMap& rPropMap,
- const ::oox::core::FilterBase& rFilter ) const;
+ ModelObjectHelper& rModelObjectHelper,
+ const GraphicHelper& rGraphicHelper ) const;
};
// ============================================================================
@@ -172,7 +176,8 @@ struct FillModel
/** Writes the properties to the passed property map. */
void pushToPropMap(
PropertyMap& rPropMap,
- const ::oox::core::FilterBase& rFilter ) const;
+ ModelObjectHelper& rModelObjectHelper,
+ const GraphicHelper& rGraphicHelper ) const;
};
// ============================================================================