summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ucb/source/ucp/gio/gio_content.hxx2
-rw-r--r--ucb/source/ucp/gio/gio_datasupplier.cxx30
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx2
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.hxx2
-rw-r--r--ucb/source/ucp/webdav/NeonSession.cxx2
-rw-r--r--ucb/source/ucp/webdav/NeonUri.cxx3
-rw-r--r--uui/source/lockfailed.src2
7 files changed, 34 insertions, 9 deletions
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 7d004d5242..b48a018680 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 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 >();
}
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 076d92d214..71d4eabdbf 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -960,6 +960,7 @@ void DAVResourceAccess::LOCK(
while ( bRetry );
}
+#if 0 // currently not used, but please don't remove code
//=========================================================================
// refresh existing lock.
sal_Int64 DAVResourceAccess::LOCK(
@@ -1003,6 +1004,7 @@ sal_Int64 DAVResourceAccess::LOCK(
return nNewTimeout;
}
+#endif
//=========================================================================
void DAVResourceAccess::UNLOCK(
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index 31b9bbbfd8..38ffa714a3 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
@@ -209,12 +209,14 @@ public:
com::sun::star::ucb::XCommandEnvironment > & xEnv )
throw( DAVException );
+#if 0 // currently not used, but please don't remove code
// refresh existing lock.
sal_Int64
LOCK( sal_Int64 nTimeout,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > & xEnv )
throw ( DAVException );
+#endif
void
UNLOCK( const com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index d9ff4c0290..6ab782b322 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -435,7 +435,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
char * dn = ne_ssl_readable_dname( ne_ssl_cert_subject( cert ) );
rtl::OUString cert_subject( dn, strlen( dn ), RTL_TEXTENCODING_UTF8, 0 );
- free( dn );
+ ne_free( dn );
security::CertificateContainerStatus certificateContainer(
xCertificateContainer->hasCertificate(
diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx
index 9b97c264a6..85b9d1fbfe 100644
--- a/ucb/source/ucp/webdav/NeonUri.cxx
+++ b/ucb/source/ucp/webdav/NeonUri.cxx
@@ -32,6 +32,7 @@
#include <rtl/uri.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
+#include "ne_alloc.h"
#include "NeonUri.hxx"
#include "DAVException.hxx"
@@ -127,7 +128,7 @@ NeonUri::NeonUri( const ne_uri * inUri )
throw DAVException( DAVException::DAV_INVALID_ARG );
init( rtl::OString( uri ), inUri );
- free( uri );
+ ne_free( uri );
calculateURI();
}
diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src
index c4057387ed..4ccc1c78b3 100644
--- a/uui/source/lockfailed.src
+++ b/uui/source/lockfailed.src
@@ -37,7 +37,7 @@ String STR_LOCKFAILED_TITLE
};
String STR_LOCKFAILED_MSG
{
- Text [ en-US ] = "The file could not be locked for exclusive access by %PRODUCTNAME, due to missing permission to created a lock file on that file location.";
+ Text [ en-US ] = "The file could not be locked for exclusive access by %PRODUCTNAME, due to missing permission to create a lock file on that file location.";
};
String STR_LOCKFAILED_DONTSHOWAGAIN
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 12:15:27 +0000