diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-03 11:00:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-03 11:04:25 +0000 |
| commit | d68927c7fd4346311dce58e6059186633996d68b (patch) | |
| tree | e646bb3046cd3acf6285a0d6a96d3997b982966f /vbahelper | |
| parent | 5d0e485e827057eee9fb2c997685690b710e7f34 (diff) | |
use actual UNO enums in test..vbahelper
Change-Id: I2e38462045efedc31903589a3fa4e6f62d74d8de
Reviewed-on: https://gerrit.libreoffice.org/36042
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/source/vbahelper/vbafontbase.cxx | 4 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbashape.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx index 3dd15e11bea7..777ac975c104 100644 --- a/vbahelper/source/vbahelper/vbafontbase.cxx +++ b/vbahelper/source/vbahelper/vbafontbase.cxx @@ -228,10 +228,10 @@ VbaFontBase::setItalic( const uno::Any& aValue ) { bool bValue = false; aValue >>= bValue; - short nValue = awt::FontSlant_NONE; + awt::FontSlant nValue = awt::FontSlant_NONE; if( bValue ) nValue = awt::FontSlant_ITALIC; - mxFont->setPropertyValue( VBAFONTBASE_PROPNAME( "CharPosture", "FontSlant" ), uno::Any( nValue ) ); + mxFont->setPropertyValue( VBAFONTBASE_PROPNAME( "CharPosture", "FontSlant" ), uno::Any( (short)nValue ) ); } uno::Any SAL_CALL diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index 4fb239bac73a..c83082f13500 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -133,7 +133,7 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape >& xShape ) // Art characters office::MsoShapeType::msoTextEffect, in OOo corresponding to "com.sun.star.drawing.CustomShape" else if( sShapeType == "com.sun.star.drawing.ConnectorShape" ) { - enum drawing::ConnectorType connectorType; + drawing::ConnectorType connectorType; uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW ); xPropertySet->getPropertyValue( "EdgeKind" ) >>= connectorType; if( connectorType == drawing::ConnectorType_CURVE ) |