diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-03-10 15:54:12 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-03-10 15:54:12 +0100 |
commit | bb60fade4844d9687717cd3cf33affb8172cad81 (patch) | |
tree | 85c5b31ef85586cd3d21b64a50a80594443aec8e /ucb/source/ucp/gio/gio_datasupplier.cxx | |
parent | 1a0a6398a2ab8d7c11aae84b2c6b4565cda5082e (diff) | |
parent | 8e3c7c331a51f315f3e8620ac664f35ddd2da847 (diff) |
CWS-TOOLING: integrate CWS kso43ooo/DEV300_m75
Diffstat (limited to 'ucb/source/ucp/gio/gio_datasupplier.cxx')
-rw-r--r-- | ucb/source/ucp/gio/gio_datasupplier.cxx | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index 2bf26bbd6b..ec849a3beb 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -236,11 +236,31 @@ uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues( sal_uInt32 nInde if ( getResult( nIndex ) ) { - uno::Reference< sdbc::XRow > xRow = Content::getPropertyValuesFromGFileInfo( - maResults[ nIndex ]->pInfo, m_xSMgr, getResultSet()->getEnvironment(), getResultSet()->getProperties()); - - maResults[ nIndex ]->xRow = xRow; - return xRow; + uno::Reference< ucb::XContent > xContent( queryContent( nIndex ) ); + if ( xContent.is() ) + { + try + { + uno::Reference< ucb::XCommandProcessor > xCmdProc( + xContent, uno::UNO_QUERY_THROW ); + sal_Int32 nCmdId( xCmdProc->createCommandIdentifier() ); + ucb::Command aCmd; + aCmd.Name = rtl::OUString::createFromAscii( "getPropertyValues" ); + aCmd.Handle = -1; + aCmd.Argument <<= getResultSet()->getProperties(); + uno::Any aResult( xCmdProc->execute( + aCmd, nCmdId, getResultSet()->getEnvironment() ) ); + uno::Reference< sdbc::XRow > xRow; + if ( aResult >>= xRow ) + { + maResults[ nIndex ]->xRow = xRow; + return xRow; + } + } + catch ( uno::Exception const & ) + { + } + } } return uno::Reference< sdbc::XRow >(); } |