dba33b: merge

4 files changed, 162 insertions, 0 deletions

diff --git a/offapi/com/sun/star/frame/XSessionManagerListener2.idl b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
new file mode 100644
index 000000000000..51e8643e459a
--- /dev/null
+++ b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * 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: XSessionManagerListener.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_frame_XSessionManagerListener2_idl__
+#define __com_sun_star_frame_XSessionManagerListener2_idl__
+
+#ifndef __com_sun_star_lang_XEventListener_idl__
+#include <com/sun/star/lang/XEventListener.idl>
+#endif
+
+#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
+#include <com/sun/star/frame/XSessionManagerListener.idl>
+#endif
+//=============================================================================
+
+module com {  module sun {  module star {  module frame {
+
+    interface XSessionManagerListener2 : XSessionManagerListener
+    {
+        /** doQuit gets called when the session manager has decided
+        the application should quit. Under these circumstances bringing up
+        further UI will usually be impossible and must be avoided.
+        */
+        [oneway] void doQuit();
+    };
+
+}; }; }; };
+
+
+#endif
diff --git a/offapi/com/sun/star/frame/makefile.mk b/offapi/com/sun/star/frame/makefile.mk
index 789a0f6e499e..0d0650a701fb 100644
--- a/offapi/com/sun/star/frame/makefile.mk
+++ b/offapi/com/sun/star/frame/makefile.mk
@@ -142,6 +142,7 @@ IDLFILES=\
     XRecordableDispatch.idl\
     XSessionManagerClient.idl\
     XSessionManagerListener.idl\
+    XSessionManagerListener2.idl\
     XStatusListener.idl\
     XStatusbarController.idl\
     XStorable.idl\
diff --git a/offapi/com/sun/star/util/Duration.idl b/offapi/com/sun/star/util/Duration.idl
new file mode 100644
index 000000000000..39f3ca8114ce
--- /dev/null
+++ b/offapi/com/sun/star/util/Duration.idl
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * 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: DateTime.idl,v $
+ * $Revision: 1.7 $
+ *
+ * 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_util_Duration_idl__
+#define __com_sun_star_util_Duration_idl__
+
+
+//========================================================================
+
+module com {  module sun {  module star {  module util {
+
+//========================================================================
+
+/** represents a duration.
+
+    <p>
+    A duration is the difference of 2 <type>DateTime</type>s.
+    </p>
+
+    <p>
+    Note that there are no constraints on the ranges of the members,
+    except that every member must be non-negative:
+    for example, a Duration of 400 Days is valid.
+    </p>
+
+    @since OOo 3.3
+ */
+struct Duration
+{
+    //--------------------------------------------------------------------
+    /** explicit sign bit.
+     */
+    boolean Negative;
+
+    //--------------------------------------------------------------------
+    /** contains the years.
+     */
+    unsigned short Years;
+
+    //--------------------------------------------------------------------
+    /** contains the months.
+     */
+    unsigned short Months;
+
+    //--------------------------------------------------------------------
+    /** contains the days.
+     */
+    unsigned short Days;
+
+    //--------------------------------------------------------------------
+    /** contains the hours.
+     */
+    unsigned short Hours;
+
+    //--------------------------------------------------------------------
+    /** contains the minutes.
+     */
+    unsigned short Minutes;
+
+    //--------------------------------------------------------------------
+    /** contains the seconds.
+     */
+    unsigned short Seconds;
+
+    //--------------------------------------------------------------------
+    /** contains the hundredth seconds.
+     */
+    unsigned short HundredthSeconds;
+
+};
+
+//========================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/makefile.mk b/offapi/com/sun/star/util/makefile.mk
index 44fbdf9065b2..e5f9aab136c3 100644
--- a/offapi/com/sun/star/util/makefile.mk
+++ b/offapi/com/sun/star/util/makefile.mk
@@ -53,6 +53,7 @@ IDLFILES=\
     DateTime.idl\
     DateTimeRange.idl\
     DiskFullException.idl\
+    Duration.idl\
     ElementChange.idl \
     Endianness.idl \
     FileIOException.idl\