#83045# - Added support for ContentInfoAttribute::KIND_* flags.

4 files changed, 22 insertions, 16 deletions

diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index fda9ebbadc93..d54d2ecf9633 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bc.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: abi $ $Date: 2001-01-22 13:44:44 $
+ *  last change: $Author: kso $ $Date: 2001-01-31 13:53:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -691,7 +691,8 @@ BaseContent::queryCreatableContentsInfo(
 
     // file
     seq[0].Type       = m_pMyShell->FileContentType;
-    seq[0].Attributes = ContentInfoAttribute::INSERT_WITH_INPUTSTREAM;
+    seq[0].Attributes = ContentInfoAttribute::INSERT_WITH_INPUTSTREAM
+                        | ContentInfoAttribute::KIND_DOCUMENT;
 
     uno::Sequence< beans::Property > props( 1 );
     props[0] = beans::Property(
@@ -704,7 +705,7 @@ BaseContent::queryCreatableContentsInfo(
 
     // folder
     seq[1].Type       = m_pMyShell->FolderContentType;
-    seq[1].Attributes = 0;
+    seq[1].Attributes = ContentInfoAttribute::KIND_FOLDER;
     seq[1].Properties = props;
     return seq;
 }
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 85bbb5a6e19d..13aed0971187 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hierarchycontent.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: kso $ $Date: 2001-01-22 11:25:02 $
+ *  last change: $Author: kso $ $Date: 2001-01-31 13:54:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,9 @@
 #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
 #endif
+#ifndef _COM_SUN_STAR_UCB_CONTENTINFOATTRIBUTE_HPP_
+#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
+#endif
 #ifndef _COM_SUN_STAR_UCB_INSERTCOMMANDARGUMENT_HPP_
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #endif
@@ -578,7 +581,7 @@ HierarchyContent::queryCreatableContentsInfo()
         // Folder.
         aSeq.getArray()[ 0 ].Type
             = OUString::createFromAscii( HIERARCHY_FOLDER_CONTENT_TYPE );
-        aSeq.getArray()[ 0 ].Attributes = 0;
+        aSeq.getArray()[ 0 ].Attributes = ContentInfoAttribute::KIND_FOLDER;
 
         Sequence< Property > aFolderProps( 1 );
         aFolderProps.getArray()[ 0 ] = Property(
@@ -591,7 +594,7 @@ HierarchyContent::queryCreatableContentsInfo()
         // Link.
         aSeq.getArray()[ 1 ].Type
             = OUString::createFromAscii( HIERARCHY_LINK_CONTENT_TYPE );
-        aSeq.getArray()[ 1 ].Attributes = 0;
+        aSeq.getArray()[ 1 ].Attributes = ContentInfoAttribute::KIND_LINK;
 
         Sequence< Property > aLinkProps( 2 );
         aLinkProps.getArray()[ 0 ] = Property(
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 9afa6f874f8c..17fe9bb39e96 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pkgcontent.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: kso $ $Date: 2001-01-24 12:42:16 $
+ *  last change: $Author: kso $ $Date: 2001-01-31 13:55:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -648,14 +648,15 @@ Sequence< ContentInfo > SAL_CALL Content::queryCreatableContentsInfo()
         // Folder.
         aSeq.getArray()[ 0 ].Type
             = OUString::createFromAscii( PACKAGE_FOLDER_CONTENT_TYPE );
-        aSeq.getArray()[ 0 ].Attributes = 0;
+        aSeq.getArray()[ 0 ].Attributes = ContentInfoAttribute::KIND_FOLDER;
         aSeq.getArray()[ 0 ].Properties = aProps;
 
         // Stream.
         aSeq.getArray()[ 1 ].Type
             = OUString::createFromAscii( PACKAGE_STREAM_CONTENT_TYPE );
         aSeq.getArray()[ 1 ].Attributes
-            = ContentInfoAttribute::INSERT_WITH_INPUTSTREAM;
+            = ContentInfoAttribute::INSERT_WITH_INPUTSTREAM
+              | ContentInfoAttribute::KIND_DOCUMENT;
         aSeq.getArray()[ 1 ].Properties = aProps;
 
         return aSeq;
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 735c7686a86e..94b97dd09734 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: webdavcontent.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kso $ $Date: 2001-01-26 16:05:04 $
+ *  last change: $Author: kso $ $Date: 2001-01-31 13:55:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -987,7 +987,8 @@ Content::queryCreatableContentsInfo()
         aSeq.getArray()[ 0 ].Type
             = OUString::createFromAscii( WEBDAV_CONTENT_TYPE );
         aSeq.getArray()[ 0 ].Attributes
-            = ContentInfoAttribute::INSERT_WITH_INPUTSTREAM;
+            = ContentInfoAttribute::INSERT_WITH_INPUTSTREAM
+              | ContentInfoAttribute::KIND_DOCUMENT;
 
         Sequence< Property > aDocProps( 1 );
         aDocProps.getArray()[ 0 ] = Property(
@@ -1001,7 +1002,7 @@ Content::queryCreatableContentsInfo()
         // folder.
         aSeq.getArray()[ 1 ].Type
             = OUString::createFromAscii( WEBDAV_COLLECTION_TYPE );
-        aSeq.getArray()[ 1 ].Attributes = 0;
+        aSeq.getArray()[ 1 ].Attributes = ContentInfoAttribute::KIND_FOLDER;
 
         Sequence< Property > aFolderProps( 1 );
         aFolderProps.getArray()[ 0 ] = Property(