summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-04-18 13:31:56 +0000
committerOliver Bolte <obo@openoffice.org>2005-04-18 13:31:56 +0000
commit09fb90e662e071fa14de2d4050015cde8b439040 (patch)
treea0f4e8fbd880d53cdab74f9bc07b768f725761e8 /ucb
parent6558c52be2772efaca183c8e43a74870583ef4f3 (diff)
INTEGRATION: CWS olefix (1.16.4); FILE MERGED
2005/04/12 15:55:43 kso 1.16.4.1: #i47244# - fixed null pointer deref.
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index f459645a49d5..7c91e61b4226 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: webdavcontentcaps.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: obo $ $Date: 2005-03-15 10:03:49 $
+ * last change: $Author: obo $ $Date: 2005-04-18 14:31:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -371,7 +371,8 @@ uno::Sequence< beans::Property > Content::getProperties(
bTransient = m_bTransient;
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
- xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) );
+ if ( m_xCachedProps.get() )
+ xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) );
xProvider.set( m_pProvider );
}