diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2012-09-30 08:35:03 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2012-09-30 08:37:54 +0200 |
| commit | 3f84462b47f070b4921fdd5fdab8397ab1439fd6 (patch) | |
| tree | 0f8910461f668a77b98d803771ff7190c6c16279 | |
| parent | f4b412ebd57016823dde50c5d41bdc39337b6b74 (diff) | |
fdo#31405 CommandType is a LONG, so use a sal_Int32 to retrieve it
Else, operator>>= flat out refuses to extract it, even though the particular value in this particular call would fit.
Also OSL_VERIFY the result of >>= (instead of ignoring it) to facilitate future detection of similar problem
Change-Id: I859c38c3589dc9e9ef5bdd882663aa3386a43237
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 563f888a7e8d..f8824aea4db8 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2381,13 +2381,13 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, rtl::OUString sDataSource, sDataTableOrQuery; Sequence<Any> aSelection; - sal_Int16 nCmdType = CommandType::TABLE; + sal_Int32 nCmdType = CommandType::TABLE; uno::Reference< XConnection> xConnection; ODataAccessDescriptor aDescriptor(rProperties); sDataSource = aDescriptor.getDataSource(); - aDescriptor[daCommand] >>= sDataTableOrQuery; - aDescriptor[daCommandType] >>= nCmdType; + OSL_VERIFY(aDescriptor[daCommand] >>= sDataTableOrQuery); + OSL_VERIFY(aDescriptor[daCommandType] >>= nCmdType); if ( aDescriptor.has(daSelection) ) aDescriptor[daSelection] >>= aSelection; |