[Libreoffice-commits] .: 4 commits - configure.ac dbaccess/source desktop/source forms/source framework/qa jurt/test offapi/com offapi/type_reference offapi/UnoApi_offapi.mk package/source python3/CustomTarget_PythonFramework.mk python3/ExternalPackage_python3.mk python3/ExternalProject_python3.mk python3/Module_python3.mk python3/UnpackedTarball_python3.mk python3/Zip_PythonFramework.mk pyuno/source qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/runner qadevOOo/tests scripting/java sfx2/inc sfx2/JunitTest_sfx2_complex.mk sfx2/Library_sfx.mk sfx2/qa sfx2/source sfx2/util solenv/bin swext/mediawiki ucb/source udkapi/com wizards/com
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 26 14:17:49 PST 2012
configure.ac | 5
dbaccess/source/ui/uno/copytablewizard.cxx | 1
desktop/source/deployment/manager/dp_manager.cxx | 11
desktop/source/deployment/registry/dp_backend.cxx | 3
forms/source/runtime/formoperations.cxx | 1
framework/qa/complex/path_settings/PathSettingsTest.java | 4
jurt/test/com/sun/star/uno/AnyConverter_Test.java | 8
offapi/UnoApi_offapi.mk | 5
offapi/com/sun/star/document/DocumentInfo.idl | 214 -
offapi/com/sun/star/document/OfficeDocument.idl | 12
offapi/com/sun/star/document/StandaloneDocumentInfo.idl | 63
offapi/com/sun/star/document/XDocumentInfo.idl | 128
offapi/com/sun/star/document/XDocumentInfoSupplier.idl | 59
offapi/com/sun/star/document/XStandaloneDocumentInfo.idl | 89
offapi/type_reference/types.rdb |binary
package/source/xstor/xstorage.cxx | 7
python3/CustomTarget_PythonFramework.mk | 76
python3/ExternalPackage_python3.mk | 6
python3/ExternalProject_python3.mk | 6
python3/Module_python3.mk | 2
python3/UnpackedTarball_python3.mk | 3
python3/Zip_PythonFramework.mk | 42
pyuno/source/module/pyuno_adapter.cxx | 14
qadevOOo/Jar_OOoRunner.mk | 6
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv | 1
qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXImpressDocument.csv | 1
qadevOOo/objdsc/sfx/com.sun.star.comp.sfx2.StandaloneDocumentInfo.csv | 46
qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv | 1
qadevOOo/runner/util/BasicMacroTools.java | 2
qadevOOo/tests/java/ifc/document/_DocumentInfo.java | 142 -
qadevOOo/tests/java/ifc/document/_XDocumentInfo.java | 215 -
qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java | 47
qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java | 120
qadevOOo/tests/java/mod/_fwk/DocumentProperties.java | 120
qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java | 2
qadevOOo/tests/java/mod/_remotebridge/uno/various.java | 2
qadevOOo/tests/java/mod/_remotebridge/various.java | 2
qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java | 123
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java | 2
qadevOOo/tests/java/mod/_sw/SwXCellRange.java | 2
qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java | 2
qadevOOo/tests/java/mod/_sw/SwXTextTable.java | 2
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 2
sfx2/JunitTest_sfx2_complex.mk | 8
sfx2/Library_sfx.mk | 1
sfx2/inc/sfx2/objuno.hxx | 186 -
sfx2/inc/sfx2/sfxbasemodel.hxx | 33
sfx2/qa/complex/sfx2/DocumentInfo.java | 338 --
sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java | 90
sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java | 22
sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java | 135
sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java | 39
sfx2/qa/unoapi/sfx.sce | 1
sfx2/source/appl/appuno.cxx | 2
sfx2/source/doc/objuno.cxx | 1351 ----------
sfx2/source/doc/sfxbasemodel.cxx | 100
sfx2/util/sfx.component | 3
sfx2/util/sfx.xml | 12
solenv/bin/modules/installer/control.pm | 1
swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java | 4
ucb/source/ucp/hierarchy/hierarchydata.cxx | 8
ucb/source/ucp/package/pkgcontent.cxx | 8
udkapi/com/sun/star/lang/IllegalArgumentException.idl | 14
wizards/com/sun/star/wizards/common/NumericalHelper.java | 2
wizards/com/sun/star/wizards/common/PlaceholderTextElement.java | 2
wizards/com/sun/star/wizards/common/PropertySetHelper.java | 5
wizards/com/sun/star/wizards/common/SystemDialog.java | 4
wizards/com/sun/star/wizards/query/Finalizer.java | 2
wizards/com/sun/star/wizards/report/DBColumn.java | 2
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 4
wizards/com/sun/star/wizards/ui/FilterComponent.java | 10
wizards/com/sun/star/wizards/ui/UnoDialog.java | 6
wizards/com/sun/star/wizards/ui/WizardDialog.java | 6
73 files changed, 196 insertions(+), 3802 deletions(-)
New commits:
commit 264c136697bed318b324aa7412f22778b3c7020d
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 26 22:41:26 2012 +0100
configure: check for Python2 >= 2.6 as well
Change-Id: I568dc7c83cf60f2782ac730dc5efcb0e4b8de8a2
diff --git a/configure.ac b/configure.ac
index 572ec99..061175e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7455,10 +7455,11 @@ system)
#include <Python.h>
int main(int argc, char **argv) {
- if (PY_MAJOR_VERSION < 3 || (PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 3)) return 0;
+ if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) ||
+ (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3)) return 0;
else return 1;
}
- ]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when building with Python 3])],[])
+ ]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when building with Python 3, or Python >= 2.6 when building with Python 2])],[])
CFLAGS=$save_CFLAGS
AC_LANG_POP(C)
commit bee01c825b77a57b39e1b6baea6b6fdf1f0052e5
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Mon Nov 26 20:58:16 2012 +0100
python3: build LibreOfficePython.framework on MacOS X
Change-Id: I0815aa0f5b50166f626f721be56969c0afd655a8
diff --git a/python3/CustomTarget_PythonFramework.mk b/python3/CustomTarget_PythonFramework.mk
new file mode 100644
index 0000000..bfeaa15
--- /dev/null
+++ b/python3/CustomTarget_PythonFramework.mk
@@ -0,0 +1,76 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Christian Lohmaier <lohmaier+LibreOffice at gmail.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,python3/fixscripts))
+$(eval $(call gb_CustomTarget_CustomTarget,python3/fixinstallnames))
+$(eval $(call gb_CustomTarget_CustomTarget,python3/executables))
+
+python3_fw_prefix=$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework
+
+# rule to allow relocating the whole framework, removing reference to buildinstallation directory
+$(call gb_CustomTarget_get_target,python3/fixscripts): $(call gb_ExternalProject_get_target,python3)
+ $(call gb_Output_announce,python3 - remove reference to installroot from scripts,build,CUS,5)
+ $(COMMAND_ECHO)for file in \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/bin/2to3 \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/bin/2to3-$(python3_PYMAJOR).$(python3_PYMINOR) \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/bin/idle$(python3_PYMAJOR).$(python3_PYMINOR) \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/bin/pydoc$(python3_PYMAJOR).$(python3_PYMINOR) \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/bin/python$(python3_PYMAJOR).$(python3_PYMINOR)-config \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/bin/python$(python3_PYMAJOR).$(python3_PYMINOR)m-config \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/bin/pyvenv-$(python3_PYMAJOR).$(python3_PYMINOR) ; do \
+ { rm "$$file" && awk '\
+ BEGIN {print "#!/bin/bash\n\
+origpath=$$(pwd)\n\
+bindir=$$(cd $$(dirname \"$$0\") ; pwd)\n\
+cd \"$$origpath\"\n\
+\"$$bindir/../Resources/Python.app/Contents/MacOS/LibreOfficePython\" - $$@ <<EOF"} \
+ FNR==1{next} \
+ {print} \
+ END {print "EOF"}' > "$$file" ; } < "$$file" ; chmod +x "$$file" ; done
+ touch $@
+
+$(call gb_CustomTarget_get_target,python3/fixinstallnames): $(call gb_ExternalProject_get_target,python3)
+ $(call gb_Output_announce,python3 - fix installname,build,CUS,5)
+ install_name_tool -change \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/LibreOfficePython \
+ @executable_path/../../../../LibreOfficePython \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython
+ touch $@
+
+# also delete binaries that are symlinked in scp2
+$(call gb_CustomTarget_get_target,python3/executables): $(call gb_ExternalProject_get_target,python3)
+ $(call gb_Output_announce,python3 - fix installnames in executables,build,CUS,5)
+ cd $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/bin ; \
+ for file in python$(python3_PYMAJOR).$(python3_PYMINOR) \
+ python$(python3_PYMAJOR).$(python3_PYMINOR)m \
+ pythonw$(python3_PYMAJOR).$(python3_PYMINOR) ; do \
+ install_name_tool -change \
+ $(python3_fw_prefix)/Versions/$(python3_PYMAJOR).$(python3_PYMINOR)/LibreOfficePython \
+ @executable_path/../LibreOfficePython $$file ; done
+ touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index 7138a60..ef6fe42 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -39,16 +39,10 @@ else ifeq ($(OS),WNT) # MinGW
$(eval $(call gb_ExternalPackage_add_file,python3,bin/python.exe,python.exe))
$(eval $(call gb_ExternalPackage_add_file,python3,bin/python3.dll,python3.dll))
else
-ifeq ($(OS),MACOSX)
-# TODO what is this?
-$(eval $(call gb_ExternalPackage_add_file,python3,lib/OOoPython.framework/OOoPython,python))
-$(eval $(call gb_ExternalPackage_add_file,python3,lib/OOoPython.framework/Versions/2.6,OOoPython.framework/Versions/2.6))
-else # ELF UNIX
$(eval $(call gb_ExternalPackage_add_file,python3,bin/python,python))
$(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython3.so,libpython3.so))
$(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython3.3m.so,libpython3.3m.so))
# versioned lib/libpython3.3m.so.1.0 appears to be unnecessary?
-endif
# Unfortunately the python build system does not allow to explicitly enable or
# disable these, it just tries to build them and then prints which did not
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk
index af3653d..85bbf8e 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -59,11 +59,11 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
--with-system-expat \
$(if $(strip $(VALGRIND_CFLAGS)),--with-valgrind) \
- --prefix=/$(if $(filter MACOSX,$(OS)), at __________________________________________________OOO,python-inst) \
+ --prefix=/python-inst \
$(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads CFLAGS="-g0") \
$(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \
$(if $(filter MACOSX,$(OS)), \
- --enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit --enable-framework=/SomeDirThatIsNotLibraryOrSystemOrFrameworks --with-framework-name=LibreOfficePython, \
+ --enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \
--enable-shared \
) \
CC="$(strip $(CC) \
@@ -78,7 +78,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \
$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \
)" \
- && MAKEFLAGS=$(if $(VERBOSE)$(verbose),,s) $(MAKE) \
+ && MAKEFLAGS=$(if $(VERBOSE)$(verbose),,s) $(MAKE) $(if $(filter MACOSX,$(OS)), DESTDIR=$(EXTERNAL_WORKDIR)/python-inst install) \
&& ln -s build/lib.* LO_lib \
&& touch $@
diff --git a/python3/Module_python3.mk b/python3/Module_python3.mk
index 336357c..e9da887 100644
--- a/python3/Module_python3.mk
+++ b/python3/Module_python3.mk
@@ -15,8 +15,8 @@ ifeq ($(SYSTEM_PYTHON),NO)
$(eval $(call gb_Module_add_targets,python3,\
UnpackedTarball_python3 \
ExternalProject_python3 \
- ExternalPackage_python3 \
Package_python3_mk \
+ $(if $(filter MACOSX,$(OS)),Zip_PythonFramework CustomTarget_PythonFramework,ExternalPackage_python3) \
))
endif
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk
index d519d66..d235e0a 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -11,7 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,python3))
#FIXME configure
PYTHON3_TARBALL := b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2
-
+python3_PYMAJOR=3
+python3_PYMINOR=3
$(eval $(call gb_UnpackedTarball_set_tarball,python3,$(PYTHON3_TARBALL)))
$(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
diff --git a/python3/Zip_PythonFramework.mk b/python3/Zip_PythonFramework.mk
new file mode 100644
index 0000000..18fc24a
--- /dev/null
+++ b/python3/Zip_PythonFramework.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Christian Lohmaier <lohmaier+LibreOffice at gmail.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,LibreOfficePython.framework,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO))
+
+$(eval $(call gb_Zip_add_dependencies,LibreOfficePython.framework,\
+ $(call gb_CustomTarget_get_target,python3/fixscripts) \
+ $(call gb_CustomTarget_get_target,python3/fixinstallnames) \
+ $(call gb_CustomTarget_get_target,python3/executables) \
+))
+
+$(eval $(call gb_Zip_add_file,LibreOfficePython.framework,LibreOfficePython.framework))
+
+# preserve links to not duplicate stuff in the zip...
+# links are not preserved when unpacking, need to be created in scp2
+$(eval $(call gb_Zip_add_commandoptions,LibreOfficePython.framework,-y))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 8916b04..99705f8 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -332,6 +332,7 @@ sub check_logfile
$compareline =~ s/Error\.idl//g; # removing all occurrences of "Error.idl"
$compareline =~ s/Error\.html//g; # removing all occurrences of "Error.html"
$compareline =~ s/error\.py//g; # removing all occurrences of "error.py"
+ $compareline =~ s/error\.cpython-33\.py[oc]//g; # removing all occurrences of "error-cpython"
$compareline =~ s/libgpg-error-0.dll//g;
if ( $compareline =~ /\bError\b/i )
commit e6f81b1898a59280f41177206b777a7a0d32f3fc
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 22 11:26:49 2012 +0100
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
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 6e85574..f01eb68 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -606,7 +606,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatra
X11DropTarget \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\
- DocumentInfo \
EventDescriptor \
Events \
ExportFilter \
@@ -622,7 +621,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/documen
OfficeDocument \
PDFDialog \
Settings \
- StandaloneDocumentInfo \
TypeDetection \
XMLBasicExporter \
XMLBasicImporter \
@@ -2143,8 +2141,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\
XCompatWriterDocProperties \
XDocumentEventBroadcaster \
XDocumentEventListener \
- XDocumentInfo \
- XDocumentInfoSupplier \
XDocumentInsertable \
XDocumentLanguages \
XDocumentProperties \
@@ -2172,7 +2168,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\
XOOXMLDocumentPropertiesImporter \
XRedlinesSupplier \
XScriptInvocationContext \
- XStandaloneDocumentInfo \
XStorageBasedDocument \
XStorageChangeListener \
XTypeDetection \
diff --git a/offapi/com/sun/star/document/DocumentInfo.idl b/offapi/com/sun/star/document/DocumentInfo.idl
deleted file mode 100644
index 7570b00..0000000
--- a/offapi/com/sun/star/document/DocumentInfo.idl
+++ /dev/null
@@ -1,214 +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 __com_sun_star_document_DocumentInfo_idl__
-#define __com_sun_star_document_DocumentInfo_idl__
-
-#include <com/sun/star/document/XDocumentInfo.idl>
-#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/beans/XFastPropertySet.idl>
-#include <com/sun/star/beans/XPropertyContainer.idl>
-#include <com/sun/star/beans/NamedValue.idl>
-#include <com/sun/star/util/DateTime.idl>
-#include <com/sun/star/lang/Locale.idl>
-
-
- module com { module sun { module star { module document {
-
-/** this service provides document-specific information like the
- author, creation date and user fields
-
- <p>
- Contrary to the service <type>StandaloneDocumentInfo</type> the document - which
- contains such informations - must be loaded completely. As a result of that this
- DocumentInfo service is available on an open document via the interface
- <type>XDocumentInfoSupplier</type> only.
- </p>
-
- @deprecated Use <type>DocumentProperties</type> instead.
-
- @see StandaloneDocumentInfo
- @see XDocumentInfoSupplier
- */
-published service DocumentInfo
-{
- /** provides access to the user fields for the information regarding the
- document
-
- <p>
- These fields are additional to normal properties.
- (see below)
- </p>
- */
- interface XDocumentInfo;
-
- /** necessary to support normal properties
- */
- interface com::sun::star::beans::XPropertySet;
-
- /** supports faster access on well known properties by using index
- */
- interface com::sun::star::beans::XFastPropertySet;
-
- /** provides access to the user fields, which (instead to the user fields set
- by the interface XDocumentInfo) will be typesafe.
-
- <p>
- These fields are additional to normal properties (see below) and
- additional to the user fields set by the interface XDocumentInfo (see before).
- </p>
- */
- [optional] interface com::sun::star::beans::XPropertyContainer;
-
- /** contains the initial author of the document
- */
- [property] string Author;
-
- /** @deprecated
- */
- [property] boolean AutoloadEnabled;
-
- /** contains the number of seconds after which a specified
- URL is to be loaded after the document is loaded into a desktop
- frame
- */
- [property] long AutoloadSecs;
-
- /** contains the URL to load automatically after a
- specified time after the document is loaded into a desktop frame
- */
- [property] string AutoloadURL;
-
- /** contains the date and time of the first time the
- document was stored
- */
- [property] com::sun::star::util::DateTime CreationDate;
-
- /** contains the name of the default frame into which
- links should be loaded if no target is specified
-
- <p>
- This applies to the autoload feature too, but to others as well.
- </p>
- */
- [property] string DefaultTarget;
-
- /** contains a multi-line comment of the document
-
- <p>
- Line delimiters can be UNIX, Macintosh or DOS style.
- </p>
- */
- [property] string Description;
-
- /** contains some statistics about the document
-
- <p>
- The exact name and type of the values depends on the document type
- </p>
- */
- [property] sequence< com::sun::star::beans::NamedValue > DocumentStatistic;
-
- /** describes how often the document was edited and saved
- */
- [property] short EditingCycles;
-
- /** contains the net time of editing the document (in seconds)
- */
- [property] long EditingDuration;
-
- /** identifies application was used to create or last modify the document
- */
- [property] string Generator;
-
- /** contains a comma separated list of keywords for
- the document
- */
- [property] string Keywords;
-
- /** contains the MIME-type of the document's resource
-
- <p>
- The MIME-type is neither stored in the document information nor in
- the document; it is sent within a protocol header or is
- detected, thus it cannot be changed.
- </p>
- */
- [readonly, property] string MIMEType;
-
- /** default language of the document
- */
- [property] com::sun::star::lang::Locale Language;
-
- /** contains the name of the editor who was the last
- person to store this document
- */
- [property] string ModifiedBy;
-
- /** contains the date and time of the last time the
- document was stored
- */
- [property] com::sun::star::util::DateTime ModifyDate;
-
- /** contains the date and time of when the document was
- last printed
- */
- [property] com::sun::star::util::DateTime PrintDate;
-
- /** contains the name of the editor who was the last
- person to print the document
- */
- [property] string PrintedBy;
-
- /** subject of document
- */
- [property] string Subject;
-
- /** contains logical name of the template from
- which the document was created
-
- <p>
- The value is an empty string if the document was not created
- from a template or if it was detached from the template.
- </p>
- */
- [property] string Template;
-
- /** contains the file path name of the template from
- which the document was created
- */
- [property] string TemplateFileName;
-
- /** contains the date and time of when the document
- was created or updated from the template
- */
- [property] com::sun::star::util::DateTime TemplateDate;
-
- /** contains the title of the document
- */
- [property] string Title;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/document/OfficeDocument.idl b/offapi/com/sun/star/document/OfficeDocument.idl
index e6f2f6f..96de718 100644
--- a/offapi/com/sun/star/document/OfficeDocument.idl
+++ b/offapi/com/sun/star/document/OfficeDocument.idl
@@ -26,7 +26,6 @@
#include <com/sun/star/view/XPrintJobBroadcaster.idl>
#include <com/sun/star/document/XEventBroadcaster.idl>
#include <com/sun/star/document/XEventsSupplier.idl>
-#include <com/sun/star/document/XDocumentInfoSupplier.idl>
#include <com/sun/star/document/XViewDataSupplier.idl>
#include <com/sun/star/document/XDocumentEventBroadcaster.idl>
#include <com/sun/star/document/XEmbeddedScripts.idl>
@@ -104,17 +103,6 @@ published service OfficeDocument
*/
[optional] interface XEventsSupplier;
- /** document can provide a <type>DocumentInfo</type>
-
- <p>
- 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;
-
/** access to some properties describing all open views to a document
*/
[optional] interface XViewDataSupplier;
diff --git a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl b/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
deleted file mode 100644
index 04084ea..0000000
--- a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
+++ /dev/null
@@ -1,63 +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 __com_sun_star_document_StandaloneDocumentInfo_idl__
-#define __com_sun_star_document_StandaloneDocumentInfo_idl__
-
-#include <com/sun/star/document/DocumentInfo.idl>
-#include <com/sun/star/document/XStandaloneDocumentInfo.idl>
-
-
- module com { module sun { module star { module document {
-
-/** extends the service <type>DocumentInfo</type> to have access on such
- document properties without loading the whole document
-
- <p>
- First action on this service must be to specify which document should be handled.
- Otherwise all supported properties of <type>DocumentInfo</type> will be set to
- void values. Loading of a document doesn't mean - loading all. It means reading
- of special part only, which includes searched information. Same procedure for saving
- of may changed values back to the document.
- </p>
-
- @deprecated Use <type>DocumentProperties</type> instead.
-
- @see DocumentInfo
- */
-published service StandaloneDocumentInfo
-{
- /** use it to specify resource or target of document info data
-
- <p>
- Must be the first action on this service. Otherwise all properties will be void.
- </p>
- */
- interface XStandaloneDocumentInfo;
-
- /** access to document info data
- */
- service DocumentInfo;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/document/XDocumentInfo.idl b/offapi/com/sun/star/document/XDocumentInfo.idl
deleted file mode 100644
index b43bab7..0000000
--- a/offapi/com/sun/star/document/XDocumentInfo.idl
+++ /dev/null
@@ -1,128 +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 __com_sun_star_document_XDocumentInfo_idl__
-#define __com_sun_star_document_XDocumentInfo_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/lang/ArrayIndexOutOfBoundsException.idl>
-
-
-module com { module sun { module star { module document {
-
-/** provides access to the user fields for the information regarding the
- document
-
- <p>
- These fields are special one of the set of available document properties.
- Other ones are accessed as properties (by using the interface
- <type scope="com::sun::star::beans">XPropertySet</type>) of service
- <type>DocumentInfo</type>.
- </p>
-
- @deprecated Use <type>XDocumentProperties</type> instead.
-
- @see DocumentInfo
- @see StandaloneDocumentInfo
- @see com::sun::star::beans::XPropertySet
- */
-published interface XDocumentInfo: com::sun::star::uno::XInterface
-{
- /** provides information about count of available fields
-
- <p>
- This count marks the top range of possible requests for get/set
- any of these fields. Range = [0..count-1]
- </p>
-
- @returns
- current count
- */
- short getUserFieldCount();
-
- /** returns the name of an user field
-
- @param Index
- specifies the position of requested field
- Range = [0..count-1]
-
- @returns
- the name of the requested field
-
- @throws com::sun::star::lang::ArrayIndexOutOfBoundsException
- if <var>Index</var> don't fit range of [0..count-1]
- */
- string getUserFieldName( [in] short Index )
- raises( com::sun::star::lang::ArrayIndexOutOfBoundsException );
-
- /** returns the value of an user field
-
- @param Index
- specifies the position of requested field
- Range = [0..count-1]
-
- @returns
- the value of the requested field
-
- @throws com::sun::star::lang::ArrayIndexOutOfBoundsException
- if <var>Index</var> don't fit range of [0..count-1]
- */
- string getUserFieldValue( [in] short Index )
- raises( com::sun::star::lang::ArrayIndexOutOfBoundsException );
-
- /** changes the name of one of the user fields
-
- @param Index
- specifies the position of requested field
- Range = [0..count-1]
-
- @param Name
- the new name for this field to be set
-
- @throws com::sun::star::lang::ArrayIndexOutOfBoundsException
- if <var>Index</var> don't fit range of [0..count-1]
- */
- void setUserFieldName(
- [in] short Index ,
- [in] string Name )
- raises( com::sun::star::lang::ArrayIndexOutOfBoundsException );
-
- /** changes the value of one of the user fields
-
- @param Index
- specifies the position of requested field
- Range = [0..count-1]
-
- @param Value
- the new value for this field to be set
-
- @throws com::sun::star::lang::ArrayIndexOutOfBoundsException
- if <var>Index</var> don't fit range of [0..count-1]
- */
- void setUserFieldValue(
- [in] short Index ,
- [in] string Value )
- raises( com::sun::star::lang::ArrayIndexOutOfBoundsException );
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl b/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
deleted file mode 100644
index 295d431..0000000
--- a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
+++ /dev/null
@@ -1,59 +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 __com_sun_star_document_XDocumentInfoSupplier_idl__
-#define __com_sun_star_document_XDocumentInfoSupplier_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/document/XDocumentInfo.idl>
-
-
-module com { module sun { module star { module document {
-
-/** through this interface documents can provide a <type>DocumentInfo</type>
-
- <p>
- A <type>DocumentInfo</type> is available on already opened documents only
- and must be provides by this supplier interface.
- Instead of that you can use the service <type>StandaloneDocumentInfo</type>
- to have access to such informations without opening the whole file.
- It read/write parts of the document, which include the required informations,
- only.
- </p>
-
- @deprecated Use <type>XDocumentPropertiesSupplier</type> instead.
-
- @see DocumentInfo
- @see StandaloneDocumentInfo
- */
-published interface XDocumentInfoSupplier: com::sun::star::uno::XInterface
-{
- /** provides the document information object
-
- @returns
- an object of type <type>DocumentInfo</type>
- */
- XDocumentInfo getDocumentInfo();
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl b/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
deleted file mode 100644
index da5ae47..0000000
--- a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
+++ /dev/null
@@ -1,89 +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 __com_sun_star_document_XStandaloneDocumentInfo_idl__
-#define __com_sun_star_document_XStandaloneDocumentInfo_idl__
-
-#include <com/sun/star/document/XDocumentInfo.idl>
-#include <com/sun/star/io/IOException.idl>
-
-
-module com { module sun { module star { module document {
-
-/** makes it possible to load document information from
- a resource specified by a URL and to store it into a resource also
- specified by a URL
-
- <p>
- Only the document information part of the resource is transferred.
- Instead of <type>DocumentInfo</type> not the whole document will be opened.
- Note: Without specifying the source or target of this info (the document)
- nothing can work and will be handled as void (for reading) or ignored (for writing).
- After specifying the source/target by using this interface,
- the interface <type>XDocumentInfo</type> (which must be implemented on same
- object then this one!) provides access to the info properties.
- </p>
-
- @deprecated Use <type>XDocumentProperties</type> instead.
-
- @see DocumentInfo
- @see StandaloneDocumentInfo
- @see XDocumentInfo
- */
-published interface XStandaloneDocumentInfo: XDocumentInfo
-{
- /** loads the document information from a file referred by an URL
-
- <p>
- After an unsuccessful call the contents of the document
- information are undefined (void).
- This method only works for storage file formats.
- </p>
-
- @param URL
- specifies the source of information
-
- @throws com::sun::star::io::IOException
- if storage couldn't be found or opened
- */
- void loadFromURL( [in] string URL )
- raises( com::sun::star::io::IOException );
-
- /** stores the document information into a file referred by a URL
-
- <p>
- Only the document information part of the document is overwritten.
- This method only works for storage file formats.
- </p>
-
- @param URL
- specifies the target for saving
-
- @throws com::sun::star::io::IOException
- if storage couldn't be found or opened
- */
- void storeIntoURL( [in] string URL )
- raises( com::sun::star::io::IOException );
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 5991297..44d459d 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index d6c5c9e..998a794 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -410,15 +410,12 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/datatransfer/clipboard/_XFlushableClipboard \
qadevOOo/tests/java/ifc/datatransfer/_XDataFormatTranslator \
qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory \
- qadevOOo/tests/java/ifc/document/_DocumentInfo \
qadevOOo/tests/java/ifc/document/_ExportFilter \
qadevOOo/tests/java/ifc/document/_ImportFilter \
qadevOOo/tests/java/ifc/document/_LinkTarget \
qadevOOo/tests/java/ifc/document/_OfficeDocument \
qadevOOo/tests/java/ifc/document/_Settings \
qadevOOo/tests/java/ifc/document/_XActionLockable \
- qadevOOo/tests/java/ifc/document/_XDocumentInfo \
- qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier \
qadevOOo/tests/java/ifc/document/_XDocumentInsertable \
qadevOOo/tests/java/ifc/document/_XEmbeddedObjectSupplier \
qadevOOo/tests/java/ifc/document/_XEventBroadcaster \
@@ -428,7 +425,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/document/_XImporter \
qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier \
qadevOOo/tests/java/ifc/document/_XMimeTypeInfo \
- qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo \
qadevOOo/tests/java/ifc/document/_XTypeDetection \
qadevOOo/tests/java/ifc/document/_XViewDataSupplier \
qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor \
@@ -1061,7 +1057,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_fwk/Desktop \
qadevOOo/tests/java/mod/_fwk/DispatchRecorder \
qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier \
- qadevOOo/tests/java/mod/_fwk/DocumentProperties \
qadevOOo/tests/java/mod/_fwk/FontMenuController \
qadevOOo/tests/java/mod/_fwk/FontSizeMenuController \
qadevOOo/tests/java/mod/_fwk/FooterMenuController \
@@ -1322,7 +1317,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sfx/DocumentTemplates \
qadevOOo/tests/java/mod/_sfx/FrameLoader \
qadevOOo/tests/java/mod/_sfx/SfxMacroLoader \
- qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo \
qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader \
qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry \
qadevOOo/tests/java/mod/_simreg/SimpleRegistry \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
index c4da0da..cb7c6d1 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
@@ -47,7 +47,6 @@
"ScModelObj";"com::sun::star::beans::XPropertySet#optional";"removePropertyChangeListener()"
"ScModelObj";"com::sun::star::beans::XPropertySet#optional";"addVetoableChangeListener()"
"ScModelObj";"com::sun::star::beans::XPropertySet#optional";"removeVetoableChangeListener()"
-"ScModelObj";"com::sun::star::document::XDocumentInfoSupplier#optional";"getDocumentInfo()"
"ScModelObj";"com::sun::star::sheet::XDocumentAuditing";"refreshArrows()"
"ScModelObj";"com::sun::star::sheet::XGoalSeek";"seekGoal()"
"ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"NamedRanges"
diff --git a/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXImpressDocument.csv b/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXImpressDocument.csv
index 0e50db8..fd2b766 100644
--- a/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXImpressDocument.csv
+++ b/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXImpressDocument.csv
@@ -40,7 +40,6 @@
"SdXImpressDocument";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"SdXImpressDocument";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"SdXImpressDocument";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"SdXImpressDocument";"com::sun::star::document::XDocumentInfoSupplier#optional";"getDocumentInfo()"
"SdXImpressDocument";"com::sun::star::document::OfficeDocument";"AutomaticControlFocus#optional"
"SdXImpressDocument";"com::sun::star::document::OfficeDocument";"ApplyFormDesignMode#optional"
"SdXImpressDocument";"com::sun::star::document::OfficeDocument";"RuntimeUID#optional"
diff --git a/qadevOOo/objdsc/sfx/com.sun.star.comp.sfx2.StandaloneDocumentInfo.csv b/qadevOOo/objdsc/sfx/com.sun.star.comp.sfx2.StandaloneDocumentInfo.csv
deleted file mode 100644
index d9b6e02..0000000
--- a/qadevOOo/objdsc/sfx/com.sun.star.comp.sfx2.StandaloneDocumentInfo.csv
+++ /dev/null
@@ -1,46 +0,0 @@
-"StandaloneDocumentInfo";"com::sun::star::document::XStandaloneDocumentInfo";"loadFromURL()"
-"StandaloneDocumentInfo";"com::sun::star::document::XStandaloneDocumentInfo";"storeIntoURL()"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Author"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Generator"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"CreationDate"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Title"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Subject"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Description"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Keywords"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"MIMEType"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Language"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"ModifiedBy"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"ModifyDate"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"PrintedBy"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"PrintDate"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Template"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"TemplateDate"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"AutoloadURL"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"AutoloadSecs"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"DefaultTarget"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"BlindCopiesTo"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"CopyTo"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"InReplyTo"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Newsgroups"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Original"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Priority"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Recipient"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"References"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"ReplyTo"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"Theme"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"IsEncrypted"
-"StandaloneDocumentInfo";"com::sun::star::document::DocumentInfo";"AutoloadEnabled"
-"StandaloneDocumentInfo";"com::sun::star::document::XDocumentInfo";"getUserFieldCount()"
-"StandaloneDocumentInfo";"com::sun::star::document::XDocumentInfo";"getUserFieldName()"
-"StandaloneDocumentInfo";"com::sun::star::document::XDocumentInfo";"getUserFieldValue()"
-"StandaloneDocumentInfo";"com::sun::star::document::XDocumentInfo";"setUserFieldName()"
-"StandaloneDocumentInfo";"com::sun::star::document::XDocumentInfo";"setUserFieldValue()"
-"StandaloneDocumentInfo";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"StandaloneDocumentInfo";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"StandaloneDocumentInfo";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"StandaloneDocumentInfo";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"StandaloneDocumentInfo";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"StandaloneDocumentInfo";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"StandaloneDocumentInfo";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"StandaloneDocumentInfo";"com::sun::star::beans::XFastPropertySet";"setFastPropertyValue()"
-"StandaloneDocumentInfo";"com::sun::star::beans::XFastPropertySet";"getFastPropertyValue()"
diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv
index 09e9c91..dd21e26 100644
--- a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv
+++ b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv
@@ -58,7 +58,6 @@
"SwXTextDocument";"com::sun::star::beans::XPropertySet#optional";"removePropertyChangeListener()"
"SwXTextDocument";"com::sun::star::beans::XPropertySet#optional";"addVetoableChangeListener()"
"SwXTextDocument";"com::sun::star::beans::XPropertySet#optional";"removeVetoableChangeListener()"
-"SwXTextDocument";"com::sun::star::document::XDocumentInfoSupplier#optional";"getDocumentInfo()"
"SwXTextDocument";"com::sun::star::text::GenericTextDocument";"CharLocale#optional"
"SwXTextDocument";"com::sun::star::text::GenericTextDocument";"CharacterCount#optional"
"SwXTextDocument";"com::sun::star::text::GenericTextDocument";"ParagraphCount#optional"
diff --git a/qadevOOo/tests/java/ifc/document/_DocumentInfo.java b/qadevOOo/tests/java/ifc/document/_DocumentInfo.java
deleted file mode 100644
index 5809f3e..0000000
--- a/qadevOOo/tests/java/ifc/document/_DocumentInfo.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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 .
- */
-
-package ifc.document;
-
-import lib.MultiPropertyTest;
-
-import com.sun.star.util.DateTime;
-
-/**
-* Testing <code>com.sun.star.document.DocumentInfo</code>
-* service properties : <p>
-* <ul>
-* <li> <code> Author </code> </li>
-* <li> <code> AutoloadEnabled </code> </li>
-* <li> <code> AutoloadSecs </code> </li>
-* <li> <code> AutoloadURL </code> </li>
-* <li> <code> BlindCopiesTo </code> </li>
-* <li> <code> CopyTo </code> </li>
-* <li> <code> CreationDate </code> </li>
-* <li> <code> DefaultTarget </code> </li>
-* <li> <code> Description </code> </li>
-* <li> <code> InReplyTo </code> </li>
-* <li> <code> IsEncrypted </code> </li>
-* <li> <code> Keywords </code> </li>
-* <li> <code> MIMEType </code> </li>
-* <li> <code> ModifiedBy </code> </li>
-* <li> <code> ModifyDate </code> </li>
-* <li> <code> Newsgroups </code> </li>
-* <li> <code> Original </code> </li>
-* <li> <code> PrintDate </code> </li>
-* <li> <code> PrintedBy </code> </li>
-* <li> <code> Priority </code> </li>
-* <li> <code> Recipient </code> </li>
-* <li> <code> References </code> </li>
-* <li> <code> ReplyTo </code> </li>
-* <li> <code> Template </code> </li>
-* <li> <code> TemplateDate </code> </li>
-* <li> <code> Theme </code> </li>
-* <li> <code> Title </code> </li>
-* </ul>
-* Properties testing is automated by <code>lib.MultiPropertyTest</code>.
-* @see com.sun.star.document.DocumentInfo
-*/
-public class _DocumentInfo extends MultiPropertyTest {
-
- /**
- * Overrides compare method. Can compare <code>DateTime</code>
- * structures.
- */
- protected boolean compare(Object ob1, Object ob2) {
- if (ob1 instanceof DateTime && ob2 instanceof DateTime) {
- DateTime dt1 = (DateTime)ob1;
- DateTime dt2 = (DateTime)ob2;
-
- return dt1.Year == dt2.Year
- && dt1.Month == dt2.Month
- && dt1.Day == dt2.Day
- && dt1.Hours == dt2.Hours
- && dt1.Minutes == dt2.Minutes
- && dt1.Seconds == dt2.Seconds
- && dt1.HundredthSeconds == dt2.HundredthSeconds;
- } else {
- return super.compare(ob1, ob2);
- }
- }
-
- /**
- * Prints DateTime.
- */
- protected String toString(Object obj) {
- if (obj instanceof DateTime) {
- DateTime dt = (DateTime)obj;
-
- return dt.Year + ":" + dt.Month + ":" + dt.Day
- + ":" + dt.Hours + ":" + dt.Minutes
- + ":" + dt.Seconds + ":" + dt.HundredthSeconds;
- } else {
- return super.toString(obj);
- }
- }
-
- /**
- * Tester for properties with <code>DateTime</code> type which
- * creates new structure if old property value was null.
- */
- class DatePropertyTester extends PropertyTester {
- protected Object getNewValue(String propName,
- Object oldValue) {
- if (oldValue == null || util.utils.isVoid(oldValue)) {
- DateTime dt = new DateTime();
-
- dt.Year = 2000;
- dt.Month = 10;
- dt.Day = 18;
- dt.Hours = 19;
- dt.Minutes = 41;
-
- return dt;
- } else {
- return super.getNewValue(propName, oldValue);
- }
- }
- }
-
- /**
- * Can be void.
- */
- public void _PrintDate() {
- testProperty("PrintDate", new DatePropertyTester());
- }
-
- /**
- * Can be void.
- */
- public void _TemplateDate() {
- testProperty("TemplateDate", new DatePropertyTester());
- }
-
- /**
- * Can be void.
- */
- public void _ModifyDate() {
- testProperty("ModifyDate", new DatePropertyTester());
- }
-}
-
diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInfo.java b/qadevOOo/tests/java/ifc/document/_XDocumentInfo.java
deleted file mode 100644
index 02c371d..0000000
--- a/qadevOOo/tests/java/ifc/document/_XDocumentInfo.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * 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 .
- */
-
-package ifc.document;
-
-import lib.MultiMethodTest;
-
-import com.sun.star.document.XDocumentInfo;
-import com.sun.star.lang.ArrayIndexOutOfBoundsException;
-
-/**
-* Testing <code>com.sun.star.document.XDocumentInfo</code>
-* interface methods :
-* <ul>
-* <li><code> getUserFieldCount()</code></li>
-* <li><code> getUserFieldName()</code></li>
-* <li><code> setUserFieldName()</code></li>
-* <li><code> getUserFieldValue()</code></li>
-* <li><code> setUserFieldValue()</code></li>
-* </ul> <p>
-* Test is <b> NOT </b> multithread compilant. <p>
-* @see com.sun.star.document.XDocumentInfo
-*/
-public class _XDocumentInfo extends MultiMethodTest {
-
- public XDocumentInfo oObj = null;
-
- short fieldCount;
-
- /**
- * Gets user field count. <p>
- * Has <b> OK </b> status if count is positive.
- */
- public void _getUserFieldCount() {
- fieldCount = oObj.getUserFieldCount();
- tRes.tested("getUserFieldCount()", fieldCount >= 0);
- }
-
- String[] oldNames;
- String[] oldValues;
-
- /**
- * Retrieves all user field names and stores them. <p>
- * Has <b> OK </b> status if no exceptions were thrown and
- * names returned are not <code>null</code> values. <p>
- * The following method tests are to be completed successfully before :
- * <ul>
- * <li> <code> getUserFieldCount() </code> : to obtain number of
- * fields </li>
- * </ul>
- */
- public void _getUserFieldName() {
- requiredMethod("getUserFieldCount()");
-
- oldNames = new String[fieldCount];
-
- for (short i = 0; i < fieldCount; i++) {
- try {
- oldNames[i] = oObj.getUserFieldName(i);
- if (oldNames[i] == null) {
- tRes.tested("getUserFieldName()", false);
- return;
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- log.println("Couldn't get an user field name at " + i);
- tRes.tested("getUserFieldName()", false);
- return;
- }
- }
-
- tRes.tested("getUserFieldName()", true);
- }
-
- /**
- * For each field its name changed and the checked if it's properly
- * changed. Finally old names are restored.<p>
- * Has <b> OK </b> status if names were properly changed. <p>
- * The following method tests are to be completed successfully before :
- * <ul>
- * <li> <code> getUserFieldName() </code> : to retrieve old names </li>
- * </ul>
- */
- public void _setUserFieldName() {
- requiredMethod("getUserFieldName()");
-
- for (short i = 0; i < fieldCount; i++) {
- String newName = oldNames[i] + "_new";
-
- try {
- oObj.setUserFieldName(i, newName);
- } catch (ArrayIndexOutOfBoundsException e) {
- log.println("Couldn't set an user field name at " + i);
- tRes.tested("setUserFieldName()", false);
- return;
- }
-
- try {
- if (!newName.equals(oObj.getUserFieldName(i))) {
- tRes.tested("setUserFieldName()", false);
- return;
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- log.println("Couldn't set an user field name at " + i);
- tRes.tested("setUserFieldName()", false);
- return;
- } finally {
- try {
- oObj.setUserFieldName(i, oldNames[i]);
- } catch (ArrayIndexOutOfBoundsException e) {
- log.println("Couldn't restore an user field name at " + i);
- tRes.tested("setUserFieldName()", false);
- return;
- }
- }
- }
-
- tRes.tested("setUserFieldName()", true);
- }
-
-
- /**
- * Retrieves all user field values and stores them. <p>
- * Has <b> OK </b> status if no exceptions were thrown and
- * values returned are not <code>null</code> values. <p>
- * The following method tests are to be completed successfully before :
- * <ul>
- * <li> <code> getUserFieldCount() </code> : to obtain number of
- * fields </li>
- * </ul>
- */
- public void _getUserFieldValue() {
- requiredMethod("getUserFieldCount()");
-
- oldValues = new String[fieldCount];
-
- for (short i = 0; i < fieldCount; i++) {
- try {
- oldValues[i] = oObj.getUserFieldValue(i);
- if (oldValues[i] == null) {
- tRes.tested("getUserFieldValue()", false);
- return;
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- log.println("Couldn't get an user field value at " + i);
- tRes.tested("getUserFieldValue()", false);
- return;
- }
- }
-
- tRes.tested("getUserFieldValue()", true);
- }
-
- /**
- * For each field its value changed and the checked if it's properly
- * changed. Finally old values are restored.<p>
- * Has <b> OK </b> status if values were properly changed. <p>
- * The following method tests are to be completed successfully before :
- * <ul>
- * <li> <code> getUserFieldValue() </code> : to retrieve old values. </li>
- * </ul>
- */
- public void _setUserFieldValue() {
- requiredMethod("getUserFieldValue()");
-
- for (short i = 0; i < fieldCount; i++) {
- String newValue = oldValues[i] + "_new";
-
- try {
- oObj.setUserFieldValue(i, newValue);
- } catch (ArrayIndexOutOfBoundsException e) {
- log.println("Couldn't set an user field value at " + i);
- tRes.tested("setUserFieldValue()", false);
- return;
- }
-
- try {
- if (!newValue.equals(oObj.getUserFieldValue(i))) {
- tRes.tested("setUserFieldValue()", false);
- return;
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- log.println("Couldn't set an user field value at " + i);
- tRes.tested("setUserFieldValue()", false);
- return;
- } finally {
- try {
- oObj.setUserFieldValue(i, oldNames[i]);
- } catch (ArrayIndexOutOfBoundsException e) {
- log.println("Couldn't restore an user field value at " + i);
- tRes.tested("setUserFieldValue()", false);
- return;
- }
- }
- }
-
- tRes.tested("setUserFieldValue()", true);
- }
-
-} // finish class _XDocumentInfo
-
diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java b/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java
deleted file mode 100644
index 5810ae8..0000000
--- a/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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 .
- */
-package ifc.document;
-
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.document.XDocumentInfo;
-import com.sun.star.document.XDocumentInfoSupplier;
-import com.sun.star.uno.UnoRuntime;
-import lib.MultiMethodTest;
-
-/**
- * test the XDocumentInfoSupplier interface.
- */
-public class _XDocumentInfoSupplier extends MultiMethodTest {
- public XDocumentInfoSupplier oObj = null;
-
- public void _getDocumentInfo() {
- // returns a com.sun.star.document.DocumentInfo
- XDocumentInfo info = oObj.getDocumentInfo();
- XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, info);
- String title = null;
- try {
- title = (String)xPropertySet.getPropertyValue("Title");
- }
- catch(Exception e) {
- e.printStackTrace(log);
- title = null;
- }
- log.println("Got document title: " + title);
- tRes.tested("getDocumentInfo()", title != null);
- }
-}
diff --git a/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java b/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java
deleted file mode 100644
index 88f60d4..0000000
--- a/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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 .
- */
-
-package ifc.document;
-
-import lib.MultiMethodTest;
-import lib.Status;
-import lib.StatusException;
-
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.document.XStandaloneDocumentInfo;
-import com.sun.star.io.IOException;
-import com.sun.star.uno.UnoRuntime;
-
-/**
-* Testing <code>com.sun.star.document.XStandaloneDocumentInfo</code>
-* interface methods. <p>
-* This test needs the following object relations :
-* <ul>
-* <li> <code>'DOCURL'</code> (of type <code>String</code>):
-* URL of document which info is loaded.</li>
-* <ul> <p>
-* Test is <b> NOT </b> multithread compilant. <p>
-* @see com.sun.star.document.XStandaloneDocumentInfo
-*/
-public class _XStandaloneDocumentInfo extends MultiMethodTest {
-
- public XStandaloneDocumentInfo oObj = null;
- String url = null;
-
- protected void before() {
- url = (String)tEnv.getObjRelation("DOCURL");
- if (url == null) {
- throw new StatusException
- (Status.failed("Relation 'DOCURL' not found"));
- }
- }
-
- String oldProp = null;
- String newProp = null;
- /**
- * Sets new value of the property 'Author' and calls the method. <p>
- * Has <b> OK </b> status if no exception occurred.
- */
- public void _storeIntoURL() {
- try {
- oObj.loadFromURL(url);
- XPropertySet propSet = UnoRuntime.queryInterface(XPropertySet.class, oObj);
- oldProp = (String)propSet.getPropertyValue("Author");
- newProp = oldProp + "_";
- propSet.setPropertyValue("Author", newProp);
-
- oObj.storeIntoURL(url);
- tRes.tested("storeIntoURL()", true);
- } catch (IOException e) {
- log.println("Couldn't store to " + url
- + " : " + e.getMessage());
- e.printStackTrace(log);
- tRes.tested("storeIntoURL()", false);
- } catch(com.sun.star.lang.WrappedTargetException e) {
- log.println("Couldn't get/set property 'Author':" + e);
- tRes.tested("storeIntoURL()", false);
- } catch(com.sun.star.beans.UnknownPropertyException e) {
- log.println("Couldn't get/set property 'Author':" + e);
- tRes.tested("storeIntoURL()", false);
- } catch(com.sun.star.lang.IllegalArgumentException e) {
- log.println("Couldn't get/set property 'Author':" + e);
- tRes.tested("storeIntoURL()", false);
- } catch(com.sun.star.beans.PropertyVetoException e) {
- log.println("Couldn't get/set property 'Author':" + e);
- tRes.tested("storeIntoURL()", false);
- }
- }
-
- /**
- * Calls the method and checks value of the property 'Author'. <p>
- * Has <b> OK </b> status if no exception occurred and value of the property
- * 'Author' is equal to value that was set in the method
- * <code>storeIntoURL</code>.
- */
- public void _loadFromURL() {
- requiredMethod("storeIntoURL()");
- try {
- oObj.loadFromURL(url);
- XPropertySet propSet = UnoRuntime.queryInterface(XPropertySet.class, oObj);
- String resProp = (String)propSet.getPropertyValue("Author");
- log.println("Was: '" + oldProp + "',Set: '" + newProp +
- "', New: " + resProp + "'");
- tRes.tested("loadFromURL()", resProp.equals(newProp) );
- } catch (IOException e) {
- log.println("Couldn't load from " + url
- + " : " + e.getMessage());
- e.printStackTrace(log);
- tRes.tested("loadFromURL()", false);
- } catch(com.sun.star.lang.WrappedTargetException e) {
- log.println("Couldn't get/set property 'Author':" + e);
- tRes.tested("loadFromURL()", false);
- } catch(com.sun.star.beans.UnknownPropertyException e) {
- log.println("Couldn't get/set property 'Author':" + e);
- tRes.tested("loadFromURL()", false);
- }
- }
-
-} // finish class _XStandaloneDocumentInfo
-
diff --git a/qadevOOo/tests/java/mod/_fwk/DocumentProperties.java b/qadevOOo/tests/java/mod/_fwk/DocumentProperties.java
deleted file mode 100644
index 97ebe69..0000000
--- a/qadevOOo/tests/java/mod/_fwk/DocumentProperties.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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 .
- */
-
-package mod._fwk;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.document.XDocumentInfoSupplier;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.document.DocumentInfo</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li><code>com::sun::star::beans::XFastPropertySet</code></li>
-* <li><code>com::sun::star::beans::XPropertySet</code></li>
-* <li><code>com::sun::star::document::XDocumentInfo</code></li>
-* <li><code>com::sun::star::document::XStandaloneDocumentInfo</code></li>
-* <li><code>com::sun::star::lang::XComponent</code></li>
-* </ul><p>
-* @see com.sun.star.beans.XFastPropertySet
-* @see com.sun.star.beans.XPropertySet
-* @see com.sun.star.document.XDocumentInfo
-* @see com.sun.star.document.XStandaloneDocumentInfo
-* @see com.sun.star.lang.XComponent
-* @see ifc.beans._XFastPropertySet
-* @see ifc.beans._XPropertySet
-* @see ifc.document._XDocumentInfo
-* @see ifc.document._XStandaloneDocumentInfo
-* @see ifc.lang._XComponent
-*/
-public class DocumentProperties extends TestCase {
-
- XTextDocument xTextDoc;
-
- /**
- * Disposes the document, if exists, created in
- * <code>createTestEnvironment</code> method.
- */
- protected void cleanup( TestParameters Param, PrintWriter log) {
-
- log.println("disposing xTextDoc");
-
- if (xTextDoc != null) {
- xTextDoc.dispose();
- }
- }
-
- /**
- * Creates a text document.
- * Obtains the property <code>'DocumentInfo'</code> of the created document.
- */
- public TestEnvironment createTestEnvironment( TestParameters Param,
- PrintWriter log ) throws StatusException {
-
- XInterface oObj = null;
-
- log.println( "creating a test environment" );
-
- if (xTextDoc != null) xTextDoc.dispose();
-
- // get a soffice factory object
- SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF());
-
- try {
- log.println( "creating a text document" );
- xTextDoc = SOF.createTextDoc(null);
- } catch ( com.sun.star.uno.Exception e ) {
- // Some exception occures.FAILED
- e.printStackTrace( log );
- throw new StatusException( "Couldn't create document", e );
- }
-
- shortWait();
-
- XDocumentInfoSupplier xdis = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDoc);
- //oObj = (XInterface)UnoRuntime.queryInterface(XInterface.class, docInfo);
- oObj = xdis.getDocumentInfo();
- TestEnvironment tEnv = new TestEnvironment( oObj );
-
- return tEnv;
- } // finish method getTestEnvironment
-
- /**
- * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(500) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-}
diff --git a/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java b/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java
deleted file mode 100644
index f3ec7a1..0000000
--- a/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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 .
- */
-
-package mod._sfx;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.utils;
-
-import com.sun.star.document.XStandaloneDocumentInfo;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
- * Test for object which is represented by service
- * <code>com.sun.star.document.StandaloneDocumentInfo</code>. <p>
- * Object implements the following interfaces :
- * <ul>
- * <li> <code>com::sun::star::lang::XComponent</code></li>
- * <li> <code>com::sun::star::document::DocumentInfo</code></li>
- * <li> <code>com::sun::star::document::XDocumentInfo</code></li>
- * <li> <code>com::sun::star::document::XStandaloneDocumentInfo</code></li>
- * <li> <code>com::sun::star::beans::XFastPropertySet</code></li>
- * <li> <code>com::sun::star::beans::XPropertySet</code></li>
- * </ul> <p>
- * The following files used by this test :
- * <ul>
- * <li><b> SfxStandaloneDocInfoObject.sdw </b> : is copied
- * to SOffice temporary directory and is used to load and
- * save its info. </li>
- * </ul> <p>
- * This object test <b> is NOT </b> designed to be run in several
- * threads concurently.
- *
- * @see com.sun.star.lang.XComponent
- * @see com.sun.star.document.DocumentInfo
- * @see com.sun.star.document.XDocumentInfo
- * @see com.sun.star.document.XStandaloneDocumentInfo
- * @see com.sun.star.beans.XFastPropertySet
- * @see com.sun.star.beans.XPropertySet
- * @see ifc.lang._XComponent
- * @see ifc.document._DocumentInfo
- * @see ifc.document._XDocumentInfo
- * @see ifc.document._XStandaloneDocumentInfo
- * @see ifc.beans._XFastPropertySet
- * @see ifc.beans._XPropertySet
- */
-public class StandaloneDocumentInfo extends TestCase {
-
- String destUrl = null ;
-
- /**
- * Copies file 'SfxStandaloneDocInfoObject.sdw' to tempopary
- * location (overwriting the old file if exists).
- */
- protected void initialize( TestParameters tParam, PrintWriter log ) {
- String srcUrl = utils.getFullTestURL("SfxStandaloneDocInfoObject.sdw") ;
- destUrl = utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) +
- "SfxStandaloneDocInfoObject.sdw";
-
- utils.doOverwriteFile((XMultiServiceFactory)tParam.getMSF(), srcUrl, destUrl) ;
- }
-
- /**
- * Creating a Testenvironment for the interfaces to be tested.
- * Creates an instance of the service
- * <code>com.sun.star.document.StandaloneDocumentInfo</code>.
- * Object relations created :
- * <ul>
- * <li> <code>'DOCURL'</code> for
- * {@link ifc.document._XStandaloneDocumentInfo} :
- * the Writer file URL in temporary location. </li>
- * </ul>
- */
- protected TestEnvironment createTestEnvironment
- (TestParameters tParam, PrintWriter log) {
- XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
- XInterface oObj = null;
-
- try {
- oObj = (XInterface)xMSF.createInstance
- ("com.sun.star.document.StandaloneDocumentInfo");
- } catch (com.sun.star.uno.Exception e) {
- e.printStackTrace(log);
- throw new StatusException("Unexpected exception", e);
- }
-
- String Iname = util.utils.getImplName(oObj);
- log.println("Implementation Name: "+Iname);
- TestEnvironment tEnv = new TestEnvironment(oObj);
- XStandaloneDocumentInfo the_info = UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oObj);
- try {
- the_info.loadFromURL(destUrl);
- } catch (com.sun.star.io.IOException e) {
- e.printStackTrace(log);
- throw new StatusException("Couldn't load document: " + destUrl,e);
- }
- tEnv.addObjRelation("DOCURL",destUrl);
- return tEnv;
- }
-
-} // finish class TestCase
-
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index abe3616..cb77929 100644
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -34,17 +34,12 @@ $(eval $(call gb_JunitTest_use_jars,sfx2_complex,\
))
$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\
- sfx2/qa/complex/sfx2/DocumentInfo \
sfx2/qa/complex/sfx2/DocumentMetadataAccess \
sfx2/qa/complex/sfx2/DocumentProperties \
sfx2/qa/complex/sfx2/GlobalEventBroadcaster \
- sfx2/qa/complex/sfx2/StandaloneDocumentInfo \
sfx2/qa/complex/sfx2/UndoManager \
sfx2/qa/complex/sfx2/JUnitBasedTest \
sfx2/qa/complex/sfx2/DocumentEvents \
- sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest \
- sfx2/qa/complex/sfx2/standalonedocinfo/Test01 \
- sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper \
sfx2/qa/complex/sfx2/tools/DialogThread \
sfx2/qa/complex/sfx2/tools/TestDocument \
sfx2/qa/complex/sfx2/tools/WriterHelper \
@@ -59,7 +54,6 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\
))
$(eval $(call gb_JunitTest_add_classes,sfx2_complex,\
- complex.sfx2.DocumentInfo \
complex.sfx2.DocumentProperties \
complex.sfx2.DocumentMetadataAccess \
complex.sfx2.DocumentEvents \
@@ -69,7 +63,5 @@ $(eval $(call gb_JunitTest_add_classes,sfx2_complex,\
# complex.sfx2.UndoManager \
# #i115674# fails currently: misses some OnUnfocus event
# complex.sfx2.GlobalEventBroadcaster \
-# breaks because binfilter export has been removed
-# complex.sfx2.StandaloneDocumentInfo \
# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 8a12ad9..6cc8a1d 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -206,7 +206,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/doc/objmisc \
sfx2/source/doc/objserv \
sfx2/source/doc/objstor \
- sfx2/source/doc/objuno \
sfx2/source/doc/objxtor \
sfx2/source/doc/oleprops \
sfx2/source/doc/ownsubfilterservice \
diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx
deleted file mode 100644
index 3e18ad6..0000000
--- 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 49e4dca..486426a 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()
diff --git a/sfx2/qa/complex/sfx2/DocumentInfo.java b/sfx2/qa/complex/sfx2/DocumentInfo.java
deleted file mode 100644
index 1532a3c..0000000
--- a/sfx2/qa/complex/sfx2/DocumentInfo.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * 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 .
- */
-package complex.sfx2;
-
-import com.sun.star.beans.PropertyAttribute;
-import com.sun.star.beans.Property;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertyContainer;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.beans.XPropertySetInfo;
-import com.sun.star.document.XDocumentInfo;
-import com.sun.star.document.XDocumentInfoSupplier;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.frame.XStorable;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.Date;
-
-
-
-import util.DesktopTools;
-import util.WriterTools;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-public class DocumentInfo
-{
- XMultiServiceFactory m_xMSF = null;
- XTextDocument xTextDoc = null;
- XTextDocument xTextDocSecond = null;
-
- @Test public void checkDocInfo() throws Exception
- {
- m_xMSF = getMSF();
-
- System.out.println("check whether there is a valid MultiServiceFactory");
-
- assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF);
-
- String tempdir = util.utils.getOfficeTemp/*Dir*/(m_xMSF);
- String fs = System.getProperty("file.separator");
-
- if (!tempdir.endsWith(fs))
- {
- tempdir += fs;
- }
- tempdir = util.utils.getFullURL(tempdir);
- final String sTempDocument = tempdir + "DocInfo.oot";
-
- if (true)
- {
- System.out.println("... done");
-
-
- System.out.println("Opening a Writer document");
- xTextDoc = WriterTools.createTextDoc(m_xMSF);
- System.out.println("... done");
-
- XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDoc);
- XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo();
- XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo);
-
- System.out.println("Trying to add a existing property");
-
- boolean worked = addProperty(xPropContainer, "Author", (short) 0, "");
- assertTrue("Could set an existing property", !worked);
- System.out.println("...done");
-
- System.out.println("Trying to add a integer property");
- worked = addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, new Integer(17));
- assertTrue("Couldn't set an integer property", worked);
- System.out.println("...done");
-
- System.out.println("Trying to add a double property");
- worked = addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Double(17.7));
- assertTrue("Couldn't set an double property", worked);
- System.out.println("...done");
-
- System.out.println("Trying to add a boolean property");
- worked = addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, Boolean.TRUE);
- assertTrue("Couldn't set an boolean property", worked);
- System.out.println("...done");
-
- System.out.println("Trying to add a date property");
- worked = addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Date());
- assertTrue("Couldn't set an date property", worked);
- System.out.println("...done");
-
- System.out.println("trying to remove a read only Property");
- try
- {
- xPropContainer.removeProperty("intValue");
- fail("Could remove read only property");
- }
- catch (Exception e)
- {
- System.out.println("\tException was thrown " + e);
- System.out.println("\t...OK");
- }
- System.out.println("...done");
-
- XPropertySet xProps2 = UnoRuntime.queryInterface(XPropertySet.class, xPropContainer);
- showPropertySet(xProps2);
-
-
- System.out.println("Storing the document");
- XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc);
- store.storeToURL(sTempDocument, new PropertyValue[] {});
- DesktopTools.closeDoc(xTextDoc);
-
- System.out.println("...done");
- }
-
-
- if (true)
- {
- System.out.println("loading the document");
-
- XComponentLoader xCL = UnoRuntime.queryInterface(XComponentLoader.class, m_xMSF.createInstance("com.sun.star.frame.Desktop"));
- XComponent xComp = xCL.loadComponentFromURL(sTempDocument, "_blank", 0, new PropertyValue[] {});
- xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class, xComp);
-
- System.out.println("...done");
-
- XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocSecond);
- XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo();
- XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo);
-
- XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xDocInfo);
- showPropertySet(xProps);
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list