summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/drawingml/drawingmltypes.hxx3
-rw-r--r--include/oox/export/drawingml.hxx3
-rw-r--r--include/oox/ppt/slidetransition.hxx3
3 files changed, 6 insertions, 3 deletions
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 2aac13c669a7..6a4a99f426fe 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/style/TabAlign.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <oox/dllapi.h>
@@ -129,7 +130,7 @@ sal_Int16 GetFontStrikeout( sal_Int32 nToken );
sal_Int16 GetCaseMap( sal_Int32 nToken );
/** converts a paragraph align to a ParaAdjust */
-sal_Int16 GetParaAdjust( sal_Int32 nAlign );
+css::style::ParagraphAdjust GetParaAdjust( sal_Int32 nAlign );
// Converts vertical adjust tokens to a TextVerticalAdjust item
css::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken );
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 94ccc6aac24d..4ee841d33eb2 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <oox/dllapi.h>
#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/token/tokens.hxx>
@@ -226,7 +227,7 @@ public:
static sal_uInt32 ColorWithIntensity( sal_uInt32 nColor, sal_uInt32 nIntensity );
- static const char* GetAlignment( sal_Int32 nAlignment );
+ static const char* GetAlignment( css::style::ParagraphAdjust nAlignment );
sax_fastparser::FSHelperPtr CreateOutputStream (
const OUString& sFullStream,
diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx
index 41df7b2f7948..e11298a0a04e 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -22,6 +22,7 @@
#define INCLUDED_OOX_PPT_SLIDETRANSITION_HXX
#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/presentation/AnimationSpeed.hpp>
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -64,7 +65,7 @@ namespace oox { namespace ppt {
::sal_Int16 mnTransitionType;
::sal_Int16 mnTransitionSubType;
bool mbTransitionDirectionNormal;
- ::sal_Int16 mnAnimationSpeed;
+ css::presentation::AnimationSpeed mnAnimationSpeed;
::sal_Int32 mnFadeColor;
bool mbMode; /**< http://api.libreoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html Mode property */
::sal_Int32 mnAdvanceTime;