CWS-TOOLING: integrate CWS impressnotes01

2009-09-11 13:52:41 +0200 cl  r276061 : CWS-TOOLING: rebase CWS impressnotes01 to trunk@276043 (milestone: DEV300:m58)
2009-09-10 15:44:57 +0200 cl  r276039 : #i103139# continued work on the impress annotation feature
2009-09-10 14:52:31 +0200 cl  r276032 : #i103139# continued work on the impress annotation feature
2009-09-10 14:50:32 +0200 cl  r276031 : #i103139# continued work on the impress annotation feature
2009-09-10 14:48:29 +0200 cl  r276030 : #i103139# continued work on the impress annotation feature
2009-09-10 11:36:11 +0200 cl  r276027 : #i103139# continued work on the impress annotation feature
2009-09-09 20:22:41 +0200 cl  r276018 : #i103139# continued work on the impress annotation feature
2009-09-09 20:21:45 +0200 cl  r276017 : #i103139# continued work on the impress annotation feature
2009-09-09 19:32:29 +0200 sj  r276015 : #i103139# added import of comments (ppt binary)
2009-09-09 19:31:07 +0200 sj  r276014 : #i103139# added import of comments (ppt binary)
2009-09-09 19:16:41 +0200 cl  r276011 : #i103139# continued work on the impress annotation feature
2009-09-09 19:15:19 +0200 cl  r276010 : #i103139# continued work on the impress annotation feature
2009-09-09 16:27:19 +0200 cl  r276001 : #i104579# fixed isEmptyPresObj()
2009-09-09 15:12:02 +0200 cl  r275997 : #i103139# continued work on the impress annotation feature
2009-09-09 15:06:29 +0200 sj  r275996 : #i103139# added import of comments (ppt binary)
2009-09-09 14:53:01 +0200 cl  r275995 : #i103139# continued work on the impress annotation feature
2009-09-09 14:51:32 +0200 cl  r275994 : #i103139# continued work on the impress annotation feature
2009-09-09 12:11:17 +0200 cl  r275982 : #i103139# continued work on the impress annotation feature
2009-09-09 11:47:55 +0200 cl  r275981 : #i103139# continued work on the impress annotation feature
2009-09-09 11:47:23 +0200 cl  r275980 : #i103139# continued work on the impress annotation feature
2009-09-09 11:44:47 +0200 cl  r275978 : #i104315# added missing tab pages
2009-09-08 16:04:44 +0200 cl  r275936 : #i103139# continued work on the impress annotation feature
2009-09-08 16:03:28 +0200 cl  r275935 : #i103139# continued work on the impress annotation feature
2009-09-08 11:45:47 +0200 cl  r275920 : #i103139# continued work on the impress annotation feature
2009-09-08 11:41:51 +0200 cl  r275919 : #i103139# continued work on the impress annotation feature
2009-09-07 18:30:55 +0200 cl  r275910 : #i103139# continued work on the impress annotation feature
2009-09-07 18:29:37 +0200 cl  r275909 : #i103139# continued work on the impress annotation feature
2009-09-07 17:25:43 +0200 cl  r275905 : #i103139# continued work on the impress annotation feature
2009-09-07 12:00:28 +0200 cl  r275884 : #i103139# continued work on the impress annotation feature
2009-09-06 14:14:00 +0200 cl  r275859 : #i103139# continued work on the impress annotation feature
2009-09-05 20:57:24 +0200 cl  r275854 : #i103139# continued work on the impress annotation feature
2009-09-05 20:56:29 +0200 cl  r275853 : #i103139# continued work on the impress annotation feature
2009-09-05 20:55:27 +0200 cl  r275852 : #i103139# continued work on the impress annotation feature
2009-09-05 20:11:42 +0200 cl  r275851 : #i103139# continued work on the impress annotation feature
2009-09-05 20:11:09 +0200 cl  r275850 : #i103139# continued work on the impress annotation feature
2009-09-05 17:43:33 +0200 cl  r275845 : #i103139# continued work on the impress annotation feature
2009-09-05 17:04:41 +0200 cl  r275843 : #i103139# continued work on the impress annotation feature
2009-09-05 17:03:26 +0200 cl  r275842 : #i103139# continued work on the impress annotation feature
2009-09-05 17:02:53 +0200 cl  r275841 : #i103139# continued work on the impress annotation feature
2009-09-05 13:15:04 +0200 pl  r275839 : #i104823# WB_NEEDSFOCUS
2009-09-05 13:14:41 +0200 pl  r275838 : #i104823# WB_NEEDSFOCUS
2009-09-04 17:48:21 +0200 cl  r275826 : #i103139# continued work on the impress annotation feature
2009-09-04 17:35:03 +0200 cl  r275825 : #i103139# continued work on the impress annotation feature
2009-09-04 17:15:46 +0200 cl  r275824 : #i103139# continued work on the impress annotation feature
2009-09-04 17:12:54 +0200 cl  r275823 : #i103139# continued work on the impress annotation feature
2009-09-04 17:05:23 +0200 cl  r275822 : #i103139# continued work on the impress annotation feature
2009-09-04 16:48:28 +0200 cl  r275820 : #i103139# continued work on the impress annotation feature
2009-09-04 16:44:02 +0200 cl  r275818 : #i103139# continued work on the impress annotation feature
2009-09-04 16:43:23 +0200 cl  r275817 : #i103139# continued work on the impress annotation feature
2009-09-04 16:06:04 +0200 cl  r275812 : #i103139# continued work on the impress annotation feature
2009-09-04 16:05:45 +0200 cl  r275811 : #i103139# continued work on the impress annotation feature
2009-09-04 15:04:33 +0200 cl  r275806 : #i103139# continued work on the impress annotation feature
2009-09-04 11:43:14 +0200 cl  r275795 : #i103139# continued work on the impress annotation feature
2009-09-04 11:27:10 +0200 cl  r275793 : #i103139# continued work on the impress annotation feature
2009-09-04 11:10:02 +0200 cl  r275792 : #i103139# continued work on the impress annotation feature
2009-09-04 11:07:05 +0200 cl  r275790 : #i103139# continued work on the impress annotation feature
2009-09-04 11:05:01 +0200 cl  r275789 : #i103139# continued work on the impress annotation feature
2009-09-04 10:55:51 +0200 cl  r275785 : #i103139# renamed notes to comments
2009-09-04 10:54:57 +0200 cl  r275784 : #i103139# renamed notes to comments
2009-09-03 20:37:35 +0200 cl  r275772 : #i103139# continued work on the impress annotation feature
2009-09-03 20:35:31 +0200 cl  r275771 : #i103139# continued work on the impress annotation feature
2009-09-01 18:17:55 +0200 cl  r275680 : #i103139# continued work on the impress annotation feature
2009-09-01 18:15:08 +0200 cl  r275678 : #i103139# continued work on the impress annotation feature
2009-09-01 18:13:38 +0200 cl  r275677 : #i103139#
continued work on the impress annotation feature
2009-08-18 12:35:42 +0200 cl  r275089 : fixed merge error
2009-08-18 11:39:58 +0200 cl  r275086 : CWS-TOOLING: rebase CWS impressnotes01 to trunk@275001 (milestone: DEV300:m55)
2009-07-30 13:45:10 +0200 cl  r274481 : fixed merge errrors
2009-07-30 13:41:21 +0200 cl  r274480 : fixed merge errrors
2009-07-30 13:39:40 +0200 cl  r274478 : fixed merge errrors
2009-07-22 18:07:30 +0200 cl  r274256 : CWS-TOOLING: rebase CWS impressnotes01 to trunk@273858 (milestone: DEV300:m52)
2009-07-21 17:21:31 +0200 cl  r274208 : merging
2009-07-20 14:28:34 +0200 cl  r274137 : #i103139# annotation support for impress
2009-07-20 14:28:04 +0200 cl  r274136 : #i103139# annotation support for impress
2009-07-20 14:27:20 +0200 cl  r274135 : #i103139# annotation support for impress
2009-07-20 14:21:17 +0200 cl  r274134 : #i103139# annotation support for impress
2009-07-20 14:20:56 +0200 cl  r274133 : #i103139# annotation support for impress
2009-07-20 14:20:09 +0200 cl  r274132 : #i103139# annotation support for impress
2009-07-20 14:19:00 +0200 cl  r274131 : #i103139# annotation support for impress
2009-07-20 14:17:50 +0200 cl  r274130 : #i103139# annotation support for impress
2009-07-20 14:12:24 +0200 cl  r274129 : #i103139# annotation support for impress
2009-07-20 13:52:03 +0200 cl  r274128 : #i103139# annotation support for impress
2009-07-20 13:51:11 +0200 cl  r274127 : #i103139# annotation support for impress
2009-07-20 13:48:59 +0200 cl  r274126 : #i103139# annotation support for impress
2009-07-20 13:43:56 +0200 cl  r274125 : #i103139# annotation support for impress
2009-07-20 13:31:55 +0200 cl  r274123 : #i103139# annotation support for impress
2009-07-20 13:30:45 +0200 cl  r274122 : #i103139# annotation support for impress

8 files changed, 314 insertions, 2 deletions

diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index 4a0f4efcd12c..d91c8edad1ff 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -90,6 +90,9 @@ module datatransfer {};
 /// Office document related interfaces.
 module document {};
 
+/// Office document content related interfaces.
+module office {};
+
 /// Drawing and shape specific interfaces.
 module drawing {};
 
diff --git a/offapi/com/sun/star/office/XAnnotation.idl b/offapi/com/sun/star/office/XAnnotation.idl
new file mode 100644
index 000000000000..ff7c4127bb82
--- /dev/null
+++ b/offapi/com/sun/star/office/XAnnotation.idl
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XGalleryItem.idl,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_office_XAnnotation_idl__
+#define __com_sun_star_office_XAnnotation_idl__
+
+#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/beans/XPropertySet.idl>
+#endif
+
+#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
+#include <com/sun/star/beans/XMultiPropertySet.idl>
+#endif
+
+#ifndef __com_sun_star_util_DateTime_idl__
+#include <com/sun/star/util/DateTime.idl>
+#endif
+
+#ifndef __com_sun_star_text_XText_idl__
+#include <com/sun/star/text/XText.idl>
+#endif
+
+#ifndef __com_sun_star_geometry_RealPoint2D_idl__
+#include <com/sun/star/geometry/RealPoint2D.idl>
+#endif
+
+#ifndef __com_sun_star_geometry_RealSize2D_idl__
+#include <com/sun/star/geometry/RealSize2D.idl>
+#endif
+
+#ifndef __com_sun_star_lang_XComponent_idl__
+#include <com/sun/star/lang/XComponent.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module office {
+
+//=============================================================================
+
+/** This interface gives access to an annotation inside a document.
+ */
+interface XAnnotation
+{
+    /** All attributes are also available as properties. */
+    interface ::com::sun::star::beans::XPropertySet;
+
+    /** manages the lifetime of this annotation, should only be used
+        by the owner of the annotation which should be the document itself. */
+    interface ::com::sun::star::lang::XComponent;
+
+    /** a reference to the document content this annotation is anchored to. */
+    [attribute, readonly] any Anchor;
+
+    /** this is an optional position that gives the user interface a hint where
+        the annotation should be rendered. This could be an offset to the
+        annotations anchor. */
+    [attribute] ::com::sun::star::geometry::RealPoint2D Position;
+
+    /** this is an optional size that gives the user interface a hint how
+        large the annotation should be rendered. */
+    [attribute] ::com::sun::star::geometry::RealSize2D Size;
+
+    /** stores the full name of the author who created this annotation. */
+    [attribute] string Author;
+
+    /** stores the date and time this annotation was last edited. */
+    [attribute] ::com::sun::star::util::DateTime DateTime;
+
+    /** gives access to the annotations text. */
+    [attribute, readonly] ::com::sun::star::text::XText TextRange;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/office/XAnnotationAccess.idl b/offapi/com/sun/star/office/XAnnotationAccess.idl
new file mode 100644
index 000000000000..074312ef6fec
--- /dev/null
+++ b/offapi/com/sun/star/office/XAnnotationAccess.idl
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XGalleryItem.idl,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_office_XAnnotationAccess_idl__
+#define __com_sun_star_office_XAnnotationAccess_idl__
+
+#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
+#include <com/sun/star/office/XAnnotationEnumeration.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/office/IllegalArgumentException.idl>
+#endif
+
+#ifndef __com_sun_star_office_XAnnotation_idl__
+#include <com/sun/star/office/XAnnotation.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module office {
+
+//=============================================================================
+
+/** This interface gives access to the annotation for a document content.
+ */
+interface XAnnotationAccess
+{
+    /** creates a new annotation and inserts it into the document content.
+    */
+    XAnnotation createAndInsertAnnotation();
+
+    /** removes the annotation from this document content.
+    */
+    void removeAnnotation( [in] XAnnotation annotation ) raises ( com::sun::star::lang::IllegalArgumentException );
+
+    /** @returns
+            a new enumeration object for this annotation container.
+            It returns NULL if there are no objects in this container.
+     */
+    XAnnotationEnumeration createAnnotationEnumeration();
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/office/XAnnotationEnumeration.idl b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
new file mode 100644
index 000000000000..e81666e0b698
--- /dev/null
+++ b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XEnumeration.idl,v $
+ * $Revision: 1.12 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
+#define __com_sun_star_office_XAnnotationEnumeration_idl__
+
+#ifndef __com_sun_star_office_XAnnotation_idl__
+#include <com/sun/star/office/XAnnotation.idl>
+#endif
+
+#ifndef __com_sun_star_container_NoSuchElementException_idl__
+#include <com/sun/star/container/NoSuchElementException.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module office {
+
+//=============================================================================
+
+/** An enumeration for a set of annotations.
+ */
+interface XAnnotationEnumeration
+{
+    //-------------------------------------------------------------------------
+
+    /** tests whether this enumeration contains more elements.
+     */
+    boolean hasMoreElements();
+
+    //-------------------------------------------------------------------------
+
+    /** @returns
+            the next element of this enumeration.
+
+        @throws  NoSuchElementException
+            if no more elements exist.
+    */
+    XAnnotation nextElement()
+            raises( com::sun::star::container::NoSuchElementException );
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/office/makefile.mk b/offapi/com/sun/star/office/makefile.mk
new file mode 100644
index 000000000000..404c23c45e32
--- /dev/null
+++ b/offapi/com/sun/star/office/makefile.mk
@@ -0,0 +1,51 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.5 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..$/..
+PRJNAME=offapi
+TARGET=cssoffice
+PACKAGE=com$/sun$/star$/office
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# ------------------------------------------------------------------------
+
+IDLFILES=\
+    XAnnotation.idl\
+    XAnnotationEnumeration.idl\
+    XAnnotationAccess.idl
+
+# ------------------------------------------------------------------
+
+.INCLUDE :  target.mk
+.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 6b4a0b95a054..6ddea0190596 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -103,5 +103,6 @@ oa	offapi\com\sun\star\xml\wrapper		    nmake	-	all	oa_wrapper oa_sax NULL
 oa	offapi\com\sun\star\geometry		    nmake	-	all	oa_geometry NULL
 oa	offapi\com\sun\star\rendering	        nmake	-	all oa_rendering oa_geometry NULL
 oa	offapi\com\sun\star\rdf	                nmake	-	all oa_rdf  oa_datatransfer oa_text NULL
+oa	offapi\com\sun\star\office              nmake	-	all oa_office oa_text NULL

 oa	offapi\drafts\com\sun\star\form         nmake	-	all	oa_drafts_form NULL
-oa  offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement NULL
+oa  offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement oa_office NULL
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index fcf3e4bd6c02..b0fa7a30cf46 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -144,6 +144,7 @@ UNOIDLDBFILES= \
     $(UCR)$/cssreport.db \
     $(UCR)$/cssrptins.db \
     $(UCR)$/cssrptmeta.db \
+    $(UCR)$/cssoffice.db \
     $(UCR)$/cssrdf.db
 
 
diff --git a/offuh/prj/d.lst b/offuh/prj/d.lst
index 0e85b261e8e2..bedbc8d112d4 100644
--- a/offuh/prj/d.lst
+++ b/offuh/prj/d.lst
@@ -51,6 +51,7 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\lang
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\logging
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement
+mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\office
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\mail
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\media
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\packages
@@ -226,6 +227,8 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf
 ..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\logging\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\logging\*.hdl
 ..\%__SRC%\inc\offuh\com\sun\star\logging\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\logging\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\office\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hpp

+..\%__SRC%\inc\offuh\com\sun\star\office\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hdl

 ..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement\*.hdl
 ..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\mail\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\mail\*.hpp
@@ -371,4 +374,3 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf
 
 ..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf\*.hdl
-