API CHANGE: remove com.sun.star.document.XDocumentInfo

The following badly designed interfaces and services were deprecated
in OpenOffice.org 3.0 and are now remove from the API:

com.sun.star.document.DocumentInfo
com.sun.star.document.StandaloneDocumentInfo
com.sun.star.document.XDocumentInfo
com.sun.star.document.XDocumentInfoSupplier
com.sun.star.document.XStandaloneDocumentInfo

The supported replacements for these have been introduced in OOo 3.0:

com.sun.star.document.XDocumentProperties
com.sun.star.document.XDocumentPropertiesSupplier
com.sun.star.document.DocumentProperties

http://www.mail-archive.com/interface-announce@openoffice.org/msg00432.html

Remove the implementation of these interfaces and services in sfx2
(SfxBaseModel, objuno.cxx)

Also remove unit tests for these services in qadevOOo and sfx2.

Conflicts:
offapi/type_reference/types.rdb

Change-Id: Ib0b48a4e53a8079c82fac3bb49a829812f8e5256

2 files changed, 4 insertions, 215 deletions

diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx
deleted file mode 100644
index 3e18ad61527b..000000000000
--- a/sfx2/inc/sfx2/objuno.hxx
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFX_OBJUNO_HXX
-#define _SFX_OBJUNO_HXX
-
-#include <com/sun/star/document/XDocumentInfo.hpp>
-#include <com/sun/star/document/XStandaloneDocumentInfo.hpp>
-#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <com/sun/star/beans/XVetoableChangeListener.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/beans/XPropertyContainer.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/util/XCloneable.hpp>
-
-#include <com/sun/star/io/IOException.hpp>
-
-#include <svl/itemprop.hxx>
-#include <cppuhelper/implbase10.hxx>
-
-#include "sfxuno.hxx"
-
-
-// this is now just a wrapper around a XDocumentProperties instance
-
-class SAL_DLLPRIVATE SfxDocumentInfoObject: public ::cppu::WeakImplHelper10<
-        ::com::sun::star::document::XDocumentInfo,
-        ::com::sun::star::lang::XComponent,
-        ::com::sun::star::beans::XPropertySet,
-        ::com::sun::star::beans::XFastPropertySet,
-        ::com::sun::star::beans::XPropertyAccess,
-        ::com::sun::star::beans::XPropertyContainer,
-        ::com::sun::star::document::XDocumentPropertiesSupplier,
-        ::com::sun::star::util::XModifyBroadcaster,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::util::XCloneable>
-{
-protected:
-    struct SfxDocumentInfoObject_Impl* _pImp;
-
-public:
-    SfxDocumentInfoObject();
-    ~SfxDocumentInfoObject();
-
-    // XComponent
-    virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener) throw( ::com::sun::star::uno::RuntimeException );
-
-    // XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw(
-        ::com::sun::star::uno::RuntimeException,
-        ::com::sun::star::beans::UnknownPropertyException,
-        ::com::sun::star::beans::PropertyVetoException,
-        ::com::sun::star::lang::IllegalArgumentException,
-        ::com::sun::star::lang::WrappedTargetException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName) throw(
-        ::com::sun::star::uno::RuntimeException,
-        ::com::sun::star::beans::UnknownPropertyException,
-        ::com::sun::star::lang::WrappedTargetException);
-    virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw(
-        ::com::sun::star::uno::RuntimeException,
-        ::com::sun::star::beans::UnknownPropertyException,
-        ::com::sun::star::lang::WrappedTargetException);
-    virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw(
-        ::com::sun::star::uno::RuntimeException,
-        ::com::sun::star::beans::UnknownPropertyException,
-        ::com::sun::star::lang::WrappedTargetException);
-    virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw(
-        ::com::sun::star::uno::RuntimeException,
-        ::com::sun::star::beans::UnknownPropertyException,
-        ::com::sun::star::lang::WrappedTargetException);
-    virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw(
-        ::com::sun::star::uno::RuntimeException,
-        ::com::sun::star::beans::UnknownPropertyException,
-        ::com::sun::star::lang::WrappedTargetException);
-
-    // ::com::sun::star::beans::XFastPropertySet
-    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue) throw(
-        ::com::sun::star::uno::RuntimeException,
-        ::com::sun::star::beans::UnknownPropertyException,
-        ::com::sun::star::beans::PropertyVetoException,
-        ::com::sun::star::lang::IllegalArgumentException,
-        ::com::sun::star::lang::WrappedTargetException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(
-        ::com::sun::star::uno::RuntimeException,
-        ::com::sun::star::beans::UnknownPropertyException,
-        ::com::sun::star::lang::WrappedTargetException);
-
-    // ::com::sun::star::beans::XPropertyAccess
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-    // ::com::sun::star::beans::XPropertyContainer
-    virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeProperty( const ::rtl::OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::document::XDocumentInfo
-    virtual sal_Int16 SAL_CALL getUserFieldCount() throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getUserFieldName(sal_Int16 nIndex) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getUserFieldValue(sal_Int16 nIndex) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setUserFieldName(sal_Int16 nIndex, const ::rtl::OUString& aName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setUserFieldValue(sal_Int16 nIndex, const ::rtl::OUString& aValue ) throw( ::com::sun::star::uno::RuntimeException );
-
-    // ::com::sun::star::document::XDocumentPropertiesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >
-        SAL_CALL getDocumentProperties()
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::util::XModifiable
-    virtual sal_Bool SAL_CALL isModified() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::util::XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const com::sun::star::uno::Reference< com::sun::star::util::XModifyListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ) ;
-    virtual void SAL_CALL removeModifyListener( const com::sun::star::uno::Reference< com::sun::star::util::XModifyListener > & xListener) throw( ::com::sun::star::uno::RuntimeException ) ;
-
-    // ::com::sun::star::lang::XInitialization:
-    virtual void SAL_CALL initialize(
-        const com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments)
-        throw (com::sun::star::uno::RuntimeException,
-               com::sun::star::uno::Exception);
-
-    // ::com::sun::star::util::XCloneable:
-    virtual com::sun::star::uno::Reference<com::sun::star::util::XCloneable> SAL_CALL createClone()
-        throw (com::sun::star::uno::RuntimeException);
-
-    const SfxDocumentInfoObject& operator=( const SfxDocumentInfoObject & rOther);
-};
-
-class SAL_DLLPRIVATE SfxStandaloneDocumentInfoObject: public SfxDocumentInfoObject,
-                                       public ::com::sun::star::lang::XServiceInfo,
-                                       public ::com::sun::star::document::XStandaloneDocumentInfo
-{
-    ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > _xFactory;
-
-public:
-    SfxStandaloneDocumentInfoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
-    virtual ~SfxStandaloneDocumentInfoObject();
-
-    void Clear();
-
-    // XInterface, XTypeProvider, XServiceInfo
-    SFX_DECL_XINTERFACE_XTYPEPROVIDER_XSERVICEINFO
-
-    // ::com::sun::star::document::XDocumentInfo
-    virtual sal_Int16 SAL_CALL getUserFieldCount() throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getUserFieldName(sal_Int16 nIndex) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getUserFieldValue(sal_Int16 nIndex) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setUserFieldName(sal_Int16 nIndex, const ::rtl::OUString& aName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setUserFieldValue(sal_Int16 nIndex, const ::rtl::OUString& aValue ) throw( ::com::sun::star::uno::RuntimeException );
-
-    // ::com::sun::star::document::XStandaloneDocumentInfo
-    virtual void SAL_CALL loadFromURL(const ::rtl::OUString& aURL) throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL storeIntoURL(const ::rtl::OUString& aURL) throw( ::com::sun::star::io::IOException );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 49e4dcae72be..486426a5879e 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -33,8 +33,6 @@
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/document/XCmisDocument.hpp>
-#include <com/sun/star/document/XDocumentInfo.hpp>
-#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentRecovery.hpp>
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
@@ -88,9 +86,9 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
 //________________________________________________________________________________________________________
-#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_33
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_33
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 33
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
+#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
+#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32
 #include <comphelper/implbase_var.hxx>
 #endif
 
@@ -123,8 +121,6 @@
 #define XNAMEREPLACE            ::com::sun::star::container::XNameReplace
 #define DOCEVENTOBJECT          ::com::sun::star::document::EventObject
 #define XDOCEVENTLISTENER       ::com::sun::star::document::XEventListener
-#define XDOCUMENTINFO           ::com::sun::star::document::XDocumentInfo
-#define XDOCUMENTINFOSUPPLIER   ::com::sun::star::document::XDocumentInfoSupplier
 #define XEVENTBROADCASTER       ::com::sun::star::document::XEventBroadcaster
 #define XDOCUMENTEVENTBROADCASTER   ::com::sun::star::document::XDocumentEventBroadcaster
 #define XEVENTSSUPPLIER         ::com::sun::star::document::XEventsSupplier
@@ -191,7 +187,6 @@ namespace sfx { namespace intern {
 
     @implements XChild
                 XComponent
-                XDocumentInfoSupplier
                 document::XDocumentPropertiesSupplier
                 rdf::XDocumentMetadataAccess
                 XEventListener
@@ -210,8 +205,7 @@ namespace sfx { namespace intern {
                  SfxListener
 */
 
-typedef ::comphelper::WeakImplHelper33  <   XCHILD
-                                        ,   XDOCUMENTINFOSUPPLIER
+typedef ::comphelper::WeakImplHelper32  <   XCHILD
                                         ,   ::com::sun::star::document::XDocumentPropertiesSupplier
                                         ,   ::com::sun::star::document::XCmisDocument
                                         ,   ::com::sun::star::rdf::XDocumentMetadataAccess
@@ -492,25 +486,6 @@ public:
 
     virtual void SAL_CALL removeEventListener(const REFERENCE< XEVENTLISTENER >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
-    //____________________________________________________________________________________________________
-    //  XDocumentInfoSupplier
-    //____________________________________________________________________________________________________
-
-    /**___________________________________________________________________________________________________
-        @short      -
-        @descr      -
-
-        @seealso    -
-
-        @param      -
-
-        @return     -
-
-        @onerror    -
-    */
-
-    virtual REFERENCE< XDOCUMENTINFO > SAL_CALL getDocumentInfo() throw (::com::sun::star::uno::RuntimeException);
-
     // XDocumentPropertiesSupplier
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >
         SAL_CALL getDocumentProperties()