CWS-TOOLING: integrate CWS fwk138

4 files changed, 20 insertions, 27 deletions

diff --git a/offapi/com/sun/star/document/DocumentProperties.idl b/offapi/com/sun/star/document/DocumentProperties.idl
index c8e0ee9ca493..5b00f6c9a8e2 100755
--- a/offapi/com/sun/star/document/DocumentProperties.idl
+++ b/offapi/com/sun/star/document/DocumentProperties.idl
@@ -49,7 +49,7 @@ module com {   module sun {   module star {   module document {
     @see XDocumentProperties
     @see XDocumentPropertiesSupplier
  */
-service DocumentProperties : XDocumentProperties
+published service DocumentProperties : XDocumentProperties
 {
     /** constructs default-initialized instance
      */
diff --git a/offapi/com/sun/star/document/OfficeDocument.idl b/offapi/com/sun/star/document/OfficeDocument.idl
index 98d3b09e39e3..4a3418e4da64 100644
--- a/offapi/com/sun/star/document/OfficeDocument.idl
+++ b/offapi/com/sun/star/document/OfficeDocument.idl
@@ -71,6 +71,10 @@
 #include <com/sun/star/document/XEmbeddedScripts.idl>
 #endif
 
+#ifndef __com_sun_star_document_XDocumentPropertiesSupplier_idl__
+#include <com/sun/star/document/XDocumentPropertiesSupplier.idl>
+#endif
+
 //=============================================================================
 
 module com {   module sun {   module star {   module document {
@@ -158,6 +162,8 @@ published service OfficeDocument
         Instead of the <type>StandaloneDocumentInfo</type> service the <type>DocumentInfo</type>
         will be available on an already opened document only.
         </p>
+
+        @deprecated     Use <type>XDocumentPropertiesSupplier</type> instead.
      */
     [optional] interface XDocumentInfoSupplier;
 
@@ -180,6 +186,13 @@ published service OfficeDocument
     [optional] interface XEmbeddedScripts;
 
     //-------------------------------------------------------------------------
+    /** access to the <type>DocumentProperties</type>.
+
+        @since OOo 3.0
+     */
+    [optional] interface XDocumentPropertiesSupplier;
+
+    //-------------------------------------------------------------------------
     /** controls the focus behaviour of the form controls in the document
 
         <p>
diff --git a/offapi/com/sun/star/document/XDocumentProperties.idl b/offapi/com/sun/star/document/XDocumentProperties.idl
index 943fbd586f8f..8a3b2c1843aa 100755
--- a/offapi/com/sun/star/document/XDocumentProperties.idl
+++ b/offapi/com/sun/star/document/XDocumentProperties.idl
@@ -88,7 +88,7 @@ module com {   module sun {   module star {   module document {
             for getting access to an instance from a loaded document
     @see DocumentProperties     for a service that implements this interface
  */
-interface XDocumentProperties
+published interface XDocumentProperties
 {
     //-------------------------------------------------------------------------
     /** contains the initial author of the document.
@@ -352,8 +352,6 @@ interface XDocumentProperties
                  if thrown when trying to open a stream in the given storage
         @throws com::sun::star::io::IOException
                  if thrown when trying to open a stream in the given storage
-        @throws com::sun::star::uno::Exception
-                 in various unspecified circumstances
      */
 
     void loadFromStorage( [in] com::sun::star::embed::XStorage Storage,
@@ -361,15 +359,10 @@ interface XDocumentProperties
         raises( com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::io::WrongFormatException,
                 com::sun::star::lang::WrappedTargetException,
-                com::sun::star::io::IOException,
-                com::sun::star::uno::Exception );
+                com::sun::star::io::IOException );
 
     //-------------------------------------------------------------------------
     /** loads document properties from an ODF package or an OLE container.
-        <p>
-        For compatibility reasons this method also supports the import from
-        former StarOffice binary file formats.
-        </p>
 
         @param URL
             the URL of the source document
@@ -389,16 +382,13 @@ interface XDocumentProperties
                  if thrown when trying to open a stream in the given storage
         @throws com::sun::star::io::IOException
                  if thrown when trying to open a stream in the given storage
-        @throws com::sun::star::uno::Exception
-                 in various unspecified circumstances
      */
 
     void loadFromMedium( [in] string URL,
                 [in] sequence < com::sun::star::beans::PropertyValue > Medium )
         raises( com::sun::star::io::WrongFormatException,
                 com::sun::star::lang::WrappedTargetException,
-                com::sun::star::io::IOException,
-                com::sun::star::uno::Exception );
+                com::sun::star::io::IOException );
 
     //-------------------------------------------------------------------------
     /** stores document properties to an ODF package.
@@ -428,23 +418,16 @@ interface XDocumentProperties
                  if thrown when trying to open a stream in the given storage
         @throws com::sun::star::io::IOException
                  if thrown when writing to the storage
-        @throws com::sun::star::uno::Exception
-                 in various unspecified circumstances
      */
 
     void storeToStorage( [in] com::sun::star::embed::XStorage Storage,
                 [in] sequence < com::sun::star::beans::PropertyValue > Medium )
         raises( com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::lang::WrappedTargetException,
-                com::sun::star::io::IOException,
-                com::sun::star::uno::Exception );
+                com::sun::star::io::IOException );
 
     //-------------------------------------------------------------------------
     /** stores document properties to an ODF package or an OLE container.
-        <p>
-        For compatibility reasons this method also supports the export to former
-        StarOffice binary file formats.
-        </p>
 
         @param URL
             the URL of the target document
@@ -462,15 +445,12 @@ interface XDocumentProperties
                  if thrown when trying to open a stream in the given storage
         @throws com::sun::star::io::IOException
                  if thrown when writing to the storage
-        @throws com::sun::star::uno::Exception
-                 in various unspecified circumstances
      */
 
     void storeToMedium( [in] string URL,
                 [in] sequence < com::sun::star::beans::PropertyValue > Medium )
         raises( com::sun::star::lang::WrappedTargetException,
-                com::sun::star::io::IOException,
-                com::sun::star::uno::Exception );
+                com::sun::star::io::IOException );
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
index 52fa61aa5f12..811513d7a026 100644
--- a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
@@ -52,7 +52,7 @@ module com {   module sun {   module star {   module document {
     @see XDocumentProperties
     @see DocumentProperties
  */
-interface XDocumentPropertiesSupplier
+published interface XDocumentPropertiesSupplier
 {
     //-------------------------------------------------------------------------
     /** provides the document properties object.