CWS-TOOLING: integrate CWS kso43

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 >();
 }