From 5d0e485e827057eee9fb2c997685690b710e7f34 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 3 Apr 2017 11:02:38 +0200 Subject: use actual UNO enums in reportdesign..svtools Change-Id: Idcd916382b87f8542dc6b5cdcb5ecb01d6947203 Reviewed-on: https://gerrit.libreoffice.org/36043 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sdext/source/minimizer/optimizerdialogcontrols.cxx | 2 +- sdext/source/pdfimport/tree/drawtreevisiting.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sdext/source') diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index 647cbc359590..9fde9d9f32ba 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -86,7 +86,7 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, - sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType ) + sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, bool bEnabled, PPPOptimizerTokenEnum nResID, css::awt::PushButtonType nPushButtonType ) { OUString pNames[] = { OUString("Enabled"), diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 6da5e7ded92c..50e875605189 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -114,7 +114,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons { for(int i=1; i< elem.Text.getLength(); i++) { - sal_Int16 nType = xCC->getCharacterDirection( str, i ); + css::i18n::DirectionProperty nType = (css::i18n::DirectionProperty)xCC->getCharacterDirection( str, i ); if ( nType == css::i18n::DirectionProperty_RIGHT_TO_LEFT || nType == css::i18n::DirectionProperty_RIGHT_TO_LEFT_ARABIC || nType == css::i18n::DirectionProperty_RIGHT_TO_LEFT_EMBEDDING || -- cgit