[Libreoffice-commits] core.git: test/source testtools/source toolkit/source ucb/source uui/source vbahelper/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Apr 3 11:04:52 UTC 2017
test/source/sheet/xspreadsheets2.cxx | 2 +-
testtools/source/bridgetest/bridgetest.cxx | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 6 +++---
toolkit/source/awt/vclxwindow.cxx | 3 +--
toolkit/source/helper/formpdfexport.cxx | 2 +-
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 8 ++++----
uui/source/iahndl-authentication.cxx | 2 +-
uui/source/iahndl-ioexceptions.cxx | 16 ++++++++--------
vbahelper/source/vbahelper/vbafontbase.cxx | 4 ++--
vbahelper/source/vbahelper/vbashape.cxx | 2 +-
10 files changed, 23 insertions(+), 24 deletions(-)
New commits:
commit d68927c7fd4346311dce58e6059186633996d68b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Apr 3 11:00:58 2017 +0200
use actual UNO enums in test..vbahelper
Change-Id: I2e38462045efedc31903589a3fa4e6f62d74d8de
Reviewed-on: https://gerrit.libreoffice.org/36042
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx
index 2c831c447174..76e2a05c6fea 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -275,7 +275,7 @@ void XSpreadsheets2::testImportCellStyle()
sal_Int32 aVertJustify = 0;
CPPUNIT_ASSERT(xCellStyleProp->getPropertyValue(aProperty) >>= aVertJustify);
- CPPUNIT_ASSERT_MESSAGE("New style: VertJustify not set", aVertJustify == table::CellVertJustify_CENTER);
+ CPPUNIT_ASSERT_MESSAGE("New style: VertJustify not set", (table::CellVertJustify)aVertJustify == table::CellVertJustify_CENTER);
}
uno::Reference< sheet::XSpreadsheetDocument> XSpreadsheets2::getDoc(const OUString& aFileBase, uno::Reference< lang::XComponent >& xComp)
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index fede2dbfe426..f2c0d7544a78 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -1011,7 +1011,7 @@ uno_Sequence* cloneSequence(const uno_Sequence* val, const Type& type)
sal_Int8* pBufCur = buf.get();
uno_Sequence* retSeq = nullptr;
- switch (pTdElem->eTypeClass)
+ switch ((TypeClass)pTdElem->eTypeClass)
{
case TypeClass_SEQUENCE:
{
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 )
{
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 929ae8627ef4..aba36a3fc7b9 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1464,9 +1464,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
for ( sal_Int32 n = 0; n < aSupportedLocks.getLength(); ++n )
{
SAL_INFO( "ucb.ucp.webdav"," scope: "
- << ( aSupportedLocks[ n ].Scope ? "shared":"exclusive" )
+ << ( aSupportedLocks[ n ].Scope == css::ucb::LockScope_SHARED ? "shared" : "exclusive" )
<< ", type: "
- << ( aSupportedLocks[ n ].Type ? "" : "write" ) );
+ << ( aSupportedLocks[ n ].Type != css::ucb::LockType_WRITE ? "" : "write" ) );
}
}
++it;
@@ -3836,9 +3836,9 @@ Content::ResourceType Content::getResourceType(
for ( sal_Int32 n = 0; n < aSupportedLocks.getLength(); ++n )
{
SAL_INFO( "ucb.ucp.webdav","PROPFIND (getResourceType) - supportedlock[" << n <<"]: scope: "
- << ( aSupportedLocks[ n ].Scope ? "shared":"exclusive" )
+ << ( aSupportedLocks[ n ].Scope == css::ucb::LockScope_SHARED ? "shared" : "exclusive" )
<< ", type: "
- << ( aSupportedLocks[ n ].Type ? "" : "write" ) );
+ << ( aSupportedLocks[ n ].Type != css::ucb::LockType_WRITE ? "" : "write" ) );
}
}
++it;
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 3701f73886c7..21506c18134e 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -160,7 +160,7 @@ void getRememberModes(
bHasRememberModePersistent = true;
break;
default:
- SAL_WARN( "uui", "Unsupported RememberAuthentication value" << rRememberModes[i] );
+ SAL_WARN( "uui", "Unsupported RememberAuthentication value" << (sal_Int32)rRememberModes[i] );
break;
}
}
diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx
index 9da345ff1ed6..15db83ee26ec 100644
--- a/uui/source/iahndl-ioexceptions.cxx
+++ b/uui/source/iahndl-ioexceptions.cxx
@@ -109,7 +109,7 @@ UUIInteractionHelper::handleInteractiveIOException(
ErrCode nErrorCode;
std::vector< OUString > aArguments;
static ErrCode const
- aErrorCode[ucb::IOErrorCode_WRONG_VERSION + 1][2]
+ aErrorCode[(sal_Int32)ucb::IOErrorCode_WRONG_VERSION + 1][2]
= { { ERRCODE_IO_ABORT, ERRCODE_UUI_IO_ABORT }, // ABORT
{ ERRCODE_IO_ACCESSDENIED, ERRCODE_UUI_IO_ACCESSDENIED },
// ACCESS_DENIED
@@ -201,7 +201,7 @@ UUIInteractionHelper::handleInteractiveIOException(
}
}
else
- nErrorCode = aErrorCode[aIoException.Code][0];
+ nErrorCode = aErrorCode[(sal_Int32)aIoException.Code][0];
break;
}
@@ -225,7 +225,7 @@ UUIInteractionHelper::handleInteractiveIOException(
aArguments.push_back(aArgUri);
}
else
- nErrorCode = aErrorCode[aIoException.Code][0];
+ nErrorCode = aErrorCode[(sal_Int32)aIoException.Code][0];
break;
}
@@ -237,13 +237,13 @@ UUIInteractionHelper::handleInteractiveIOException(
&& getStringRequestArgument(aRequestArguments, "OtherVolume",
&aArgOtherVolume))
{
- nErrorCode = aErrorCode[aIoException.Code][1];
+ nErrorCode = aErrorCode[(sal_Int32)aIoException.Code][1];
aArguments.reserve(2);
aArguments.push_back(aArgVolume);
aArguments.push_back(aArgOtherVolume);
}
else
- nErrorCode = aErrorCode[aIoException.Code][0];
+ nErrorCode = aErrorCode[(sal_Int32)aIoException.Code][0];
break;
}
@@ -264,7 +264,7 @@ UUIInteractionHelper::handleInteractiveIOException(
aArguments.push_back(aArgUri);
}
else
- nErrorCode = aErrorCode[aIoException.Code][0];
+ nErrorCode = aErrorCode[(sal_Int32)aIoException.Code][0];
break;
}
@@ -274,11 +274,11 @@ UUIInteractionHelper::handleInteractiveIOException(
if (getResourceNameRequestArgument(aRequestArguments,
&aArgUri))
{
- nErrorCode = aErrorCode[aIoException.Code][1];
+ nErrorCode = aErrorCode[(sal_Int32)aIoException.Code][1];
aArguments.push_back(aArgUri);
}
else
- nErrorCode = aErrorCode[aIoException.Code][0];
+ nErrorCode = aErrorCode[(sal_Int32)aIoException.Code][0];
break;
}
}
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 )
More information about the Libreoffice-commits
mailing list