summaryrefslogtreecommitdiff
path: root/ucbhelper
diff options
context:
space:
mode:
Diffstat (limited to 'ucbhelper')
-rw-r--r--ucbhelper/inc/ucbhelper/resultset.hxx8
-rw-r--r--ucbhelper/source/provider/resultset.cxx8
-rw-r--r--ucbhelper/workben/ucbexplorer/ucbexplorer.cxx8
3 files changed, 18 insertions, 6 deletions
diff --git a/ucbhelper/inc/ucbhelper/resultset.hxx b/ucbhelper/inc/ucbhelper/resultset.hxx
index 04bf0af9448d..e7c4bb4e2ee0 100644
--- a/ucbhelper/inc/ucbhelper/resultset.hxx
+++ b/ucbhelper/inc/ucbhelper/resultset.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: resultset.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:03:37 $
+ * last change: $Author: kso $ $Date: 2000-10-31 09:50:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -180,7 +180,11 @@ public:
// XContentAccess
virtual rtl::OUString SAL_CALL
+#if SUPD>611
+ queryContentIdentifierString()
+#else
queryContentIdentfierString()
+#endif
throw( com::sun::star::uno::RuntimeException );
virtual com::sun::star::uno::Reference<
com::sun::star::ucb::XContentIdentifier > SAL_CALL
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 38fba0cd09b4..eac6f3c5f233 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: resultset.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:03:37 $
+ * last change: $Author: kso $ $Date: 2000-10-31 09:51:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1312,7 +1312,11 @@ void SAL_CALL ResultSet::close()
//=========================================================================
// virtual
+#if SUP>611
+OUString SAL_CALL ResultSet::queryContentIdentifierString()
+#else
OUString SAL_CALL ResultSet::queryContentIdentfierString()
+#endif
throw( RuntimeException )
{
if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
index 8e72263ee671..b5f015f79e66 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ucbexplorer.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:03:38 $
+ * last change: $Author: kso $ $Date: 2000-10-31 09:52:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -687,7 +687,11 @@ void UcbExplorerTreeListBox::RequestingChilds( SvLBoxEntry* pParent )
Application::AcquireSolarMutex( n );
InsertEntry(
+#if SUPD>611
+ xContentAccess->queryContentIdentifierString(),
+#else
xContentAccess->queryContentIdentfierString(),
+#endif
pParent );
n = Application::ReleaseSolarMutex();