[ooo-build-commit] Branch 'ooo/master' - 8 commits - bridges/source cppuhelper/source cppu/prj cppu/source cppu/util offapi/com offapi/prj offapi/util offuh/prj sal/systools sal/util ure/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Aug 27 20:03:51 PDT 2009


 bridges/source/cpp_uno/mingw_intel/except.cxx           |    1 
 bridges/source/cpp_uno/mingw_intel/makefile.mk          |    6 
 bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx          |    4 
 bridges/source/jni_uno/jni_java2uno.cxx                 |    4 
 bridges/source/jni_uno/jni_uno2java.cxx                 |    4 
 bridges/source/jni_uno/makefile.mk                      |    6 
 cppu/prj/build.lst                                      |    3 
 cppu/prj/d.lst                                          |    3 
 cppu/source/LogBridge/LogBridge.cxx                     |  280 ++++++++++++++++
 cppu/source/LogBridge/makefile.mk                       |   48 ++
 cppu/util/extra.mk                                      |   15 
 cppuhelper/source/shlib.cxx                             |   19 +
 offapi/com/sun/star/accessibility/AccessibleEventId.idl |   34 +
 offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl |   54 +++
 offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl   |   54 +++
 offapi/com/sun/star/awt/grid/GridColumn.idl             |   54 +++
 offapi/com/sun/star/awt/grid/GridColumnEvent.idl        |   79 ++++
 offapi/com/sun/star/awt/grid/GridControlEvent.idl       |   57 +++
 offapi/com/sun/star/awt/grid/GridDataEvent.idl          |   82 ++++
 offapi/com/sun/star/awt/grid/GridSelectionEvent.idl     |   71 ++++
 offapi/com/sun/star/awt/grid/ScrollBarMode.idl          |   73 ++++
 offapi/com/sun/star/awt/grid/SelectionEventType.idl     |   63 +++
 offapi/com/sun/star/awt/grid/UnoControlGrid.idl         |   84 ++++
 offapi/com/sun/star/awt/grid/UnoControlGridModel.idl    |  101 +++++
 offapi/com/sun/star/awt/grid/XGridCell.idl              |   59 +++
 offapi/com/sun/star/awt/grid/XGridCellRenderer.idl      |   56 +++
 offapi/com/sun/star/awt/grid/XGridColumn.idl            |   72 ++++
 offapi/com/sun/star/awt/grid/XGridColumnListener.idl    |   74 ++++
 offapi/com/sun/star/awt/grid/XGridColumnModel.idl       |  116 ++++++
 offapi/com/sun/star/awt/grid/XGridControl.idl           |   78 ++++
 offapi/com/sun/star/awt/grid/XGridControlListener.idl   |   52 ++
 offapi/com/sun/star/awt/grid/XGridDataListener.idl      |   76 ++++
 offapi/com/sun/star/awt/grid/XGridDataModel.idl         |  110 ++++++
 offapi/com/sun/star/awt/grid/XGridSelection.idl         |  126 +++++++
 offapi/com/sun/star/awt/grid/XGridSelectionListener.idl |   66 +++
 offapi/com/sun/star/awt/grid/makefile.mk                |   68 +++
 offapi/com/sun/star/chart/FilledNetDiagram.idl          |   72 ++++
 offapi/com/sun/star/chart/makefile.mk                   |    1 
 offapi/com/sun/star/style/ParagraphProperties.idl       |   11 
 offapi/com/sun/star/text/BaseFrameProperties.idl        |   26 +
 offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl |   26 +
 offapi/prj/build.lst                                    |    3 
 offapi/prj/d.lst                                        |    2 
 offapi/util/makefile.mk                                 |    1 
 offuh/prj/d.lst                                         |    3 
 sal/systools/win32/uwinapi/makefile.mk                  |    4 
 sal/util/makefile.mk                                    |    4 
 ure/source/README                                       |    2 
 48 files changed, 2272 insertions(+), 35 deletions(-)

New commits:
commit 37f88a8a3ee17be317e1fae4653668368175aca7
Author: Release Engineers <releng at openoffice.org>
Date:   Thu Aug 27 14:36:29 2009 +0000

    CWS-TOOLING: integrate CWS sw32bf02
    2009-08-25 15:52:04 +0200 hde  r275366 : reactived testcases hit by issue 102752
    2009-08-21 13:52:17 +0200 od  r275245 : #i102921# delete files whose deletion has been forgotten in cws impress172
    2009-08-21 11:20:47 +0200 od  r275225 : CWS-TOOLING: rebase CWS sw32bf02 to trunk at 275001 (milestone: DEV300:m55)
    2009-08-20 16:21:30 +0200 od  r275191 : #i92511# method <lcl_MoveAllLowerObjs(..)>
    	 - invalidation of cache for object rectangle inclusive spaces is needed.
    2009-08-20 15:50:40 +0200 od  r275188 : #i96726# method <SwPagePreView::DocSzChgd(..)>
    	 - trigger recalculation of page preview layout even if the count of pages is not changing
    2009-08-20 12:37:32 +0200 od  r275172 : #i100466# correction for showing and hiding redlines
    2009-08-18 13:25:18 +0200 od  r275100 : #i103817# method <XMLTextImportHelper::SetStyleAndAttrs(..)
              - assure that a heading applies the outline style, if no other list style is applied.
    2009-08-18 13:21:38 +0200 od  r275098 : #i103817# allow the outline style - list style for outline numbering - to be set directly at the paragraph
    2009-08-17 14:13:02 +0200 od  r275052 : #i103684# add missing documentation for new optional OutlineLevel attribute introduced in OOo 3.1
    2009-08-17 14:00:25 +0200 od  r275049 : #i100481# method <XMLTextFrameContext_Impl::CreateChildContext(..)>#
    	  - correct condition for handling embedded documents and embedded math objects
    2009-08-12 14:11:34 +0200 od  r274891 : #i97379# assure that columns are not applied to fly frames, which represent graphics or embedded objects
    2009-08-12 12:51:43 +0200 od  r274889 : #i101870# method <SwTxtNode::_MakeNewTxtNode(..)>
    	  - perform action on different paragraph styles before applying new paragraph style
    2009-08-12 12:24:44 +0200 od  r274888 : #i101092# method <ViewShell::Paint(..)>
    	  - encapsulate paint of document background and document into pre and post drawing layer paint calls
    2009-08-12 11:38:48 +0200 od  r274886 : #i98766# minor adjustment in order to be warning free under Mac port builds
    2009-08-12 11:33:54 +0200 od  r274885 : #i99267# method <SwTabFrm::MakeAll()>
    	 - reset <bSplit> after forward move to assure that follows can be joined, if further space is available.
    2009-08-12 11:11:49 +0200 od  r274882 : #i98766# method <ViewShell::SmoothScroll(..)
    	 - disable smooth scroll for Mac port builds
    2009-08-10 12:17:58 +0200 od  r274801 : CWS-TOOLING: rebase CWS sw32bf02 to trunk at 274622 (milestone: DEV300:m54)
    2009-07-21 16:56:45 +0200 od  r274206 : #i103685# method <SwTxtFormatter::NewTabPortion(..)>
    	  - adjust condition to apply automatic tab stop at left margin correctly
    	    in case that tab stops are not relative to indent
    2009-07-10 11:53:53 +0200 od  r273883 : #i102752 method <SwDrawContact::Modify(..)>
    	 - assure that a ShapePropertyChangeNotifier exists
    2009-07-07 12:01:58 +0200 mst  r273788 : #i103304# apply patch by dtardon to fix bogus conditional
    2009-07-07 09:01:13 +0200 od  r273767 : CWS-TOOLING: rebase CWS sw32bf02 to trunk at 273468 (milestone: DEV300:m51)

diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl
index 4dff8bc..14f91d6 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
@@ -448,6 +448,15 @@ published service ParagraphProperties
          */
         [optional, property] string ListId;
 
+        //-------------------------------------------------------------------------
+        /** specifies the outline level to which the paragraph belongs
+
+            @since OOo 3.1
+
+            <p>Value 0 indicates that the paragraph belongs to the body text.</p>
+            <p>Values [1..10] indicates that the paragraph belongs to the corresponding outline level.</p>
+         */
+        [optional, property] short OutlineLevel;
 };
 
 //=============================================================================
commit 336cef51d6f441b2396264e12929c0e722e77f84
Author: Vladimir Glazounov <vg at openoffice.org>
Date:   Thu Aug 27 11:59:20 2009 +0000

    CWS-TOOLING: integrate CWS sw32a11y01
    2009-08-27 10:11:46 +0200 hde  r275457 : new testcase i103265
    2009-08-27 08:24:31 +0200 hde  r275454 : new testcase i103265
    2009-08-27 08:23:05 +0200 hde  r275453 : new document for testcase i103265
    2009-08-26 13:43:33 +0200 hde  r275421 : added new autotest
    2009-08-26 13:36:28 +0200 hde  r275420 : added new autotest
    2009-08-18 15:41:18 +0200 od  r275113 : #i104300# method <SwEditWin::RequestHelp(..)>
    	  - improve help tip for hyperlinks to cross-reference bookmarks.
    2009-08-10 15:18:41 +0200 od  r274816 : #i73249# method <SwFrameShell::Execute(..)>
    	 - no update of fly frame manager on dialog "Title and Description"
    2009-08-10 14:24:15 +0200 od  r274813 : #i92125# correction of end of file - missing newline end
    2009-08-10 14:10:14 +0200 od  r274811 : #i92125# correction of end of file - newline missing
    2009-08-10 14:00:30 +0200 od  r274808 : #i92125# - correct end of file - new line missing
    2009-08-10 09:12:30 +0200 od  r274794 : CWS-TOOLING: rebase CWS sw32a11y01 to trunk at 274622 (milestone: DEV300:m54)
    2009-08-07 15:52:59 +0200 od  r274775 : #i73249# minor adjustment due to compiler warning
    2009-08-07 15:40:38 +0200 od  r274774 : #i92125# method <MarkManager::deleteMarks(..)>
    	 - do not delete cross-reference bookmark, if deletion occurs inside a certain node
    2009-08-06 12:53:05 +0200 od  r274717 : #i92125# method <MarkManager::deleteMarks(..)
             - no move of position for cross-reference bookmark, if move occurs inside certain node.
    2009-08-06 12:50:27 +0200 od  r274716 : #i92125# method <SwUndoSaveCntnt::DelCntntIndex(..)>
             - keep cross-reference bookmarks, if deletion occurs inside a certain node.
    2009-08-06 09:53:29 +0200 od  r274705 : #i103265# method <SwTOXPara::GetURL()>
    	  - For outline and template entries create link to bookmark.
    	    The bookmark of type CROSSREF_HEADING_BOOKMARK is created, if needed
    2009-07-22 13:57:04 +0200 od  r274236 : #i73249# adjustment for export of svg:title and svg:description
    2009-07-22 13:51:58 +0200 od  r274234 : #i73249# adjust and enhance import/export of svg:title and svg:description
    	 for Writer's text frames, graphics and embedded objects
    2009-07-21 10:26:27 +0200 od  r274168 : #i73249# implement support for attributes Title and Description for
    	 text frames, graphics and embedded objects in Writer
    	 - core, UNO-API, undo/redo and UI
    2009-07-21 10:05:15 +0200 od  r274164 : #i73249# new optional properties Title and Description as basis frame properties in text documents
    2009-07-13 12:19:54 +0200 od  r273928 : #i73249# Implementation of Undo/Redo of drawing object's name, title and description

diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl b/offapi/com/sun/star/text/BaseFrameProperties.idl
index cda6ae1..eadf841 100644
--- a/offapi/com/sun/star/text/BaseFrameProperties.idl
+++ b/offapi/com/sun/star/text/BaseFrameProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
@@ -346,14 +346,34 @@ published service BaseFrameProperties
     /** returns the actual size of the object.
 
         <p>Since to obtain the correct actual size of the object not only
-        the  layouting for the frame needs to be finished but the whole 
-        document needs to be formatted as well. Thus if that was not done 
+        the  layouting for the frame needs to be finished but the whole
+        document needs to be formatted as well. Thus if that was not done
         previously it may take some while to retrieve this value.</p>
 
         @since OOo 2.0.4
      */
     [optional, property, maybevoid] com::sun::star::awt::Size LayoutSize;
 
+    //-------------------------------------------------------------------------
+        /** contains short title for the object
+
+            <p>This short title is visible as an alternative tag in HTML format.
+            Accessibility tools can read this text.</p>
+
+            @since OOo 3.2
+        */
+        [optional, property] string Title;
+
+    //-------------------------------------------------------------------------
+        /** contains description for the object
+
+            <p>The long description text can be entered to describe a object in
+            more detail to users with screen reader software. The description is
+            visible as an alternative tag for accessibility tools.</p>
+
+            @since OOo 3.2
+        */
+        [optional, property] string Description;
 };
 
 //=============================================================================
commit fbb2cf18c17216b2e0ebf901bf2546e30c24b309
Author: Vladimir Glazounov <vg at openoffice.org>
Date:   Wed Aug 26 13:37:34 2009 +0000

    CWS-TOOLING: integrate CWS swa11y32_2nd
    2009-08-13 13:04:09 +0200 mav  r274936 : #i104204# remove support for Ctrl-Tab
    2009-08-13 09:59:22 +0200 od  r274924 : #i93269# method <atk_wrapper_focus_idle_handler(..)>
    	 - emit also object:state-changed:focus, if cursor is inside <XAccessibleText> object
    2009-08-11 12:15:11 +0200 tl  r274851 : CWS-TOOLING: rebase CWS swa11y32_2nd to trunk at 274622 (milestone: DEV300:m54)
    2009-07-14 17:35:03 +0200 tl  r273982 : 2009-07-10 10:46:39 +0200 tl  r273879 : CWS-TOOLING: rebase CWS swa11y32 to trunk at 273468 (milestone: DEV300:m51)
    2009-07-01 14:00:25 +0200 mav  r273577 : #i102879# the text of the button should not change
    2009-07-01 13:16:19 +0200 od  r273574 : #159496# method <GetHelpAnchor_Impl(..)>
    	 - do not release the solar mutex
    2009-06-29 15:29:10 +0200 od  r273476 : #i95042# method <CreateXWindow(..)>
    	 - return instance <VCLXComboBox> for <Window> instance of type <MetricBox>.
    	   note: <MetricBox> is inherited from <ComboBox>
    2009-06-23 15:49:32 +0200 mav  r273283 : #i101967# fix tab-control implementation
    2009-06-22 13:56:22 +0200 od  r273229 : #i100938# method <text_wrapper_get_run_attributes(..)>
    	  - always provide start_offset and end_offset
    	  - do _not_ increment the end_offset provide by <accessibility::TextSegment> instance
    2009-06-02 12:09:03 +0200 mav  r272492 : #i101959# Let the additional dialog window add its childred to the parents tab-hierarchy
    2009-06-02 09:55:39 +0200 mav  r272484 : #i102015# allow to have indirect child windows in tab-hierarchy
    2009-06-02 09:49:42 +0200 mav  r272482 : #i102015# Let the windows containing the extension dialog controls add controls to the tab hierarchy
    2009-05-27 15:45:33 +0200 od  r272354 : #i101012# method <SvxIconChoiceCtrl_Impl::EntrySelected(..)>
    	  - emit vcl event LISTBOX_SELECT only in case that the given entry is selected.
    2009-05-27 09:54:36 +0200 od  r272333 : #i92103# map UNO-API accessible events list box entry expanded/collapsed
    	 to corresponding atk events.
    2009-05-27 09:52:15 +0200 od  r272331 : #i92103# process list box entry expanded/collapsed events
    2009-05-27 09:49:19 +0200 od  r272330 : #i92103# emit vcl event list box entry expanded/collapsed
    2009-05-26 10:42:05 +0200 od  r272283 : #i93269# correct fix: check success of <queryInterface> call
    2009-05-04 15:52:04 +0200 od  r271469 : #i92103# new vcl event ids VCLEVENT_LISTBOX_ENTRY_EXPANDED and VCLEVENT_LISTBOX_ENTRY_COLLAPSED
    2009-05-04 15:10:20 +0200 od  r271460 : #i92103# refine definition of new constants
    2009-05-04 14:36:44 +0200 od  r271454 : #i92103# new constants for indicating that a list box entry is
    	 expanded respectively collapsed.
    2009-04-30 16:09:40 +0200 od  r271421 : #i93269# method <atk_wrapper_focus_idle_handler(..)>
    	 - emit text_caret_moved event for <XAccessibleText> object,
    	   if cursor is inside the <XAccessibleText> object.
    2009-04-22 14:00:10 +0200 tl  r271105 : warning-free code
    2009-04-22 09:17:30 +0200 tl  r271073 : CWS-TOOLING: rebase CWS swa11y32 to trunk at 270723 (milestone: DEV300:m46)
    2009-04-20 12:53:03 +0200 cd  r270974 : #i83639# Check extendedhelp state to provide correct tool tip text
    2009-04-03 13:07:13 +0200 tl  r270471 : #i63983# changed accessible object names to empty strings
    2009-04-01 15:52:09 +0200 tl  r270336 : #i90991# accessible names and description for paragraphs should be empty
    2009-04-01 15:12:42 +0200 tl  r270333 : #i90991# accessible names and description for paragraphs should be empty
    2009-04-01 15:10:34 +0200 tl  r270331 : warning-free code
    2009-04-01 12:54:44 +0200 tl  r270319 : #i89176# Implementation of XAccessibleMultiLineText in EditEngine
    2009-04-01 12:52:56 +0200 tl  r270318 : #i89176# Implementation of XAccessibleMultiLineText in EditEngine
    2009-03-27 18:31:01 +0100 tbe  r270166 : #i92143# text getRangeExtents reports incorrect 'x' values for spreadsheet cells
    2009-03-13 13:43:54 +0100 tl  r269476 : #i94322# ImpEditView::ShowCursor and nPara == USHRT_MAX problem fixed
    2009-03-12 10:27:30 +0100 tl  r269366 : warning-free code; unresolved external dbg_out when compiling with debug=t
    2009-03-11 12:40:31 +0100 tl  r269312 : warning-free code Solaris x86
    2009-03-10 15:49:01 +0100 tl  r269279 : #i86443# handle GetColumnCount() == 0
    2009-03-10 10:48:32 +0100 cl  r269254 : #i91742# name cells for accessibility
    2009-03-09 17:06:33 +0100 cl  r269203 : #i91742# call init on accessible cells

diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index e0ffda3..d848f84 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
@@ -64,7 +64,7 @@ published constants AccessibleEventId
     const short DESCRIPTION_CHANGED = 2;
 
     /** The change of the number or attributes of actions of an accessible
-        object is signaled by events of this type. 
+        object is signaled by events of this type.
         <p>The <member>AccessibleEventObject::OldValue</member> and
         <member>AccessibleEventObject::NewValue</member> fields contain the
         old and new number of actions.
@@ -122,7 +122,7 @@ published constants AccessibleEventId
         the <member>AccessibleEventObject::NewValue</member> contains a
         reference to this new object and
         <member>AccessibleEventObject::OldValue</member> remains empty.</p>
-        
+
         <p>If a child has been removed then the
         <member>AccessibleEventObject::OldValue</member> contains a
         reference to this object and
@@ -160,7 +160,7 @@ published constants AccessibleEventId
     /** A visibile data event indicates the change of the visual appearance
         of an accessible object.  This includes for example most of the
         attributes available over the <type>XAccessibleComponent</type> and
-        <type>XAccessibleExtendedComponent</type> interfaces.  The 
+        <type>XAccessibleExtendedComponent</type> interfaces.  The
         <member>AccessibleEventObject::OldValue</member> and
         <member>AccessibleEventObject::NewValue</member> fields are left empty.
     */
@@ -248,7 +248,7 @@ published constants AccessibleEventId
     const short SUB_WINDOW_OF_RELATION_CHANGED = 19;
 
     /** Events of this type are sent when the caret has moved to a new
-        position.  The old and new position can be found in the 
+        position.  The old and new position can be found in the
         <member>AccessibleEventObject::OldValue</member> and
         <member>AccessibleEventObject::NewValue</member> fields.
     */
@@ -258,7 +258,7 @@ published constants AccessibleEventId
         selection is <em>not</em> available through the event object.  You
         have to query the <type>XAccessibleText</type> interface of the
         event source for this information.  The type of content of  the
-        <member>AccessibleEventObject::OldValue</member> and 
+        <member>AccessibleEventObject::OldValue</member> and
         <member>AccessibleEventObject::NewValue</member> fields is not
         specified at the moment.  This may change in the future.
     */
@@ -269,7 +269,7 @@ published constants AccessibleEventId
         <type>XAccessibleEditableText</type> interfaces.
 
         <p>The affected text ranges are represented by <type
-        scope="com::sun::star::accessibility">TextSegment</type> structures.<p> 
+        scope="com::sun::star::accessibility">TextSegment</type> structures.<p>
 
         <p>The content of the <member>AccessibleEventObject::OldValue</member> and
         <member>AccessibleEventObject::NewValue</member> expresses the type
@@ -337,7 +337,7 @@ published constants AccessibleEventId
         change.
     */
     const short TABLE_COLUMN_HEADER_CHANGED = 27;
-    
+
     /** Constant used to indicate that the table data has changed.  The
         <member>AccessibleEventObject::OldValue</member> is empty, the
         <member>AccessibleEventObject::NewValue</member> field contains an
@@ -367,8 +367,24 @@ published constants AccessibleEventId
         old and new accessible objects representing the table summary.
     */
     const short TABLE_SUMMARY_CHANGED = 31;
+
+    /** Constant used to indicate that a list box entry has been expanded.
+        <member>AccessibleEventObject::OldValue</member> is empty.
+        <member>AccessibleEventObject::NewValue</member> contains the expanded list box entry.
+
+        @since OOo 3.2
+    */
+    const short LISTBOX_ENTRY_EXPANDED = 32;
+
+    /** Constant used to indicate that a list box entry has been collapsed.
+        <member>AccessibleEventObject::OldValue</member> is empty.
+        <member>AccessibleEventObject::NewValue</member> contains the collapsed list box entry.
+
+        @since OOo 3.2
+    */
+    const short LISTBOX_ENTRY_COLLAPSED = 33;
 };
-          
+
 }; }; }; };
 
 #endif
commit c4bf103e87fb99fff36c7d602801ad035006afe2
Author: Release Engineers <releng at openoffice.org>
Date:   Wed Aug 26 13:11:27 2009 +0000

    CWS-TOOLING: integrate CWS gridcontrol_01
    2009-08-13 07:53:28 +0200 tkr  r274919 : #103210# remove mixed-line-endings
    2009-08-13 07:36:19 +0200 tkr  r274918 : #103210# remove mixed-line-endings
    2009-08-06 14:02:11 +0200 tkr  r274725 : #103210# build issues fixed
    2009-08-06 12:11:52 +0200 tkr  r274711 : #103210# build issues fixed
    2009-08-06 12:03:32 +0200 tkr  r274710 : #103210# add grid directory to d.lst
    2009-08-05 17:00:11 +0200 misheto  r274689 : CWS-TOOLING: rebase CWS gridcontrol_01 to trunk at 274622 (milestone: DEV300:m54)
    2009-08-05 14:31:42 +0200 tkr  r274668 : #103210# remove add/removeMouseListener from XGridControl and use XWindow
    2009-08-05 14:30:06 +0200 tkr  r274667 : #103210# remove add/removeMouseListener from XGridControl and use XWindow
    2009-08-05 14:29:09 +0200 tkr  r274666 : #103210# remove add/removeMouseListener from XGridControl and use XWindow
    2009-08-05 12:02:15 +0200 misheto  r274649 : fox for HScroll problem
    2009-08-05 11:37:22 +0200 misheto  r274644 : CWS-TOOLING: rebase CWS gridcontrol_01 to trunk at 274203 (milestone: DEV300:m53)
    2009-08-03 10:12:50 +0200 tkr  r274568 : #103210# Method getItemIndexPos() added
    2009-07-31 18:25:42 +0200 misheto  r274547 : fixed bug no cursor with NONE-selection, arrow keys cause selection disappear
    2009-07-31 16:36:34 +0200 tkr  r274541 : #103210# MouseListener added
    2009-07-31 16:35:48 +0200 tkr  r274540 : #103210# MouseListener added
    2009-07-31 14:37:45 +0200 misheto  r274533 : event handlers
    2009-07-31 09:43:52 +0200 tkr  r274513 : #103210# MouseListener added
    2009-07-31 09:42:46 +0200 tkr  r274512 : #103210# MouseListenerMultiplexer exported
    2009-07-30 18:19:55 +0200 misheto  r274501 : 2009-07-30 18:15:00 +0200 misheto  r274500 : mouselistener changes
    2009-07-30 15:23:03 +0200 tkr  r274491 : #i103210# remove XItemListener and add XMouseListener
    2009-07-30 15:22:01 +0200 tkr  r274490 : #i103210# remove XItemListener and add XMouseListener
    2009-07-28 16:47:37 +0200 misheto  r274415 : fixed text left intented, removeAllScroll mode, selection mode, single selection
    2009-07-28 16:45:32 +0200 misheto  r274413 : 2009-07-28 14:56:33 +0200 tkr  r274407 : #i103210# build issue fixed
    2009-07-28 12:49:23 +0200 tkr  r274397 : #i103210# use HScroll and VScroll for Scrolbarmode
    2009-07-28 12:24:14 +0200 tkr  r274396 : #i103210# use HScroll and VScroll for Scrolbarmode
    2009-07-28 11:33:46 +0200 tkr  r274393 : ##i103210# api changes
    2009-07-28 11:32:48 +0200 tkr  r274392 : ##i103210# add ItemListener
    2009-07-28 11:31:49 +0200 tkr  r274391 : ##i103210# add ItemListener
    2009-07-28 08:30:30 +0200 tkr  r274388 : #i103210# paint background color
    2009-07-24 17:22:10 +0200 misheto  r274314 : focus problem solved, single selection with keys UP DOWN
    2009-07-22 11:43:24 +0200 misheto  r274226 : removed vclxcontrol dependencies
    2009-07-22 10:23:34 +0200 misheto  r274220 : 2009-07-21 15:04:26 +0200 misheto  r274200 : tablecontrol added items
    2009-07-21 15:00:44 +0200 misheto  r274198 : tablecontrol
    2009-07-17 09:58:59 +0200 misheto  r274082 : changes mihaela
    2009-07-15 11:04:27 +0200 tkr  r273999 : #i103210# api documentation added
    2009-07-15 11:03:18 +0200 tkr  r273998 : #i103210# adapt idl changes
    2009-07-14 08:47:32 +0200 tkr  r273959 : #i103210# Method removeRow added
    2009-07-14 08:46:52 +0200 tkr  r273958 : #i103210# Method removeRow added
    2009-07-13 08:20:11 +0200 tkr  r273914 : #i103210# XGridSelectionModel removed
    2009-07-10 13:50:01 +0200 tkr  r273888 : #i103210# selection support and listener added
    2009-07-10 13:42:17 +0200 tkr  r273887 : #i103210# selection support added
    2009-07-06 10:21:51 +0200 tkr  r273724 : #i103210# implement listener
    2009-07-06 10:13:25 +0200 tkr  r273723 : #i103210# remove wrong interfaces
    2009-07-06 10:11:47 +0200 tkr  r273722 : #i103210# interface changes
    2009-07-02 15:28:50 +0200 tkr  r273659 : #i103210# create new services
    2009-07-02 15:26:21 +0200 tkr  r273658 : #i103210# create new services
    2009-07-02 12:00:39 +0200 tkr  r273633 : #i103210# defaultgriddatamodel works now
    2009-07-02 11:59:24 +0200 tkr  r273631 : #i103210# now XGridDataModel inherits XComponent
    2009-07-01 14:07:31 +0200 tkr  r273579 : #i103210# initial implementation of the grid control data model
    2009-07-01 13:14:21 +0200 tkr  r273571 : #i103210# adding new service and some methods
    2009-06-30 12:15:13 +0200 tkr  r273500 : #i103210# change attribute names
    2009-06-30 10:55:07 +0200 tkr  r273496 : #i103210# create services and interfaces for the grid control
    2009-06-30 10:47:26 +0200 tkr  r273495 : #i103210# create services and interfaces for the grid control

diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
new file mode 100644
index 0000000..0d69305
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * 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: UnoControlEdit.idl,v $
+ * $Revision: 1.9 $
+ *
+ * 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_awt_DefaultGridColumnModel_idl__
+#define __com_sun_star_awt_DefaultGridColumnModel_idl__
+ 
+#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__ 
+#include <com/sun/star/awt/grid/XGridColumnModel.idl> 
+#endif
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  module grid {
+ 
+//============================================================================= 
+ 
+/** If you do not want to implement the <type>XGridColumnModel</type> yourself, use this service.
+ */ 
+service DefaultGridColumnModel
+{ 
+    interface com::sun::star::awt::grid::XGridColumnModel;
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };};
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
new file mode 100644
index 0000000..ef03259
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * 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: UnoControlEdit.idl,v $
+ * $Revision: 1.9 $
+ *
+ * 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_awt_DefaultGridDataModel_idl__
+#define __com_sun_star_awt_DefaultGridDataModel_idl__
+ 
+#ifndef __com_sun_star_awt_grid_XGridDataModel_idl__ 
+#include <com/sun/star/awt/grid/XGridDataModel.idl> 
+#endif
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  module grid {
+ 
+//============================================================================= 
+ 
+/** If you do not want to implement the <type>XGridDataModel</type> yourself, use this service.
+ */ 
+service DefaultGridDataModel
+{ 
+    interface com::sun::star::awt::grid::XGridDataModel;
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };};
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
new file mode 100644
index 0000000..b685b2d
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * 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: UnoControlEdit.idl,v $
+ * $Revision: 1.9 $
+ *
+ * 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_awt_GridColumn_idl__
+#define __com_sun_star_awt_GridColumn_idl__
+ 
+#ifndef __com_sun_star_awt_grid_XGridColumn_idl__ 
+#include <com/sun/star/awt/grid/XGridColumn.idl> 
+#endif
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  module grid {
+ 
+//============================================================================= 
+ 
+/** Represents a column as used by the <type>DefaultGridColumnModel</type>
+ */ 
+service GridColumn
+{ 
+    interface com::sun::star::awt::grid::XGridColumn;
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };};
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
new file mode 100644
index 0000000..a6c5dd6
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * 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: ActionEvent.idl,v $
+ * $Revision: 1.11 $
+ *
+ * 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_awt_grid_GridColumnEvent_idl__ 
+#define __com_sun_star_awt_grid_GridColumnEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_grid_XGridColumn_idl__ 
+#include <com/sun/star/awt/grid/XGridColumn.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
+ 
+/** An event used by a <type>XGridColumnModel</type> to notify changes in the column
+    model to the <type>XGridControl</type>.
+    You usually need to fill this event only if you implement the <type>XGridColumnModel</type>
+    yourself.
+
+    @see XGridColumnModel
+    @see XGridControl
+    @see XGridColumnListener
+ */ 
+struct GridColumnEvent: com::sun::star::lang::EventObject
+{ 
+    /** Contains the property name of the changed value **/
+    string valueName;
+
+    /** Contains the old value **/
+    any oldValue; 
+
+    /** Contains the new value **/
+    any newValue;
+    
+    /** Contains the index of the changed column**/
+    long index;
+
+    /** Contains the changed column**/
+    XGridColumn column;
+    //------------------------------------------------------------------------- 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridControlEvent.idl b/offapi/com/sun/star/awt/grid/GridControlEvent.idl
new file mode 100644
index 0000000..16ef57c
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridControlEvent.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * 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: ActionEvent.idl,v $
+ * $Revision: 1.11 $
+ *
+ * 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_awt_GridControlEvent_idl__ 
+#define __com_sun_star_awt_GridControlEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
+ 
+
+struct GridControlEvent: com::sun::star::lang::EventObject
+{ 
+    //------------------------------------------------------------------------- 
+        
+    string ActionCommand; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
new file mode 100644
index 0000000..c97f654
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * 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: ActionEvent.idl,v $
+ * $Revision: 1.11 $
+ *
+ * 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_awt_grid_GridDataEvent_idl__ 
+#define __com_sun_star_awt_grid_GridDataEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  module grid {
+ 
+//============================================================================= 
+ 
+/** An event used by a <type>XGridDataModel</type> to notify changes in the data
+    model to the <type>XGridControl</type>.
+    You usually need to fill this event only if you implement the <type>XGridDataModel</type>
+    yourself.
+
+    @see XGridDataModel
+    @see XGridControl
+    @see XGridDataListener
+ */ 
+struct GridDataEvent: com::sun::star::lang::EventObject
+{ 
+    //------------------------------------------------------------------------- 
+        
+    /** Contains the property name of the changed value **/
+    string valueName;
+
+    /** Contains the old value **/
+    any oldValue; 
+
+    /** Contains the new value **/
+    any newValue;
+
+    /** Contains the index of the changed row**/
+    long index;
+
+    /** Contains the header name of the changed row**/
+    string headerName; 
+
+    /** Contains the changed row**/
+    sequence<string> rowData;
+
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
new file mode 100644
index 0000000..bc70417
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -0,0 +1,71 @@
+/*************************************************************************
+ *
+ * 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: ActionEvent.idl,v $
+ * $Revision: 1.11 $
+ *
+ * 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_awt_GridSelectionEvent_idl__ 
+#define __com_sun_star_awt_GridSelectionEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__ 
+#include <com/sun/star/awt/grid/SelectionEventType.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
+
+/** An event used by a <type>XGridControl</type> to notify changes in the selection.
+
+    @see XGridControl
+    @see XGridSelectionListener
+ */  
+struct GridSelectionEvent: com::sun::star::lang::EventObject
+{ 
+    //------------------------------------------------------------------------- 
+        
+    /** Contains the x coordinate of the selected cell**/
+    long x; 
+
+    /** Contains the y coordinate of the selected cell**/
+    long y;
+
+    /** Contains the action <type>SelectionEventType</types> that was performed **/
+    SelectionEventType action;
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/ScrollBarMode.idl b/offapi/com/sun/star/awt/grid/ScrollBarMode.idl
new file mode 100644
index 0000000..c04ce53
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/ScrollBarMode.idl
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * 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: AdjustmentType.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_awt_grid_ScrollBarMode_idl__ 
+#define __com_sun_star_awt_grid_ScrollBarMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  module grid {
+ 
+//============================================================================= 
+ 
+/** specifies the adjustment type.
+ */
+enum ScrollBarMode
+{ 
+    //------------------------------------------------------------------------- 
+    
+    /** adjustment is originated by a line jump.
+
+        <p>A line jump can, for example, be caused by a click on 
+        one of the pointer buttons.</p>
+     */
+    AUTO, 
+ 
+    //------------------------------------------------------------------------- 
+    
+    /** adjustment is originated by a page jump.
+        
+        <p>A page jump can, for example, be caused by a click in the 
+        background area of the scrollbar (neither one of the pointer
+        buttons, nor the thumb).</p>
+     */
+    ON,
+
+    OFF
+
+
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/SelectionEventType.idl b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
new file mode 100644
index 0000000..734551f
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * 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: AdjustmentType.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_awt_grid_SelectionEventType_idl__ 
+#define __com_sun_star_awt_grid_SelectionEventType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  module grid {
+ 
+//============================================================================= 
+ 
+/** specifies the type of a selection event, as used by
+    <type>GridSelectionEvent</type>.
+ */ 
+enum SelectionEventType
+{ 
+    //------------------------------------------------------------------------- 
+    
+    /** This value indicates that a selection was added to the grid control
+     */
+    ADD, 
+ 
+    //------------------------------------------------------------------------- 
+    
+    /** This value indicates that a selection was removed from the grid control
+     */
+    REMOVE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
new file mode 100644
index 0000000..cd9fff2
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * 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: UnoControlEdit.idl,v $
+ * $Revision: 1.9 $
+ *
+ * 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_awt_UnoControlGrid_idl__
+#define __com_sun_star_awt_UnoControlGrid_idl__
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_grid_XGridControl_idl__ 
+#include <com/sun/star/awt/grid/XGridControl.idl> 
+#endif
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  module grid {
+ 
+//============================================================================= 
+ 
+//============================================================================= 
+ 
+/** A control that displays a set of tabular data.
+
+    <p>
+    <h4>The Column Model</h4>
+    <p>The horizontal structure of the grid is defined by the <type>XGridColumnModel</type> implemented in <type>DefaultGridColumnModel</type>
+    The <type>XGridColumn</type> implemented in <typeGridColumn</type> describes the properties and behavior of a single column. Use the <member>XGridColumnModel::addColumn()</member> to add a column to the column model.  
+    </p>
+    <p>
+    <h4>The Data Model</h4>
+    <p> All row data are stored in the <type>XGridDataModel</type>.
+    Use the <type>DefaultGridDataModel</type> to add  <member>XGridDataModel::addRow()</member> or remove <member>XGridDataModel::removeRow()</member> rows.
+    </p>
+
+    <p>The column and data model must be set at the <member>UnoControlGridModel::ColumnModel</member> and <member>UnoControlGridModel::GridDataModel</member> properties.</p>
+
+    <h4>Selection</h4>
+    <p>If you are interested in knowing when the selection changes implement a
+    <type>XGridSelectionListener</type> and add the instance with the method
+    <member>XGridSelection::addSelectionListener()</member>.
+    You than will be notified for any selection change.
+
+    The <type>XGridSelection</type> interface provides a bunch of methods to set and get selection for the grid control.
+    </p>
+ */
+service UnoControlGrid
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
+    interface com::sun::star::awt::grid::XGridControl;
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };};
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
new file mode 100644
index 0000000..092a756
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
@@ -0,0 +1,101 @@
+/*************************************************************************
+ *
+ * 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: UnoControlEditModel.idl,v $
+ * $Revision: 1.16 $
+ *
+ * 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_awt_grid_UnoControlGridModel_idl__ 
+#define __com_sun_star_awt_grid_UnoControlGridModel_idl__ 
+
+#include <com/sun/star/awt/grid/XGridColumnModel.idl> 
+
+#include <com/sun/star/awt/grid/XGridDataModel.idl> 
+
+#include <com/sun/star/awt/grid/ScrollBarMode.idl> 
+
+#include <com/sun/star/awt/UnoControlModel.idl> 
+
+#include <com/sun/star/view/SelectionType.idl> 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
+ 
+/** specifies the standard model of a <type>UnoControlGridModel</type>.
+ */
+service UnoControlGridModel
+{ 
+    /** specifies the standard model of an <type scope="com::sun::star::awt">UnoControl</type>. */
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    /** Specifies whether the grid control should display a special header column.
+        <p>The default value is <FALSE/></p>
+    */
+    [property] boolean ShowRowHeader;
+    
+    /** Specifies whether the grid control should display a title row.
+        <p>The default value is <TRUE/></p>
+    */
+    [property] boolean ShowColumnHeader;
+    
+    /**	Specifies the <type>XGridColumnModel</type> that is providing the column structure.
+
+        <p>You can implement your own instance of <type>XGridColumnModel</type> or use
+        the <type>DefaultGridColumnModel</type>.
+    */
+    [property] XGridColumnModel ColumnModel;
+    
+    /**	Specifies the <type>XGridDataModel</type> that is providing the hierarchical data.
+
+        <p>You can implement your own instance of <type>XGridDataModel</type> or use
+        the <type>DefaultGridDataModel</type>.
+    */
+    [property] XGridDataModel DataModel;
+    
+    /** Specifies the vertical scrollbar mode.
+        <p>The default value is <FALSE/></p>
+    */
+    [property] boolean HScroll;
+    
+    /** Specifies the horizontal scrollbar mode.
+        <p>The default value is <FALSE/></p>
+    */
+    [property] boolean VScroll;
+
+    /** Specifies the selection mode that is enabled for this grid control.
+        <p>The default value is <member scope="com::sun::star::view">SelectionType::SINGLE</member></p>
+    */
+    [property] ::com::sun::star::view::SelectionType SelectionModel;
+        
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridCell.idl b/offapi/com/sun/star/awt/grid/XGridCell.idl
new file mode 100644
index 0000000..7a4ab15
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridCell.idl
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridCell_idl__ 
+#define __com_sun_star_awt_grid_XGridCell_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  module grid {
+ 
+//============================================================================= 
+
+interface XGridCell: com::sun::star::uno::XInterface
+{ 
+
+    [attribute] string Value;
+    
+    [attribute] boolean Editable;
+    
+    [attribute] any Data;
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
new file mode 100644
index 0000000..e8d1877
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridCellRenderer.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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridCellRenderer_idl__ 
+#define __com_sun_star_awt_grid_XGridCellRenderer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
+
+/** gives access to the items of a list box and makes it possible to
+    register item and action event listeners.
+ */     
+interface XGridCellRenderer: com::sun::star::uno::XInterface
+{ 
+    //------------------------------------------------------------------------- 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
new file mode 100644
index 0000000..121ca80
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * 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: XGridColumn.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridColumn_idl__ 
+#define __com_sun_star_awt_grid_XGridColumn_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  module grid {
+ 
+//============================================================================= 
+
+/** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control
+ */     
+interface XGridColumn: com::sun::star::uno::XInterface
+{ 
+    /** Specifies the an idendifier of the colomn.**/
+    [attribute] any Identifier;
+
+    /** Specifies the default column witdth. **/
+    [attribute] long ColumnWidth;
+    /*
+    [attribute] long PreferredWidth;
+
+    [attribute] long MinWidth;
+
+    [attribute] long MaxWidth;
+
+    [attribute] boolean Resizable;
+    */
+
+    /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
+    [attribute] string Title;
+
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
new file mode 100644
index 0000000..2480ab1
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridColumnListener_idl__ 
+#define __com_sun_star_awt_grid_XGridColumnListener_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__ 
+#include <com/sun/star/awt/grid/GridColumnEvent.idl> 
+#endif 
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
+
+/** An instance of this interface is used by the <type>XGridColumnModel</type> to
+    get notifications about column model changes.
+    
+    <p>Usually you must not implement this interface yourself, but you must notify it correctly if
+    you implement the <type>XGridColumnModel</type> yourself</p>.
+ */     
+interface XGridColumnListener: com::sun::star::uno::XInterface
+{ 
+    /** 
+        Invoked after a column was added to the column model.
+    */
+    void columnAdded( [in] GridColumnEvent event ); 
+    
+    /** 
+        Invoked after a column was removed from the column model.
+    */
+    void columnRemoved( [in] GridColumnEvent event ); 
+    
+    /** 
+        Invoked after a column was modified.
+    */
+    void columnChanged( [in] GridColumnEvent event ); 
+}; 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
new file mode 100644
index 0000000..118f75e
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridColumnModel_idl__ 
+#define __com_sun_star_awt_grid_XGridColumnModel_idl__ 
+ 
+#include <com/sun/star/uno/XInterface.idl> 
+
+#include <com/sun/star/awt/grid/XGridColumn.idl> 
+#include <com/sun/star/awt/grid/XGridColumnListener.idl> 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
+
+/** An instance of this interface is used by the <type>UnoControlGrid</type> to
+    retrieve the column structure that is displayed in the actual control.
+
+    If you do not need your own model implementation, you can also use the <type>DefaultGridColumnModel</type>.
+*/     
+interface XGridColumnModel: com::sun::star::uno::XInterface
+{ 
+    /** Specifies whether column selection is allowed
+    */
+    [attribute] boolean ColumnSelectionAllowed;
+    
+    /** Returns the number of columns.
+        @returns
+                the number of columns.
+    */
+    long getColumnCount();
+    
+    /** Adds a column to the model.
+        @param column
+            the column to add to the model.
+
+        @returns
+                the index of new created column.
+    */
+    long addColumn( [in] XGridColumn column );
+
+    /*
+    long getSelectedCount();
+    
+    sequence<XGridColumn> getSelectedColumns();
+    
+    sequence<long> getSelectedIndex();
+    
+    */
+
+    /** Returns all columns of the model.
+        @returns
+                 all columns associated with the model in a sequence of <type>XGridColumn</type>.
+    */
+    sequence<XGridColumn> getColumns();
+    
+    /** Returns a specific column.
+        @param index
+                the position of the reuquested column.
+        @returns
+                 the requested column.
+    */
+    XGridColumn getColumn( [in] long index);
+    
+    /*
+    long getTotalColumnWidth();
+    */
+
+    /** Adds a listener for the <type>GridColumnEvent</type> posted after the grid changes.
+        @param Listener
+            the listener to add.
+    */     
+    [oneway] void addColumnListener( [in] XGridColumnListener  listener); 
+ 
+    //------------------------------------------------------------------------- 
+
+    /** Removes a listener previously added with <method>addColumnListener()</method>.
+        @param Listener
+            the listener to remove.
+    */   
+    [oneway] void removeColumnListener( [in] XGridColumnListener listener); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl
new file mode 100644
index 0000000..c69b0d2
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridControl.idl
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridControl_idl__ 
+#define __com_sun_star_awt_grid_XGridControl_idl__ 
+ 
+#include <com/sun/star/awt/grid/XGridSelection.idl> 
+#include <com/sun/star/awt/grid/XGridColumnModel.idl> 
+#include <com/sun/star/awt/grid/XGridDataModel.idl> 
+#include <com/sun/star/awt/XMouseListener.idl> 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
+
+/** An interface to a control that displays a tabular data.
+
+    @see UnoControlGrid
+ */      
+interface XGridControl: XGridSelection 
+{ 
+    /** Specifies the <type>XGridColumnModel</type> of the control.
+    */
+    [attribute]	XGridColumnModel ColumnModel;
+
+    /** Specifies the <type>XGridDataModel</type> of the control.
+    */
+    [attribute] XGridDataModel DataModel;
+
+
+    /** Converting 
+    */
+
+    long getItemIndexAtPoint( [in] long x, [in] long y);
+
+    /** registers a listener for mouse events.
+     */    
+    //[oneway] void addMouseListener( [in] com::sun::star::awt::XMouseListener listener ); 
+ 
+    /** unregisters a listener for mouse events.
+     */    
+    //[oneway] void removeMouseListener( [in] com::sun::star::awt::XMouseListener listener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridControlListener.idl b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
new file mode 100644
index 0000000..3c997dc
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridControlListener_idl__ 
+#define __com_sun_star_awt_grid_XGridControlListener_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
+
+interface XGridControlListener: com::sun::star::uno::XInterface
+{ 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
new file mode 100644
index 0000000..a657225
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridDataListener_idl__ 
+#define __com_sun_star_awt_grid_XGridDataListener_idl__ 
+ 
+#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__ 
+#include <com/sun/star/awt/grid/GridDataEvent.idl> 
+#endif 
+
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
+
+/** An instance of this interface is used by the <type>XGridDataModel</type> to
+    get notifications about data model changes.
+    
+    <p>Usually you must not implement this interface yourself, but you must notify it correctly if
+    you implement the <type>XGridDataModel</type> yourself</p>.
+ */       
+interface XGridDataListener: com::sun::star::lang::XEventListener
+{ 
+
+    /** 
+        Invoked after a row was added to the data model.
+    */
+    void rowAdded( [in] GridDataEvent Event ); 
+    
+    /** 
+        Invoked after a row was added to the data model.
+    */
+    void rowRemoved( [in] GridDataEvent Event ); 
+    
+    /** 
+        Invoked after a row was added to the data model.
+    */
+    void dataChanged( [in] GridDataEvent Event ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
new file mode 100644
index 0000000..03b124a
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridDataModel_idl__ 
+#define __com_sun_star_awt_grid_XGridDataModel_idl__ 
+ 
+
+#include <com/sun/star/lang/XComponent.idl> 
+#include <com/sun/star/awt/grid/XGridDataListener.idl> 
+
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
+/** An instance of this interface is used by the <type>UnoControlGrid</type> to
+    retrieve the content data that is displayed in the actual control.
+
+    If you do not need your own model implementation, you can also use the <type>DefaultGridDataModel</type>.
+*/   
+interface XGridDataModel: ::com::sun::star::lang::XComponent 
+{ 
+    /** Specifies the height of each row.
+    */
+    [attribute] long RowHeight;
+
+    /** Contains the row header.
+    */
+    [attribute] sequence< string > RowHeaders;
+
+    /** Returns the content of each row.
+    */
+    [attribute,readonly] sequence< sequence< string > > Data;
+
+    /** Returns the number of rows in in the model.
+        @returns
+                the number of rows.
+    */
+    long getRowCount();
+
+    /** Adds a row to the model.
+
+        @param headername
+                specifies the name of the row. 
+        @param data
+                the content of the row.
+    */
+    void addRow( [in] string headername, [in] sequence< string > data );
+
+    /** Removes a row from the model.
+
+        @param index
+                the index of the row that should be removed.
+    */
+    void removeRow( [in] long index);
+
+    /** Removes all rows from the model.
+    */
+    void removeAll();
+
+    //------------------------------------------------------------------------- 
+
+    /** Adds a listener for the <type>GridDataEvent</type> posted after the grid changes.
+        @param Listener
+            the listener to add.
+    */    
+    [oneway] void addDataListener( [in] XGridDataListener  listener); 
+ 
+    //------------------------------------------------------------------------- 
+
+    /** Removes a listener previously added with <method>addDataListener()</method>.
+        @param Listener
+            the listener to remove.
+    */       
+    [oneway] void removeDataListener( [in] XGridDataListener listener); 
+  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };};  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl
new file mode 100644
index 0000000..35c7d68
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl
@@ -0,0 +1,126 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridSelection_idl__ 
+#define __com_sun_star_awt_grid_XGridSelection_idl__ 
+ 
+#include <com/sun/star/uno/XInterface.idl> 
+#include <com/sun/star/awt/grid/XGridSelectionListener.idl> 
+#include <com/sun/star/view/SelectionType.idl> 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
+
+/** This interfaces provides access to the selection of row for <type>UnoControlGrid</type>. 
+ */     
+interface XGridSelection: com::sun::star::uno::XInterface
+{ 
+    /** Returns the lowest index of the selection. 
+        @returns
+            the lowest index.
+    */
+    long getMinSelectionIndex();
+
+    /** Returns the highest index of the selection. 
+        @returns
+            the highest index.
+    */
+    long getMaxSelectionIndex();
+
+    /** Adds a selection intervall.
+        @param start
+                the start row index.
+        @param length
+                the number of rows to be selected.
+    */
+    [oneway] void insertIndexIntervall( [in] long start, [in] long length);
+
+    /** Removes a selection intervall.
+        @param start
+                the start row index.
+        @param length
+                the number of rows to be selected.
+    */
+    [oneway] void removeIndexIntervall( [in] long start, [in] long length);
+
+    /** Returns the indicies of all selected rows.
+        @returns
+            a sequence of indicies.
+    */
+    sequence< long > getSelection();
+
+    /** Returns whether rows are selected.
+        @returns
+            <true/> if rows are selected otherwise <false/>.
+    */
+    boolean isSelectionEmpty();
+
+    /** Returns whether a specific row is selected.
+        @param
+            the index of a row.
+        @returns
+            <true/> if row are selected otherwise <false/>.
+    */
+    boolean isSelectedIndex( [in] long index);
+
+    /** Marks a row as selected.
+        @param
+            the index of a row.
+    */
+    [oneway] void selectRow( [in] long y);
+
+    /*
+    [oneway] void selectColumn( [in] long x);
+    */
+
+    /** Adds a listener for the <type>GridSelectionEvent</type> posted after the grid changes.
+        @param Listener
+            the listener to add.
+    */    
+    [oneway] void addSelectionListener( [in] XGridSelectionListener  listener); 
+ 
+    //------------------------------------------------------------------------- 
+
+    /** Removes a listener previously added with <method>addSelectionListener()</method>.
+        @param Listener
+            the listener to remove.
+    */   
+    [oneway] void removeSelectionListener( [in] XGridSelectionListener listener); 
+ 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
new file mode 100644
index 0000000..60e079d
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_awt_grid_XGridSelectionListener_idl__ 
+#define __com_sun_star_awt_grid_XGridSelectionListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif
+ 
+#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__ 
+#include <com/sun/star/awt/grid/GridSelectionEvent.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
+
+/** An instance of this interface is used by the <type>XGridSelection</type> to
+    get notifications about selection changes.
+    
+    <p>Usually you must not implement this interface yourself, but you must notify it correctly if
+    you implement the <type>XGridSelection</type> yourself</p>.
+ */      
+interface XGridSelectionListener: com::sun::star::lang::XEventListener
+{ 
+    //------------------------------------------------------------------------- 
+    /** Invoked after a selection was changed.
+     */    
+    [oneway] void selectionChanged( [in] GridSelectionEvent gridSelectionEvent); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk
new file mode 100644
index 0000000..124ca44
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/makefile.mk
@@ -0,0 +1,68 @@
+#*************************************************************************
+#
+# 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.3 $
+#
+# 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=api
+
+TARGET=cssawtgrid
+PACKAGE=com$/sun$/star$/awt$/grid
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# ------------------------------------------------------------------------
+IDLFILES=\
+    GridColumnEvent.idl\
+    GridControlEvent.idl\
+    GridDataEvent.idl\
+    SelectionEventType.idl\
+    GridSelectionEvent.idl\
+    XGridControlListener.idl\
+    XGridSelectionListener.idl\
+    XGridSelection.idl\
+    XGridColumn.idl\
+     XGridColumnListener.idl\
+    XGridDataListener.idl\
+    XGridCell.idl\
+    XGridCellRenderer.idl\
+    DefaultGridDataModel.idl\
+    XGridDataModel.idl\
+    XGridColumnModel.idl\
+    ScrollBarMode.idl\
+    XGridControl.idl\
+    UnoControlGrid.idl\
+    UnoControlGridModel.idl
+# ------------------------------------------------------------------
+
+.INCLUDE :  target.mk
+.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index ede720d..6b4a0b9 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -7,6 +7,7 @@ oa	offapi\com\sun\star\auth				nmake	-	all	oa_auth NULL
 oa	offapi\com\sun\star\accessibility       nmake	-	all	oa_accessibility oa_awt NULL
 oa	offapi\com\sun\star\awt					nmake	-	all	oa_awt NULL
 oa	offapi\com\sun\star\awt\tree			nmake	-	all	oa_awttree NULL
+oa	offapi\com\sun\star\awt\grid			nmake	-	all	oa_awtgrid NULL
 oa	offapi\com\sun\star\chart				nmake	-	all	oa_chart NULL
 oa	offapi\com\sun\star\chart2       		nmake	-	all	oa_chart2 NULL
 oa	offapi\com\sun\star\chart2\data       	nmake	-	all	oa_chart2_data NULL
@@ -103,4 +104,4 @@ 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\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_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 NULL
diff --git a/offapi/prj/d.lst b/offapi/prj/d.lst
index f0ec9d7..9532cd7 100644
--- a/offapi/prj/d.lst
+++ b/offapi/prj/d.lst
@@ -12,6 +12,7 @@ mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\animations
 mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\auth
 mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt
 mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tree
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\grid
 mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart
 mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2
 mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2\data
@@ -127,6 +128,7 @@ mkdir: %COMMON_DEST%\idl%_EXT%\drafts\com\sun\star\form
 ..\com\sun\star\auth\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\auth
 ..\com\sun\star\awt\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt
 ..\com\sun\star\awt\tree\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tree
+..\com\sun\star\awt\grid\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\grid
 ..\com\sun\star\chart\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart
 ..\com\sun\star\chart2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2
 ..\com\sun\star\chart2\data\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2\data
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 52b6324..fcf3e4b 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -45,6 +45,7 @@ UNOIDLDBFILES= \
     $(UCR)$/cssauth.db \
     $(UCR)$/cssawt.db \
     $(UCR)$/cssawttree.db \
+    $(UCR)$/cssawtgrid.db \
     $(UCR)$/csschart.db \
     $(UCR)$/csschart2.db \
     $(UCR)$/csschart2data.db \
diff --git a/offuh/prj/d.lst b/offuh/prj/d.lst
index a18d037..0e85b26 100644
--- a/offuh/prj/d.lst
+++ b/offuh/prj/d.lst
@@ -7,6 +7,7 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\auth
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree
+mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\beans
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\oleautomation
@@ -139,6 +140,8 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf
 ..\%__SRC%\inc\offuh\com\sun\star\awt\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree\*.hdl
 ..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\beans\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\beans\*.hdl
 ..\%__SRC%\inc\offuh\com\sun\star\beans\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\beans\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\*.hdl
commit 968edb5dedcf5f1ba550dd028d95d311544f60b1
Author: Vladimir Glazounov <vg at openoffice.org>
Date:   Wed Aug 26 10:09:17 2009 +0000

    CWS-TOOLING: integrate CWS dba32e
    2009-08-10 13:16:25 +0200 fs  r274805 : #i84390# typo corrected
    2009-08-10 13:04:28 +0200 fs  r274804 : #i103741# properly terminate the last token in a string with a 0 byte
    2009-07-24 08:54:05 +0200 msc  r274286 : #103219# changed long name
    2009-07-24 08:42:28 +0200 msc  r274285 : #i79649# changed behaviour of the wizard
    2009-07-22 14:17:49 +0200 oj  r274238 : GrabFocus
    2009-07-22 13:38:01 +0200 oj  r274232 : #i102934# mixed up
    2009-07-22 13:37:16 +0200 oj  r274231 : #i102934# mixed up
    2009-07-21 12:30:36 +0200 oj  r274176 : crash when using distinct
    2009-07-21 10:03:44 +0200 oj  r274163 : set last char to 0
    2009-07-21 09:31:22 +0200 oj  r274161 : mediatype corrected
    2009-07-20 11:45:33 +0200 fs  r274118 : typo in formatting string
    2009-07-20 11:40:39 +0200 fs  r274117 : removed unused include
    2009-07-20 11:40:01 +0200 fs  r274116 : class name corrected
    2009-07-16 13:41:45 +0200 oj  r274046 : i101587 wrong check for embeddeddatabase url in confguration, have to check path
    2009-07-16 13:12:05 +0200 tbo  r274044 : #i103219# adjust declarion to new hid.lst
    2009-07-16 12:43:48 +0200 oj  r274041 : #i102497# check also fot longvarchar
    2009-07-16 12:15:41 +0200 oj  r274039 : #i103030# handle type description and exceptions as well
    2009-07-16 11:14:26 +0200 fs  r274035 : let SVN ignore output paths
    2009-07-16 09:23:43 +0200 fs  r274030 : TransforFormComponentProperties: no need to check for attribute equality
    2009-07-10 14:16:23 +0200 oj  r273892 : CWS-TOOLING: rebase CWS dba32e to trunk at 273858 (milestone: DEV300:m52)
    2009-07-01 21:41:50 +0200 fs  r273614 : #i10000#
    2009-07-01 15:01:10 +0200 fs  r273589 : Input required doesn't make sense at all in XML form documents
    2009-07-01 12:10:31 +0200 fs  r273562 : updated
    2009-07-01 11:46:12 +0200 fs  r273560 : #i103219# add about 100 missing long names
    2009-07-01 10:11:41 +0200 fs  r273551 : moved from socket/port usage to pipe/name usage, which is more common nowadays
    2009-07-01 09:50:03 +0200 fs  r273549 : removed obsolete (empty) folder
    2009-07-01 09:47:35 +0200 fs  r273548 : copied the code for the Accessibility Workbench herein, formerly located in the old CVS repository, at gsl/awb
    2009-06-30 10:07:47 +0200 fs  r273493 : merging latest changes from CWS dba32d
    2009-06-29 20:46:31 +0200 fs  r273482 : #i103138# Rectangle conversions
    2009-06-29 10:01:13 +0200 fs  r273453 : #i103138#
    refactored the code for positioning/zooming the control
    Basically, we now allow adjustControlGeometry_throw (formerly known as positionControl_throw and setControlZoom) to
    take an additional ViewTransformation parameter, describing the transformation to obtain the actual
    control position/size. Consequently, positionControl itself also allows for a ViewTransformation parameter.
    This has become necessary since during painting, the device which we created our control for might not necessarily
    have a proper MapMode set. In this case, if we would use this map mode for calculating the control's position/size,
    this would lead to wrong results.
    Note that this problem was introduced by the fix for #i101398#: During the fix, we postponed the control creation
    to a later time (when it is really needed). At this later time, the MapMode at the device is broken, at the earlier
    time where we formerly crearted the control (createPrimitive2DSequence), it is not yet broken.
    Whether or not the MapMode is defined as "broken" might depend on one's point of view, however ...
    I consider it broken, since:
    - we need the map mode to obtain the proper zoom level, which is to be forwarded to the control
    - there are scenarios where the MapMode is *not* set to MAP_PIXEL (in those scenarios, everything works
      fine), and there are scenarios where it *is* set to MAP_PIXEL (in those the bug 103138 appears).
      It somehow feels wrong that one cannot rely on the device's map mode this way, but on the other hand
      one has no possibility to obtain the current zoom by other means.
    Note that one issue (still to be submitted) is left: In the page pane of a Draw/Impress document, controls
    have a wrong text size. This is because in this pane, the above-mentioned "broken" map mode is used,
    which means the controls have a zoom of "1:1" set, which is wrong here.
    2009-06-29 09:52:13 +0200 fs  r273452 : during #i103138#: belongsToDevice is unused nowadays
    2009-06-24 12:40:06 +0200 fs  r273329 : #i102888# #i102899#
    2009-06-24 12:10:29 +0200 oj  r273327 : #i103030# some code changes
    2009-06-24 09:44:14 +0200 oj  r273311 : #i103030# some code changes
    2009-06-24 09:24:42 +0200 oj  r273309 : #i103030# add log
    2009-06-24 09:03:29 +0200 fs  r273308 : if a col's table name is schema.table, properly quote all parts
    2009-06-24 08:56:06 +0200 oj  r273307 : #i102691# changed string
    2009-06-23 13:31:43 +0200 oj  r273280 : #i102479# fix date, time and datetime
    2009-06-23 12:51:28 +0200 oj  r273277 : #i103020# clear old expression when updating to avoid dead pointers in treelist userdata
    2009-06-23 12:17:16 +0200 oj  r273275 : #i103030# add LogBridge
    2009-06-23 11:53:10 +0200 oj  r273272 : shawdowed var resolved
    2009-06-23 11:48:49 +0200 oj  r273270 : #i103030# add :log to uno env if var UNO_ENV_LOG is set
    2009-06-23 11:47:47 +0200 oj  r273269 : #i103030# add LogBridge
    2009-06-23 11:47:11 +0200 oj  r273268 : #i103030# add LogBridge
    2009-06-23 08:05:08 +0200 oj  r273253 : #i102934# add key for collapsing
    2009-06-22 13:21:33 +0200 fs  r273225 : merging latest changes from CWS dba32d
    2009-06-22 13:15:22 +0200 fs  r273221 : why restrict to 12 entries?
    2009-06-22 08:12:21 +0200 oj  r273196 : #i102655# choosen > chosen typo fixed
    2009-06-22 08:08:04 +0200 oj  r273195 : #i102657# typo fix
    2009-06-22 08:06:28 +0200 oj  r273194 : #i102934# expanding and collasping of section
    2009-06-22 08:05:52 +0200 oj  r273193 : #i102930# set focus in treelistbox
    2009-06-22 08:04:56 +0200 oj  r273192 : #i102929# enable tabstop
    2009-06-19 13:18:26 +0200 oj  r273157 : remove unused param
    2009-06-19 10:07:05 +0200 oj  r273149 : CWS-TOOLING: rebase CWS dba32e to trunk at 272827 (milestone: DEV300:m50)
    2009-06-19 07:32:40 +0200 oj  r273146 : merge from dba32d to dba32e
    2009-06-19 07:22:56 +0200 oj  r273145 : merge from dba32d to dba32e
    2009-06-19 07:22:33 +0200 oj  r273144 : merge from dba32d to dba32e
    2009-06-18 14:09:34 +0200 fs  r273116 : merging the latest changes from CWS dba32d (up to revision 273108) herein, which effectively is a rebase to DEV300.m50
    2009-06-18 08:50:35 +0200 oj  r273098 : #i102894# fix for new line in text
    2009-06-18 08:28:48 +0200 oj  r273097 : #i102892# check any
    2009-06-18 08:21:34 +0200 oj  r273096 : check if error is valid
    2009-06-16 13:49:28 +0200 fs  r273019 : why make a drop down control by default? The form control factory in SVX does this better those days ...
    2009-06-10 09:53:20 +0200 oj  r272797 : add lic text
    2009-06-10 09:48:55 +0200 oj  r272796 : test added for i101618
    2009-06-09 14:57:39 +0200 oj  r272771 : #i101618# access database document only when script container is needed
    2009-06-09 12:42:25 +0200 oj  r272765 : #i102497# check type property
    2009-06-09 12:32:49 +0200 oj  r272764 : adjust test cases
    2009-06-09 12:31:58 +0200 oj  r272763 : adjust test cases
    2009-06-09 12:31:22 +0200 oj  r272762 : adjust test cases
    2009-06-09 11:35:42 +0200 oj  r272761 : check if error is valid
    2009-06-09 11:29:42 +0200 oj  r272760 : #i102497# longvarchar was missing
    2009-06-08 14:52:49 +0200 fs  r272733 : #i102564# when setting a new field, also set m_nFieldType
    2009-06-08 13:51:20 +0200 oj  r272730 : add tests
    2009-06-05 14:38:01 +0200 oj  r272686 : add dep
    2009-06-05 14:35:00 +0200 oj  r272684 : add new tests
    2009-06-05 13:41:18 +0200 oj  r272681 : code clean ups
    2009-06-05 12:40:51 +0200 oj  r272678 : code cleanup
    2009-06-05 12:02:57 +0200 oj  r272677 : code cleanup
    2009-06-05 10:42:38 +0200 oj  r272670 : #i49320# impl export of single rows and as RTF and HTML
    2009-06-03 14:30:37 +0200 oj  r272576 : #i79649# check if file matches filter wildcard
    2009-06-03 13:41:57 +0200 oj  r272560 : #i102470# impl not b like 'c'

diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst
index a0caa14..a22ca9e 100644
--- a/cppu/prj/build.lst
+++ b/cppu/prj/build.lst
@@ -8,4 +8,5 @@ cu	cppu\source\cppu				nmake	-	all	cu_cppu cu_inc NULL
 cu	cppu\source\helper\purpenv		nmake	-	all	cu_helper_purpenv cu_inc NULL
 cu	cppu\source\UnsafeBridge	    nmake	-	all	cu_UnsafeBridge cu_inc NULL
 cu	cppu\source\AffineBridge	    nmake	-	all	cu_AffineBridge cu_inc NULL
-cu	cppu\util						nmake	-	all	cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge NULL
+cu	cppu\source\LogBridge	        nmake	-	all	cu_LogBridge cu_inc NULL
+cu	cppu\util						nmake	-	all	cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index 3355b6d..411a51c 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -67,5 +67,8 @@ mkdir: %_DEST%\inc%_EXT%\uno
 ..\%__SRC%\bin\affine_u*.dll   %_DEST%\bin%_EXT%\*
 ..\%__SRC%\lib\libaffine_uno_uno.*   %_DEST%\lib%_EXT%\*
 
+..\%__SRC%\bin\log_u*.dll   %_DEST%\bin%_EXT%\*
+..\%__SRC%\lib\liblog_uno_uno.*   %_DEST%\lib%_EXT%\*
+
 linklib: libuno_cppu.*.*
 linklib: libuno_purpenvhelper*.*.*
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
new file mode 100755
index 0000000..f9cc1db
--- /dev/null
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -0,0 +1,280 @@
+/*************************************************************************
+ *
+ * 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: LogBridge.cxx,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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_cppu.hxx"
+
+#include "osl/mutex.hxx"
+#include "osl/thread.h"
+#include "uno/dispatcher.h"
+#include "typelib/typedescription.hxx"
+#include "cppu/helper/purpenv/Environment.hxx"
+#include "cppu/helper/purpenv/Mapping.hxx"
+#include "cppu/EnvDcp.hxx"
+#include "rtl/logfile.hxx"
+#include "uno/environment.hxx"
+#include <com/sun/star/uno/Type.hxx>
+#include <hash_map>
+#include <memory>
+
+namespace
+{
+class LogBridge : public cppu::Enterable
+{
+    osl::Mutex          m_mutex;
+    sal_Int32           m_count;
+    oslThreadIdentifier m_threadId;
+
+    virtual  ~LogBridge(void);
+
+public:
+    explicit LogBridge(void);
+
+    virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam);
+    virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam);
+
+    virtual void v_enter(void);
+    virtual void v_leave(void);
+
+    virtual int  v_isValid(rtl::OUString * pReason);
+};
+
+LogBridge::LogBridge(void)
+    : m_count   (0)
+      ,m_threadId(0)
+{
+}
+
+LogBridge::~LogBridge(void)
+{
+    OSL_ASSERT(m_count >= 0);
+}
+
+void LogBridge::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam)
+{
+    enter();
+    pCallee(pParam);
+    leave();
+}
+
+void LogBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam)
+{
+    OSL_ASSERT(m_count > 0);
+
+    -- m_count;
+    pCallee(pParam);
+    ++ m_count;
+
+    if (!m_threadId)
+        m_threadId = osl_getThreadIdentifier(NULL);
+}
+
+void LogBridge::v_enter(void)
+{
+    m_mutex.acquire();
+
+    OSL_ASSERT(m_count >= 0);
+
+    if (m_count == 0)
+        m_threadId = osl_getThreadIdentifier(NULL);
+
+    ++ m_count;
+}
+    
+void LogBridge::v_leave(void)
+{
+    OSL_ASSERT(m_count > 0);
+
+    -- m_count;
+    if (!m_count)
+        m_threadId = 0;
+
+
+    m_mutex.release();
+}
+
+int LogBridge::v_isValid(rtl::OUString * pReason)
+{
+    int result = 1;
+
+    result = m_count > 0;
+    if (!result)
+        *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
+
+    else
+    {
+        result = m_threadId == osl_getThreadIdentifier(NULL);
+
+        if (!result)
+            *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
+    }
+
+    if (result)
+        *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
+
+    return result;
+}
+
+    void traceValue(typelib_TypeDescriptionReference* _pTypeRef,void* pArg)
+    {
+        switch(_pTypeRef->eTypeClass)
+        {
+            case typelib_TypeClass_STRING:
+                {
+                    const ::rtl::OString sValue( ::rtl::OUStringToOString(*static_cast< ::rtl::OUString*>(pArg),osl_getThreadTextEncoding()));
+                    rtl_logfile_trace( "%s", sValue.getStr());
+                }
+                break;
+            case typelib_TypeClass_BOOLEAN:
+                rtl_logfile_trace( "%d", *static_cast<sal_Bool*>(pArg));
+                break;
+            case typelib_TypeClass_BYTE:
+                rtl_logfile_trace( "%d", *static_cast<sal_Int8*>(pArg));
+                break;
+            case typelib_TypeClass_CHAR:
+                rtl_logfile_trace( "%c", *static_cast<sal_Char*>(pArg));
+                break;
+            case typelib_TypeClass_SHORT:
+            case typelib_TypeClass_UNSIGNED_SHORT:
+                rtl_logfile_trace( "%d", *static_cast<sal_Int16*>(pArg));
+                break;
+            case typelib_TypeClass_LONG:
+            case typelib_TypeClass_UNSIGNED_LONG:
+            case typelib_TypeClass_ENUM:
+                rtl_logfile_trace( "%d", *static_cast<sal_Int32*>(pArg));
+                break;
+            case typelib_TypeClass_HYPER:
+            case typelib_TypeClass_UNSIGNED_HYPER:
+                rtl_logfile_trace( "%d", *static_cast<sal_Int64*>(pArg));
+                break;
+            case typelib_TypeClass_FLOAT:
+                rtl_logfile_trace( "%f", *static_cast<float*>(pArg));
+                break;
+            case typelib_TypeClass_DOUBLE:
+                rtl_logfile_trace( "%f", *static_cast<double*>(pArg));
+                break;
+            case typelib_TypeClass_TYPE:
+                {
+                    const ::rtl::OString sValue( ::rtl::OUStringToOString(((com::sun::star::uno::Type*)pArg)->getTypeName(),osl_getThreadTextEncoding()));
+                    rtl_logfile_trace( "%s", sValue.getStr());
+                }
+                break;
+            case typelib_TypeClass_ANY:
+                if ( static_cast<uno_Any*>(pArg)->pData )
+                    traceValue(static_cast<uno_Any*>(pArg)->pType,static_cast<uno_Any*>(pArg)->pData);
+                else
+                    rtl_logfile_trace( "void");
+                break;
+            case typelib_TypeClass_EXCEPTION:
+                rtl_logfile_trace( "exception");
+                break;
+            case typelib_TypeClass_INTERFACE:
+                {
+                    const ::rtl::OString sValue( ::rtl::OUStringToOString(_pTypeRef->pTypeName,osl_getThreadTextEncoding()));
+                    rtl_logfile_trace( "%s 0x%p", sValue.getStr(),pArg);
+                }
+                break;
+            case typelib_TypeClass_VOID:
+                rtl_logfile_trace( "void");
+                break;
+            default:
+                rtl_logfile_trace( "0x%p", pArg);
+                break;
+        } // switch(pParams[i].pTypeRef->eTypeClass)
+    }
+}
+
+void LogProbe(
+    bool                                pre,
+    void                              * /*pThis*/,
+    void                              * /*pContext*/,
+    typelib_TypeDescriptionReference  * pReturnTypeRef,
+    typelib_MethodParameter           * pParams,
+    sal_Int32                           nParams,
+    typelib_TypeDescription     const * pMemberType,
+    void                              * pReturn,
+    void                              * pArgs[],
+    uno_Any                          ** ppException )
+{
+    static ::std::auto_ptr< ::rtl::Logfile> pLogger;
+    ::rtl::OString sTemp;
+    if ( pMemberType && pMemberType->pTypeName )
+        sTemp = ::rtl::OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US);
+    if ( pre  )
+    {
+        rtl_logfile_longTrace( "{ LogBridge () %s", sTemp.getStr() );
+        if ( nParams )
+        {
+            rtl_logfile_trace( "\n| : ( LogBridge ");
+            for(sal_Int32 i = 0;i < nParams;++i)
+            {
+                if ( i > 0 )
+                    rtl_logfile_trace( ",");
+                traceValue(pParams[i].pTypeRef,pArgs[i]);
+                
+            }
+            rtl_logfile_trace( ")");
+        } // if ( nParams )
+        rtl_logfile_trace( "\n");
+    }
+    else if ( !pre )
+    {
+        rtl_logfile_longTrace( "} LogBridge () %s",sTemp.getStr());
+        if ( ppException && *ppException )
+        {
+            rtl_logfile_trace( " excption occured : ");
+            typelib_TypeDescription * pElementTypeDescr = 0;
+            TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType );
+            const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding()));
+            rtl_logfile_trace( "%s", sValue.getStr());
+            TYPELIB_DANGER_RELEASE( pElementTypeDescr );
+        }
+        else if ( pReturnTypeRef )
+        {
+            rtl_logfile_trace( " return : ");
+            traceValue(pReturnTypeRef,pReturn);
+        } // if ( pReturn && pReturnTypeRef )
+
+        rtl_logfile_trace( "\n");
+    }
+}
+
+extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv)
+    SAL_THROW_EXTERN_C()
+{
+    cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new LogBridge());
+}
+
+extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping     ** ppMapping,
+                                   uno_Environment  * pFrom,
+                                   uno_Environment  * pTo )
+{
+    cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo,LogProbe);
+}
diff --git a/cppu/source/LogBridge/makefile.mk b/cppu/source/LogBridge/makefile.mk
new file mode 100755
index 0000000..c7bc5e5
--- /dev/null
+++ b/cppu/source/LogBridge/makefile.mk
@@ -0,0 +1,48 @@
+#*************************************************************************
+#
+# 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.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.
+#
+#*************************************************************************
+
+PRJ     := ..$/..
+PRJNAME := cppu
+TARGET  := LogBridge
+
+ENABLE_EXCEPTIONS  := TRUE
+NO_BSYMBOLIC       := TRUE
+USE_DEFFILE        := FALSE
+
+
+.INCLUDE: settings.mk
+
+
+SLOFILES := $(SLO)$/LogBridge.obj
+
+
+.INCLUDE: target.mk
+
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk
index dc06e92..3aac052 100644
--- a/cppu/util/extra.mk
+++ b/cppu/util/extra.mk
@@ -72,6 +72,21 @@ SHL4DEF     := empty.def
 SHL4OBJS    := $(SLO)$/AffineBridge.obj
 SHL4RPATH   := URELIB
 
+
+SHL5TARGET  := log_uno_uno
+SHL5IMPLIB  := i$(SHL5TARGET)
+SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB)
+SHL5OBJS    := $(SLO)$/LogBridge.obj
+                
+.IF "$(GUI)"=="OS2"
+SHL5VERSIONMAP=unsafe_os2.map
+SHL5DEF=$(MISC)$/$(SHL5TARGET).def
+DEF5NAME=LogMapping.def
+.ELSE
+SHL5DEF     := empty.def
+.ENDIF
+SHL5RPATH   := URELIB
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 26dda6f..bbfead2 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -315,7 +315,26 @@ static OUString getLibEnv(OUString         const & aModulePath,
     }
     
     if (!pEnv->is() && pEnvTypeName)
+    {
         *pSourceEnv_name = OUString::createFromAscii(pEnvTypeName);
+        const char * pUNO_ENV_LOG = ::getenv( "UNO_ENV_LOG" );
+        if (pUNO_ENV_LOG && rtl_str_getLength(pUNO_ENV_LOG) )
+        {
+            OString implName(OUStringToOString(cImplName, RTL_TEXTENCODING_ASCII_US));
+            OString aEnv( pUNO_ENV_LOG );
+            sal_Int32 nIndex = 0;
+            do
+            {
+                const OString aStr( aEnv.getToken( 0, ';', nIndex ) );
+                if ( aStr.equals(implName) )
+                {
+                    *pSourceEnv_name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":log"));
+                    break;
+                }
+            } while( nIndex != -1 );            
+        }
+        
+    }
 
     return aExcMsg;
 }
diff --git a/ure/source/README b/ure/source/README
index 6528c58..eec7dc4 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -81,6 +81,7 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/liburp_uno.so  [private]
 /opt/openoffice.org/ure/lib/libunsafe_uno_uno.so  [private]
 /opt/openoffice.org/ure/lib/libaffine_uno_uno.so  [private]
+/opt/openoffice.org/ure/lib/liblog_uno_uno.so  [private]
 /opt/openoffice.org/ure/lib/libjpipe.so  [private]
 /opt/openoffice.org/ure/lib/libjuh.so  [private]
 /opt/openoffice.org/ure/lib/libjuhx.so  [private]
@@ -142,6 +143,7 @@ Program Files\URE\bin\cli_uno.dll [private]
 Program Files\URE\bin\urp_uno.dll  [private]
 Program Files\URE\bin\unsafe_uno_uno.dll  [private]
 Program Files\URE\bin\affine_uno_uno.dll  [private]
+Program Files\URE\bin\log_uno_uno.dll  [private]
 Program Files\URE\bin\jpipe.dll  [private]
 Program Files\URE\bin\juh.dll  [private]
 Program Files\URE\bin\juhx.dll  [private]
commit e966d788f53fabe766f9c8a562f54e257d7ebb58
Author: Release Engineers <releng at openoffice.org>
Date:   Wed Aug 26 09:55:20 2009 +0000

    CWS-TOOLING: integrate CWS fillednetchart
    2009-07-22 17:48:07 +0200 oc  r274255 : #i103584# new testcase for fillednetchart added
    2009-07-22 17:42:41 +0200 oc  r274254 : #i103584# Case 8 set to maximum 4 because of new fillednetchart
    2009-07-13 17:29:40 +0200 iha  r273946 : CWS-TOOLING: rebase CWS fillednetchart to trunk at 273858 (milestone: DEV300:m52)
    2009-07-03 15:04:36 +0200 dr  r273704 : #i102667# import/export of filled radar charts
    2009-07-03 09:50:28 +0200 dr  r273680 : #i102677# import filled radar charts from MSOOXML
    2009-06-11 18:21:05 +0200 iha  r272896 : #i64752# filled net chart
    2009-06-11 17:30:46 +0200 iha  r272892 : #i64752# filled net chart
    2009-06-11 17:07:11 +0200 iha  r272889 : #i64752# filled net chart
    2009-06-11 16:25:01 +0200 iha  r272883 : #i64752# filled net chart
    2009-06-11 16:15:10 +0200 iha  r272878 : #i64752# filled net chart

diff --git a/offapi/com/sun/star/chart/FilledNetDiagram.idl b/offapi/com/sun/star/chart/FilledNetDiagram.idl
new file mode 100644
index 0000000..58a7d0a
--- /dev/null
+++ b/offapi/com/sun/star/chart/FilledNetDiagram.idl
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * 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: FilledNetDiagram.idl,v $
+ * $Revision: 1.10 $
+ *
+ * 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_chart_FilledNetDiagram_idl__ 
+#define __com_sun_star_chart_FilledNetDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
+#include <com/sun/star/chart/StackableDiagram.idl> 
+#endif 
+
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisXSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisYSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
+/** specifies filled net diagrams. @since OOo 3.2
+
+    <p>Net diagrams are also known as radar diagrams.</p>
+ */
+published service FilledNetDiagram
+{ 
+    service com::sun::star::chart::Diagram; 
+    service com::sun::star::chart::ChartAxisXSupplier;
+    service com::sun::star::chart::ChartAxisYSupplier; 
+    service com::sun::star::chart::StackableDiagram; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/makefile.mk b/offapi/com/sun/star/chart/makefile.mk
index 802c832..781c78d 100644
--- a/offapi/com/sun/star/chart/makefile.mk
+++ b/offapi/com/sun/star/chart/makefile.mk
@@ -91,6 +91,7 @@ IDLFILES=\
     Diagram.idl\
     Dim3DDiagram.idl\
     DonutDiagram.idl\
+    FilledNetDiagram.idl\
     LineDiagram.idl\
     MissingValueTreatment.idl\
     NetDiagram.idl\
commit 92006645d84a6599cce827062831ae4375fd8f15
Author: Release Engineers <releng at openoffice.org>
Date:   Wed Aug 26 08:22:01 2009 +0000

    CWS-TOOLING: integrate CWS jl127
    2009-07-30 10:12:10 +0200 jl  r274470 : #i100873# switch on checking for symbol definitions. It works with the current xpcom lib.
    2009-07-29 09:48:29 +0200 jl  r274443 : #i100873#
    2009-07-29 09:47:36 +0200 jl  r274442 : #i100873# changes after resync with DEV300m53 which contains the seamonkey update
    2009-07-28 10:00:03 +0200 jl  r274389 : #100873# Patches from tono
    2009-07-27 16:59:39 +0200 jl  r274372 : CWS-TOOLING: rebase CWS jl127 to trunk at 274203 (milestone: DEV300:m53)
    2009-07-07 09:08:53 +0200 jl  r273768 : #100873#
    2009-07-06 17:16:10 +0200 jl  r273754 : #100873#
    2009-07-01 13:58:09 +0200 jl  r273576 : #100873# added to readme
    2009-07-01 13:15:02 +0200 jl  r273573 : #100873# deliver lib files when building with MS compiler
    2009-06-30 11:22:06 +0200 jl  r273498 : #i100873# accidentally commented out patch_files
    2009-06-30 09:01:10 +0200 jl  r273489 : #100873# make rc.exe work in ooo windows build
    2009-06-29 09:47:56 +0200 jl  r273451 : #i100873# applied mingw patch from tono
    2009-06-24 12:52:14 +0200 jl  r273332 : #100873# reapplying the configure.in patch on version 273150
    2009-06-24 12:51:12 +0200 jl  r273331 : #100873# reapplying the patch on version 273150
    2009-06-23 17:17:36 +0200 jl  r273299 : #100873# manually modified patch from tono
    2009-06-22 17:05:41 +0200 jl  r273243 : #100873# applying mingw patch from tono
    2009-06-22 17:02:30 +0200 jl  r273242 : #100873# applying mingw patch from tono
    2009-06-22 12:49:57 +0200 jl  r273216 : #100873# dependency to stlport
    2009-06-19 11:56:16 +0200 jl  r273155 : #100873# undoing a previous change, instset_native complained about missing libjpipe.jnilib (jurt)
    2009-06-19 10:13:03 +0200 jl  r273150 : #100873# ooo builds shall also use the new nss by default
    2009-06-18 14:32:07 +0200 jl  r273117 : #110873# more debug output when verifying a certificate
    2009-06-16 11:23:50 +0200 jl  r273012 : #i10873#
    2009-06-16 10:57:41 +0200 jl  r273011 : #100873# wrong parameter definition in nsscrypto_initialize
    2009-06-16 10:56:45 +0200 jl  r273010 : #100873# wrong parameter definition in nsscrypto_initialize
    2009-06-15 16:20:42 +0200 jl  r272996 : #100873# initialization of NSS is now threadsafe
    2009-06-10 12:50:46 +0200 jl  r272804 : #100873# rename in foreach fails in 4nt
    2009-06-09 13:43:00 +0200 jl  r272768 : #i100873# deliver only .h from inc/nss otherwise we get a warning when nss/nssck.api is delivered
    2009-06-08 16:15:44 +0200 jl  r272739 : #i100873#
    2009-06-08 16:04:54 +0200 jl  r272738 : #i100873#
    2009-06-08 15:45:52 +0200 jl  r272736 : #i100873#
    2009-06-08 15:44:15 +0200 jl  r272735 : #i100873# unzipping of nss.tar.z not working with 4nt
    2009-06-08 09:45:46 +0200 jl  r272720 : #i100873#
    2009-06-03 13:53:52 +0200 jl  r272562 : #i100873#  MOZILLABUILD not correct
    2009-06-03 13:17:54 +0200 jl  r272557 : #i100873#  readme and makefile changes from cws jl125, support of new nss module
    2009-06-03 09:57:40 +0200 jl  r272544 : #i100873#  added readme
    2009-06-02 16:47:47 +0200 jl  r272512 : #i100873#  removed no longer needed stuff regarding jnilibs
    2009-06-02 15:54:42 +0200 jl  r272510 : #i100873# added NSS to BUILD_TYPE
    2009-06-02 15:20:18 +0200 jl  r272508 : #i100873# DEREFERENCE option for copy command
    2009-06-02 13:00:12 +0200 jl  r272496 : #i100873# PATCH_FILE_NAMES is now PATCH_FILES
    2009-06-02 12:23:39 +0200 jl  r272494 : #i100873# build dependency to nss
    2009-05-29 16:21:40 +0200 jl  r272470 : #i100873# seting ENABLE_NSS_MODULE==YES and includeing mozilla-build-1.3 folder in environment
    2009-05-29 16:03:23 +0200 jl  r272468 : #i100873# use intermediate certificates when validating a certificate
    2009-05-29 15:57:16 +0200 jl  r272466 : #i100873# use intermediate certificates when validating a certificate
    2009-05-29 15:49:58 +0200 jl  r272464 : #i100873# using ENABLE_NSS_MODULE
    2009-05-29 15:33:14 +0200 jl  r272463 : #i100873# using ENABLE_NSS_MODULE
    2009-05-29 15:28:39 +0200 jl  r272461 : #i100873# build dependency to nss module
    2009-05-29 15:24:57 +0200 jl  r272460 : #i100873# pass additional certificates into verifyCertificate function
    2009-05-29 14:49:40 +0200 jl  r272458 : #i100873# new NSS module
    2009-05-29 14:43:44 +0200 jl  r272457 : #i100873# new NSS module

diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index 56210b9..ffc6791 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -78,14 +78,26 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface
     com::sun::star::security::XCertificate createCertificateFromAscii( [in] string asciiCertificate ) raises( com::sun::star::uno::SecurityException ) ;
 
     /**
-     * Verify a certificate.
-     *
-     * The method provides a way to verify a certificate.
-     * 
-     * The validation status will returned as a bit-wise long, please refer to
-     * CertificateValidity definition.
+      Verify a certificate.
+     
+      The method provides a way to verify a certificate.
+      @param xEECertificate
+          The certificate which is to be validated.
+
+      @param intermediateCertificates
+          Additional certificates which can be used by the method in constructing
+          the certificate chain. The root certificate may also be contained. However,
+          the implementation must check if the root certificate is indeed trusted by
+          the user.
+          All entries of the sequence must be non-null references.
+
+      @return
+          The validation status will returned as a bit-wise long, please refer to
+          CertificateValidity definition.
      */
-    long verifyCertificate( [in] com::sun::star::security::XCertificate xCertificate ) raises( com::sun::star::uno::SecurityException ) ;
+    long verifyCertificate( [in] com::sun::star::security::XCertificate xEECertificate,
+        [in] sequence< com::sun::star::security::XCertificate > intermediateCertificates)
+        raises( com::sun::star::uno::SecurityException ) ;
 
     /**
      * Get a certificate characters.
commit 718ebbab3e29570d7134daaf5cf8d93304110ca8
Author: Vladimir Glazounov <vg at openoffice.org>
Date:   Wed Aug 26 06:36:38 2009 +0000

    CWS-TOOLING: integrate CWS mingwport22
    2009-08-19 16:18:46 +0200 tono  r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
    2009-08-05 12:27:41 +0200 tono  r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk at 274622 (milestone: DEV300:m54)
    2009-08-01 00:56:35 +0200 tono  r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll
    2009-07-27 00:13:27 +0200 tono  r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll
    2009-07-25 06:19:59 +0200 tono  r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static"
    2009-07-25 06:13:56 +0200 tono  r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread
    2009-07-25 06:05:22 +0200 tono  r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section
    2009-07-25 05:54:09 +0200 tono  r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope
    2009-07-25 05:44:58 +0200 tono  r274328 : i#103799: mingw gcc-4.4.0 port: add some #include
    2009-07-25 05:33:09 +0200 tono  r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path
    2009-07-25 05:24:42 +0200 tono  r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge
    2009-07-25 05:16:20 +0200 tono  r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll
    2009-07-25 04:01:59 +0200 tono  r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
    2009-07-25 02:44:01 +0200 tono  r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging
    2009-07-25 02:28:21 +0200 tono  r274321 : i#103791: mingw port fix typo

diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index 461e342..0fc696a 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -32,6 +32,7 @@
 #include "precompiled_bridges.hxx"
 
 #include <stdio.h>
+#include <string.h>
 #include <cxxabi.h>
 #include <hash_map>
 
diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
index 823c388..242d216 100644
--- a/bridges/source/cpp_uno/mingw_intel/makefile.mk
+++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk
@@ -47,11 +47,17 @@ ENABLE_EXCEPTIONS=TRUE
 .IF "$(cppu_no_leak)" == ""
 CFLAGS += -DLEAK_STATIC_DATA
 .ENDIF
+.IF "$(EXCEPTIONS)" == "sjlj"
+CFLAGS += -DBROKEN_ALLOCA
+.ENDIF
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
 CFLAGSCXX += -fno-omit-frame-pointer
 
+NOOPTFILES= \
+    $(SLO)$/uno2cpp.obj
+
 CFLAGSNOOPT=-O0
 
 SLOFILES= \
diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
index 2c10983..4c864c5 100644
--- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
@@ -44,10 +44,6 @@
 #include "share.hxx"
 #include "smallstruct.hxx"
 
-#ifdef __MINGW32__
-#define BROKEN_ALLOCA
-#endif
-
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index d607194..661bbe1 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -41,10 +41,6 @@
 #include <algorithm>
 
 
-#ifdef __MINGW32__
-#define BROKEN_ALLOCA
-#endif
-
 using namespace ::rtl;
 
 namespace jni_uno
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 27724b4..2ea0632 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -40,10 +40,6 @@
 #include "jni_bridge.h"
 
 
-#ifdef __MINGW32__
-#define BROKEN_ALLOCA
-#endif
-
 using namespace ::std;
 using namespace ::rtl;
 
diff --git a/bridges/source/jni_uno/makefile.mk b/bridges/source/jni_uno/makefile.mk
index 36f6ffb..d020eb7 100644
--- a/bridges/source/jni_uno/makefile.mk
+++ b/bridges/source/jni_uno/makefile.mk
@@ -47,6 +47,12 @@ nojava:
 
 # --- Files --------------------------------------------------------
 
+.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(EXCEPTIONS)" == "sjlj"
+CFLAGS += -DBROKEN_ALLOCA
+.ENDIF
+.ENDIF
+
 SLOFILES= \
     $(SLO)$/jni_info.obj		\
     $(SLO)$/jni_data.obj		\
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
index e2a91cf..52a8561 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -142,7 +142,9 @@ STDSHL=
 .IF "$(COM)"=="GCC"
 SHL1STDLIBS=\
         -lmingw32 \
-        -lgcc
+        $(MINGW_LIBGCC)
+MINGWSSTDOBJ=
+MINGWSSTDENDOBJ=
 .ELSE
 SHL1STDLIBS=\
         unicows.lib
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index f56e6f8..bc8026a 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -113,6 +113,10 @@ SHL1STDLIBS=	\
                 $(COMDLG32LIB)\
                 $(USER32LIB)\
                 $(OLE32LIB)
+.IF "$(COM)"=="GCC"
+MINGWSSTDOBJ=
+MINGWSSTDENDOBJ=
+.ENDIF
 .ENDIF # WNT
 
 .IF "$(GUI)"=="UNX"


More information about the ooo-build-commit mailing list