sw/source/ui/dbui/dbmgr.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3f84462b47f070b4921fdd5fdab8397ab1439fd6
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Sun Sep 30 08:35:03 2012 +0200
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
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 563f888..f8824ae 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
