diff options
| author | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
| commit | 75ba0870517ea585027812c48dcfbc0827280a84 (patch) | |
| tree | 5df4d546e2fab9c70bf902a0afe27292a36d0812 /ucb/source/ucp/gio | |
| parent | 5521c8065f538b8cedaf2db2dbff9a265394a6b3 (diff) | |
| parent | 7a7f37e3ba0ba89628fb30b035440ff5f91ab551 (diff) | |
sb118: merged in re/DEV300_next towards DEV300_m76
Diffstat (limited to 'ucb/source/ucp/gio')
| -rw-r--r-- | ucb/source/ucp/gio/gio_content.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/gio/gio_datasupplier.cxx | 30 |
2 files changed, 26 insertions, 6 deletions
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx index 824fa6514379..1c00f8c79d6e 100644 --- a/ucb/source/ucp/gio/gio_content.hxx +++ b/ucb/source/ucp/gio/gio_content.hxx @@ -140,7 +140,7 @@ public: virtual ~Content(); - static com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > getPropertyValuesFromGFileInfo( + com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > getPropertyValuesFromGFileInfo( GFileInfo *pInfo, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProperties); diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index e7d55039ed27..22cd4afa08fe 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 >(); } |