diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2012-09-30 08:35:03 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-01 12:01:19 +0200 |
| commit | 5b536e72f2a4e35275eb33317ec6b6e14845b75c (patch) | |
| tree | 7c49604c1424a64d89a1d68227c41442014a115a /sw | |
| parent | 887f67674108b5f45e7748f6fbbf1fa0131b0ba8 (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
(cherry picked from commit 3f84462b47f070b4921fdd5fdab8397ab1439fd6)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
| -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 eada5cc81b4d..5fde0e5d0d78 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2395,13 +2395,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; |