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 /toolkit | |
| 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 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 3 | ||||
| -rw-r--r-- | toolkit/source/helper/formpdfexport.cxx | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 97eba0fde320..44122b1e6494 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -551,7 +551,7 @@ namespace { css::awt::MessageBoxType_WARNINGBOX, RTL_CONSTASCII_STRINGPARAM("warningbox") }, { css::awt::MessageBoxType_ERRORBOX, RTL_CONSTASCII_STRINGPARAM("errorbox") }, { css::awt::MessageBoxType_QUERYBOX, RTL_CONSTASCII_STRINGPARAM("querybox") }, - { css::awt::MessageBoxType_MAKE_FIXED_SIZE, nullptr, 0 } + { css::awt::MessageBoxType::MessageBoxType_MAKE_FIXED_SIZE, nullptr, 0 } }; bool lcl_convertMessageBoxType( @@ -559,7 +559,7 @@ namespace css::awt::MessageBoxType eType ) { const MessageBoxTypeInfo *pMap = aMessageBoxTypeInfo; - css::awt::MessageBoxType eVal = css::awt::MessageBoxType_MAKE_FIXED_SIZE; + css::awt::MessageBoxType eVal = css::awt::MessageBoxType::MessageBoxType_MAKE_FIXED_SIZE; while ( pMap->pName ) { @@ -572,7 +572,7 @@ namespace pMap++; } - return ( eVal != css::awt::MessageBoxType_MAKE_FIXED_SIZE ); + return ( eVal != css::awt::MessageBoxType::MessageBoxType_MAKE_FIXED_SIZE ); } } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index bc68c5eee713..48a1ed1a7f93 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -76,7 +76,6 @@ using ::com::sun::star::style::VerticalAlignment; using ::com::sun::star::style::VerticalAlignment_TOP; using ::com::sun::star::style::VerticalAlignment_MIDDLE; using ::com::sun::star::style::VerticalAlignment_BOTTOM; -using ::com::sun::star::style::VerticalAlignment_MAKE_FIXED_SIZE; namespace WritingMode2 = ::com::sun::star::text::WritingMode2; @@ -1727,7 +1726,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any& break; case BASEPROPERTY_VERTICALALIGN: { - VerticalAlignment eAlign = VerticalAlignment_MAKE_FIXED_SIZE; + VerticalAlignment eAlign = css::style::VerticalAlignment::VerticalAlignment_MAKE_FIXED_SIZE; WinBits nStyle = pWindow->GetStyle(); nStyle &= ~(WB_TOP|WB_VCENTER|WB_BOTTOM); if ( !bVoid ) diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 0503a57edd23..e1cf60ff6e07 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -382,7 +382,7 @@ namespace toolkitform OUString sVertAlignPropertyName( "VerticalAlign" ); if ( xPSI->hasPropertyByName( sVertAlignPropertyName ) ) { - sal_Int16 nAlign = VerticalAlignment_MIDDLE; + VerticalAlignment nAlign = VerticalAlignment_MIDDLE; xModelProps->getPropertyValue( sVertAlignPropertyName ) >>= nAlign; switch ( nAlign ) { |