You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 22:10:21 UTC

svn commit: r1409400 [2/4] - in /incubator/ooo/branches/gbuild/main: ./ UnoControls/prj/ accessibility/prj/ animations/prj/ basctl/source/dlged/ basegfx/prj/ basic/prj/ binaryurp/prj/ binfilter/bf_svx/source/items/ binfilter/bf_svx/source/unodraw/ binf...

Modified: incubator/ooo/branches/gbuild/main/hwpfilter/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/hwpfilter/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/hwpfilter/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/hwpfilter/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,4 +1,4 @@
-hw	hwpfilter	:	offuh cppuhelper comphelper ZLIB:zlib LIBXSLT:libxslt NULL
+hw	hwpfilter	:	offapi cppuhelper comphelper ZLIB:zlib LIBXSLT:libxslt NULL
 hw	hwpfilter							usr1	-	all	hw_mkout NULL
 hw	hwpfilter\prj						get		-	all	hw_prj NULL
 hw	hwpfilter\inc						nmake	-	all	hw_inc NULL

Modified: incubator/ooo/branches/gbuild/main/i18nutil/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/i18nutil/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/i18nutil/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/i18nutil/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,3 +1,3 @@
-inu  i18nutil    :   sal cppu offuh NULL
+inu  i18nutil    :   sal cppu offapi NULL
 inu  i18nutil                                   usr1    -   all inu_mkout NULL
 inu  i18nutil\source\utility                    nmake   -   all inu_utility NULL

Modified: incubator/ooo/branches/gbuild/main/jvmaccess/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/jvmaccess/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/jvmaccess/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/jvmaccess/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,4 +1,4 @@
-jv jvmaccess : offuh ridljar cppu sal salhelper NULL
+jv jvmaccess : offapi ridljar cppu sal salhelper NULL
 jv jvmaccess usr1 - all jv_mkout NULL
 jv jvmaccess\source nmake - all jv_source NULL
 jv jvmaccess\util nmake - all jv_util jv_source NULL

Modified: incubator/ooo/branches/gbuild/main/mysqlc/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/mysqlc/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/mysqlc/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/mysqlc/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,3 +1,3 @@
-mc	mysqlc	:	solenv offuh cppu soltools cppuhelper readlicense_oo NULL
+mc	mysqlc	:	solenv offapi cppu soltools cppuhelper readlicense_oo NULL
 ch	mysqlc              usr1    -	all mc_mkout NULL
 mc	mysqlc\source       nmake   -   all mc_source NULL

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl Wed Nov 14 21:10:00 2012
@@ -67,8 +67,6 @@ interface XTargetPropertiesCreator : ::c
 
 //============================================================================= 
 
-service TargetPropertiesCreator: XTargetPropertiesCreator;
- 
 }; }; }; };  
 
 #endif

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl Wed Nov 14 21:10:00 2012
@@ -206,10 +206,6 @@ interface XDatabaseDataProvider
 	[attribute,bound] string DataSourceName;
 }; 
  
-service DatabaseDataProvider : XDatabaseDataProvider
-{
-    createWithConnection([in] com::sun::star::sdbc::XConnection connection);
-};
 //============================================================================= 
  
  }; }; }; };  };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/SlideSorter.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/SlideSorter.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/SlideSorter.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/SlideSorter.idl Wed Nov 14 21:10:00 2012
@@ -42,92 +42,12 @@
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
+#ifndef __com_sun_star_drawing_XSlideSorterBase_idl__
+#include <com/sun/star/drawing/XSlideSorterBase.idl>
+#endif
 
 module com {  module sun {  module star {  module drawing {
 
-/** This interface exists only because services do not directly support
-    multiple inheritance and attributes.
-    <p>It provides the interfaces and attributes that every object that
-    implements the <type>SlideSorter</type> service.</p>
-*/
-interface XSlideSorterBase
-{
-    /** This interface is included to mark a <type>SlideSorter</type> object
-        as view of the drawing framework and to provide a
-        <type>ResourceId</type>.
-    */
-    interface ::com::sun::star::drawing::framework::XView;
-
-    /** The <type>XDrawView</type> interface is included to provide access
-        to the current slide (especially write access).
-    */
-    interface ::com::sun::star::drawing::XDrawView;
-
-    /** The set of slides that are displayed by the implementing object.
-        <p>The default value is the set of all slides of the document for
-        which a slide sorter is created.</p>
-    */
-    [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides;
-
-    /** Set this flag to <TRUE/> in order to have the current slide
-        highlighted.
-        <p>The default value is <FALSE/>.</p>
-    */
-    [attribute] boolean IsHighlightCurrentSlide;
-
-    /** Set this flag to <TRUE/> in order to visualize the selection of
-        slides (typically a bold frame around the selected slides).
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsShowSelection;
-
-    /** Set this flag to <TRUE/> to visualize to where the focus is by
-        showing a dotted rectangle around the focused slide.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsShowFocus;
-
-    /** When this flag has the value <TRUE/> then every time the current
-        slide is changed the visual area is shifted so that the new current
-        slide is display in the center of the slide sorter window.
-        <p>It is not always possible to move the current slide into the
-        exact center of the window, for example when slides are located near
-        the start or end of a document.</p>
-        <p>The default value is <FALSE/>.
-    */
-    [attribute] boolean IsCenterSelection;
-
-    /** This flag controls whether updates of previews are created during
-        full screen presentations (<FALSE/>) or not (<TRUE/>).  The
-        suspension of preview creations is an optimization for not slowing
-        down a running presentation.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation;
-
-    /** The orientation of a slide sorter can be either vertical (<TRUE/>)
-        or horizontal (<FALSE/>).
-    */
-    [attribute] boolean IsOrientationVertical;
-
-    /** This flag is a hint to make scrolling look smooth.
-    */
-    [attribute] boolean IsSmoothScrolling;
-
-    [attribute] ::com::sun::star::util::Color BackgroundColor;
-    [attribute] ::com::sun::star::util::Color TextColor;
-    [attribute] ::com::sun::star::util::Color SelectionColor;
-    [attribute] ::com::sun::star::util::Color HighlightColor;
-
-    /** This flag controls whether the model can be modified by using
-        keyboard or mouse.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsUIReadOnly;
-};
-
-
-
 
 /** A slide sorter shows previews for a set of slides, typically all slides
     in a document, and allows the selection, reordering, creation, and

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XPresenterHelper.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XPresenterHelper.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XPresenterHelper.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XPresenterHelper.idl Wed Nov 14 21:10:00 2012
@@ -36,15 +36,12 @@
 #ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
 #endif
+#ifndef __com_sun_star_drawing_CanvasFeature_idl__
+#include <com/sun/star/drawing/CanvasFeature.idl>
+#endif
 
 module com { module sun { module star { module drawing {
 
-constants CanvasFeature
-{
-    const short None = 0;
-    const short SpriteCanvas = 1;
-};
-
 /** This interface is a collection of functions that are necessary to
     implement larger parts of the presenter screen as extension.  The
     methods of this interface give access to services that can, at the

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl Wed Nov 14 21:10:00 2012
@@ -39,28 +39,12 @@
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
+#ifndef __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
+#include <com/sun/star/drawing/XSlidePreviewCacheListener.idl>
+#endif
 
 module com { module sun { module star { module drawing {
 
-/** Listener for asynchronous preview creations.  Called when a slide
-    preview has been created that was previously requested via a call to
-    <method>XSlidePreviewCache::getSlidePreview()</method>.  The
-    implementor may then call <method>getSlidePreview()</method> a second
-    time to get the up-to-date version of the preview.
-*/
-published interface XSlidePreviewCacheListener
-{
-    /** Called by a <interface>XSlidePreviewCache</interface> object when a
-        preview has been created for the slide with the given index.
-        @param nSlideIndex
-            The index of the slide for which a new preview has been created.
-    */
-    void notifyPreviewCreation ([in] long nSlideIndex);
-};
-
-
-
-
 /** A cache of preview bitmaps for the slides of one Impress or Draw
     document in one size.  There may be more than one cache for one
     document.  These are internally connected and for missing previews one

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl Wed Nov 14 21:10:00 2012
@@ -33,20 +33,12 @@
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
+#ifndef __com_sun_star_rendering_drawing_framework_BorderType_idl__
+#include <com/sun/star/drawing/framework/BorderType.idl>
+#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-/** See XPaneBorderPainter and its addBorder() and removeBorder() methods
-    for an explanation of the border type and its values.
-*/
-published enum BorderType
-{
-    INNER_BORDER,
-    OUTER_BORDER,
-    TOTAL_BORDER
-};
-
-
 /** Paint the border around a rectangular region, typically a pane.
 
     <p>Calling objects have to be able to derive inner bounding boxs of the

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/frame/XUntitledNumbers.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/frame/XUntitledNumbers.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/frame/XUntitledNumbers.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/frame/XUntitledNumbers.idl Wed Nov 14 21:10:00 2012
@@ -35,11 +35,6 @@
 
  module com {  module sun {  module star {  module frame {
 
-constants UntitledNumbersConst
-{
-    const long INVALID_NUMBER = 0;
-};
- 
 //=============================================================================
 /** knows all currently used and all free numbers for using with untitled
     but counted objects.

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/inspection/XStringRepresentation.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/inspection/XStringRepresentation.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/inspection/XStringRepresentation.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/inspection/XStringRepresentation.idl Wed Nov 14 21:10:00 2012
@@ -59,11 +59,6 @@ published interface XStringRepresentatio
                         ) raises( com::sun::star::uno::Exception );
 };
 
-service StringRepresentation : XStringRepresentation
-{
-    create([in]com::sun::star::script::XTypeConverter TypeConverter)raises( com::sun::star::lang::IllegalArgumentException );
-    createConstant([in]com::sun::star::script::XTypeConverter TypeConverter,[in] string Constant,[in] sequence<string> Values)raises( com::sun::star::lang::IllegalArgumentException );
-};
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XSlideShow.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XSlideShow.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XSlideShow.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XSlideShow.idl Wed Nov 14 21:10:00 2012
@@ -365,8 +365,6 @@ interface XSlideShow : ::com::sun::star:
 
 };
 
-service SlideShow : XSlideShow;
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XTransitionFactory.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XTransitionFactory.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XTransitionFactory.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XTransitionFactory.idl Wed Nov 14 21:10:00 2012
@@ -80,8 +80,6 @@ interface XTransitionFactory : ::com::su
                                   [in] com::sun::star::rendering::XBitmap    enteringBitmap );
 };
 
-service TransitionFactory : XTransitionFactory;
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl Wed Nov 14 21:10:00 2012
@@ -35,9 +35,6 @@
 #ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
 #endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
-#include <com/sun/star/rendering/XBitmap.idl>
-#endif
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
@@ -125,23 +122,6 @@ published interface XBitmapCanvas : XCan
 
 };
 
-//=============================================================================
-
-// TODO: Multiple-inheritance interfaces
-
-/** This service provides the interfaces for a <type>XBitmapCanvas</type>
- */
-service BitmapCanvas
-{
-    /** Canvas interface, to issue rendering operations.
-     */
-    interface XBitmapCanvas;
-
-    /** Bitmap interface, to directly manipulate the pixel.
-     */
-    interface XBitmap;
-};
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XCanvas.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XCanvas.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XCanvas.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XCanvas.idl Wed Nov 14 21:10:00 2012
@@ -730,11 +730,6 @@ published interface XCanvas : ::com::sun
     XGraphicDevice			getDevice();
 };
 
-//=============================================================================
-
-/// Service providing an <type>XCanvas</type> interface
-service Canvas: XCanvas;
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XColorSpace.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XColorSpace.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XColorSpace.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XColorSpace.idl Wed Nov 14 21:10:00 2012
@@ -35,47 +35,18 @@
 #ifndef __com_sun_star_rendering_ColorProfile_idl__
 #include <com/sun/star/rendering/ColorProfile.idl>
 #endif
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
+#endif
+#ifndef __com_sun_star_rendering_RGBColor_idl__
+#include <com/sun/star/rendering/RGBColor.idl>
+#endif
+#ifndef __com_sun_star_rendering_ARGBColor_idl__
+#include <com/sun/star/rendering/ARGBColor.idl>
+#endif
 
 module com { module sun { module star { module rendering {
 
-/// Shorthand for the device-dependent color components, and easier to read
-published typedef double ColorComponent;
-published typedef sequence<ColorComponent> Color;
-
-//=============================================================================
-
-/// RGB color triplet
-published struct RGBColor
-{
-    /// Red component. Valid range is [0,1.0]
-    ColorComponent Red;
-    /// Green component. Valid range is [0,1.0]
-    ColorComponent Green;
-    /// Blue component. Valid range is [0,1.0]
-    ColorComponent Blue;
-};
-
-//=============================================================================
-
-/// ARGB color quad
-published struct ARGBColor
-{
-    /** Alpha component.<p>
-
-        Valid range is [0,1.0], with 0.0 denoting fully transparent,
-        and 1.0 fully opaque.
-     */
-    ColorComponent Alpha;
-    /// Red component. Valid range is [0,1.0]
-    ColorComponent Red;
-    /// Green component. Valid range is [0,1.0]
-    ColorComponent Green;
-    /// Blue component. Valid range is [0,1.0]
-    ColorComponent Blue;
-};
-
-//=============================================================================
-
 /** Information how to interpret certain color data.<p>
 
     This interface encapsulates all information that is necessary to

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedLine.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedLine.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedLine.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedLine.idl Wed Nov 14 21:10:00 2012
@@ -93,7 +93,6 @@ published interface XFixedLine
     //-------------------------------------------------------------------------
 };
 
-published service FixedLine : XFixedLine;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedText.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedText.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedText.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedText.idl Wed Nov 14 21:10:00 2012
@@ -40,7 +40,6 @@ published interface XFixedText
     [attribute,bound] string Label;
 };
 
-published service FixedText : XFixedText;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormatCondition.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormatCondition.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormatCondition.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormatCondition.idl Wed Nov 14 21:10:00 2012
@@ -50,7 +50,6 @@ published interface XFormatCondition
     [attribute,bound] string Formula;
 };
 
-service FormatCondition : XFormatCondition;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormattedField.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormattedField.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormattedField.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormattedField.idl Wed Nov 14 21:10:00 2012
@@ -57,7 +57,6 @@ published interface XFormattedField
     [attribute,bound] com::sun::star::util::XNumberFormatsSupplier FormatsSupplier;
 };
 
-published service FormattedField : XFormattedField;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFunction.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFunction.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFunction.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFunction.idl Wed Nov 14 21:10:00 2012
@@ -76,10 +76,6 @@ published interface XFunction
     [attribute,bound] com::sun::star::beans::Optional<string> InitialFormula;
 };
 
-service Function : XFunction
-{
-    create();
-};
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroup.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroup.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroup.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroup.idl Wed Nov 14 21:10:00 2012
@@ -134,7 +134,6 @@ published interface XGroup
     [attribute,bound] boolean ResetPageNumber;
 };
 
-service Group : XGroup;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroups.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroups.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroups.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroups.idl Wed Nov 14 21:10:00 2012
@@ -71,7 +71,6 @@ published interface XGroups
     [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
 };
 
-service Groups : XGroups;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XImageControl.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XImageControl.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XImageControl.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XImageControl.idl Wed Nov 14 21:10:00 2012
@@ -77,7 +77,6 @@ published interface XImageControl
     [attribute,bound] boolean PreserveIRI;
 };
 
-published service ImageControl : XImageControl;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlFormat.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlFormat.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlFormat.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlFormat.idl Wed Nov 14 21:10:00 2012
@@ -602,7 +602,6 @@ published interface XReportControlFormat
     };
 };
 
-service ReportControlFormat : XReportControlFormat;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlModel.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlModel.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlModel.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlModel.idl Wed Nov 14 21:10:00 2012
@@ -100,7 +100,6 @@ published interface XReportControlModel
     };
 };
 
-service ReportControlModel : XReportControlModel;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportDefinition.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportDefinition.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportDefinition.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportDefinition.idl Wed Nov 14 21:10:00 2012
@@ -347,7 +347,6 @@ published interface XReportDefinition
     };
 };
 
-published service ReportDefinition : XReportDefinition;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XSection.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XSection.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XSection.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XSection.idl Wed Nov 14 21:10:00 2012
@@ -180,7 +180,6 @@ published interface XSection
     [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
 };
 
-service Section : XSection;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XShape.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XShape.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XShape.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XShape.idl Wed Nov 14 21:10:00 2012
@@ -81,7 +81,6 @@ published interface XShape
     [attribute,bound] boolean Opaque;
 };
 
-service Shape : XShape;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/setup/InstallResponse.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/setup/InstallResponse.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/setup/InstallResponse.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/setup/InstallResponse.idl Wed Nov 14 21:10:00 2012
@@ -23,18 +23,10 @@
 #ifndef __com_sun_star_setup_InstallResponse_idl__ 
 #define __com_sun_star_setup_InstallResponse_idl__ 
  
+#include <com/sun/star/setup/ResponseErrorCode.idl>
+
 module com {  module sun {  module star {  module setup { 
 	 
-/// @deprecated
-published enum ResponseErrorCode
-{ 
-	// DocMerge: empty anyway
-	NOERROR, 
-		
-	// DocMerge: empty anyway
-	NOT_ENOUGH_SPACE 
-	}; 
- 
 // DocMerge: empty anyway
 published struct InstallResponse
 {

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl Wed Nov 14 21:10:00 2012
@@ -141,10 +141,6 @@ published interface XFormulaOpCodeMapper
 
 //=============================================================================
 
-service FormulaOpCodeMapper : XFormulaOpCodeMapper;
-
-//=============================================================================
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sync/SyncInfo.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sync/SyncInfo.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sync/SyncInfo.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sync/SyncInfo.idl Wed Nov 14 21:10:00 2012
@@ -27,13 +27,14 @@
 #ifndef __com_sun_star_sync_SyncScheme_idl__ 
 #include <com/sun/star/sync/SyncScheme.idl> 
 #endif 
+#ifndef __com_sun_star_sync_FilterData_idl__
+#include <com/sun/star/sync/FilterData.idl>
+#endif
  
 //============================================================================= 
  
 module com {  module sun {  module star {  module sync {  
  
-published typedef sequence< string > FilterData; 
- 
 //============================================================================= 
  
 /// @deprecated

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/util/XTextSearch.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/util/XTextSearch.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/util/XTextSearch.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/util/XTextSearch.idl Wed Nov 14 21:10:00 2012
@@ -27,7 +27,8 @@
 
 #include <com/sun/star/lang/Locale.idl>
 #include <com/sun/star/uno/XInterface.idl>
-//#include <com/sun/star/lang/CascadeTransliterator.idl>
+#include <com/sun/star/util/SearchOptions.idl>
+#include <com/sun/star/util/SearchResult.idl>
 
 //=============================================================================
 
@@ -35,181 +36,6 @@ module com { module sun { module star { 
 
 //=============================================================================
 
-
-published enum SearchAlgorithms
-{
-    /// Literal
-    ABSOLUTE,   // implemented as a kind of Boyer-Moore
-    /// Regular expression
-    REGEXP,
-    /// Weighted Levenshtein Distance
-    APPROXIMATE
-};
-
-/// Flags for search methods
-published constants SearchFlags
-{
-    /**
-        @deprecated The constant ALL_IGNORE_CASE is never supported - use
-                    <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const> 
-                    with 
-                    <member>SearchOptions::transliterateFlags</member> 
-                    instead.
-
-        @see <type scope="com::sun::star::i18n">TransliterationModules</type> 
-    */
-    const long  ALL_IGNORE_CASE     = 0x00000001;
-
-    /** Flag for normal (Boyer-Moore) search / Search for word only. */
-    const long  NORM_WORD_ONLY      = 0x00000010;
-
-    /** Flag for "regular expression" search / Interpret as extended 
-        regular expression.
-
-        @deprecated The flag is currently not supported by OOo.
-    */
-    const long  REG_EXTENDED        = 0x00000100;
-
-    /** Flag for "regular expression" search / No register information 
-        or backreferences, i.e., avoid sub expressions. Return only 
-        true/false if matched or not.
-
-        @deprecated The flag is currently not supported by OOo.
-    */
-    const long  REG_NOSUB           = 0x00000200;
-
-    /** Flag for "regular expression" search / Special new line 
-        treatment.
-
-        @deprecated The flag is currently not supported by OOo.
-
-        <p> A NEWLINE character in string will not be matched by a 
-        period outside bracket expression or by any form of a non 
-        matching list. </p>
-
-        <p> A circumflex (^) in pattern when used to specify expression 
-        anchoring will match the zero length string immediately after a 
-        newline in string, regardless of the setting of 
-        REG_NOT_BEGINOFLINE. </p>
-
-        <p> A dollar-sign ($) in pattern when used to specify expression 
-        anchoring, will match zero-length string immediately before a 
-        new line in string, regardless of the setting of 
-        REG_NOT_ENDOFLINE. </p>
-    */
-    const long  REG_NEWLINE         = 0x00000400;
-
-    /** The first character in the string is not the beginning of the 
-        line therefore ^ will not match with first character of the 
-        string.
-    */
-    const long  REG_NOT_BEGINOFLINE = 0x00000800;
-
-    /** The last character in the string is not the end of the line 
-        therefore $ will not match with last character of the string. 
-    */
-    const long  REG_NOT_ENDOFLINE   = 0x00001000;
-
-    /** Flag for "Weighted Levenshtein Distance" search / Relaxed 
-        checking of limit, split weigh pools.
-
-        <p> If not specified (<b>strict</b>), the search is sucessful if 
-        the WLD is within a calculated limit where each insertion, 
-        deletion and replacement adds a weight to a common pool of 
-        weights. This is the mathematically correct WLD. </p>
-
-        <p> From a user's point of view the strict WLD is an 
-        exclusive-OR of the arguments given, for example if allowed 
-        insertions=2 and allowed replacements=2, the search fails if 2 
-        characters had been inserted and an additional operation would 
-        be needed to match. Depending on the weights it may also fail if 
-        1 character was inserted and 1 character replaced and an 
-        additional operation would be needed to match. The strict 
-        algorithm may match less than expected from a first glance of 
-        the specified arguments, but does not return false positives. </p>
-
-        <p> If specified (<b>relaxed</b>), the search is also successful 
-        if the combined pool for insertions and deletions is below a 
-        doubled calculated limit and replacements are treated 
-        differently. Additionally, swapped characters are counted as one 
-        replacement. </p>
-
-        <p> From a user's point of view the relaxed WLD is an 
-        inclusive-OR of the arguments given, for example if allowed 
-        insertions=2 and allowed replacements=2, the search succeeds if 
-        2 characters had been inserted and an additional replacement is 
-        needed to match. The relaxed algorithm may return false 
-        positives, but meets user expectation better. </p>
-    */
-    const long  LEV_RELAXED     = 0x00010000;
-};
-
-
-published  struct SearchOptions  {
-	//-------------------------------------------------------------------------
-    /** search type */
-	SearchAlgorithms	algorithmType;
-
-	/** some flags - can be mixed
-
-		@see <type>SearchFlags</type>
-	*/
-	long 			searchFlag;
-
-    /** The text or pattern to be searched. */
-	string			searchString;
-
-    /** The replacement text
-        (is for optional replacing - SearchOption is only the data container for it) */
-	string			replaceString;
-
-    /** The locale for case insensitive search. */
-	::com::sun::star::lang::Locale  Locale;
-
-    /** This many characters can be different (as a replacement) between 
-        the found word and the search pattern in a "Weighted Levenshtein 
-        Distance" search. */
-	long			changedChars;
-
-    /** This many characters can be missing in the found word in a 
-        "Weighted Levenshtein Distance" search. */
-	long			deletedChars;
-
-    /** This many characters can be additional in the found word in a 
-        "Weighted Levenshtein Distance" search. */
-	long			insertedChars;
-
-    /** Flags for the transliteration. Same meaning as the enum of
-        <type scope="com::sun::star::i18n">TransliterationModules</type>
-	*/
-	long			transliterateFlags;
-};
-
-
-published  struct SearchResult  {
-	//-------------------------------------------------------------------------
-	/** Number of subexpressions,
-	if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match.
-	The start and endOffset are always dependent on the search direction.
-	For example:
-	if you search "X" in the text "-X-" the offset are:
-		for forward: 	start = 1, end = 2
-        for backward:   start = 2, end = 1
-    Forward, the startOffset is inclusive, the endOffset exclusive.
-    Backward, the startOffset is exclusive, the endOffset inclusive.
-
-	For regular expressions it can be greater than 1.
-	If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string
-	if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression
-	startoffset[i] and endoffset[i] points to the matching substring of i th matching substring.
-	*/
-	long subRegExpressions;
-	sequence<long> startOffset;		// inclusive
-	sequence<long> endOffset;  		// exclusive
-};
-
-
-
 /** enables an object to search in its content.
  */
 published interface XTextSearch : com::sun::star::uno::XInterface

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl Wed Nov 14 21:10:00 2012
@@ -31,31 +31,11 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#include <com/sun/star/xml/crypto/sax/ElementStackItem.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
 /**
- * A struct to keep a startElement/endElement SAX event.
- */
-struct ElementStackItem
-{
-	/**
-	 * whether it is a startElement event
-	 */
-	boolean isStartElementEvent;
-	
-	/**
-	 * the name of the element
-	 */
-	string elementName;
-	
-	/**
-	 * attribute list for a startElement event
-	 */
-	com::sun::star::xml::sax::XAttributeList xAttributes;
-}; 
-
-/**
  * Manipulate the "key SAX events" in a SAX event stream.
  *
  * @see   XSecController

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl Wed Nov 14 21:10:00 2012
@@ -31,53 +31,13 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl>
+#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkType.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
 /**
- * Represents the undefined security id
- */
-constants ConstOfSecurityId
-{
-	const long UNDEFINEDSECURITYID = -1;
-};
-
-/**
- * Defines priority for the element mark's notification.
- * <p>
- * The PRI_MINIMUM priority is a value less than any practical
- * priority value, it is used when compare between different
- * priority values.
- * <p>
- * The PRI_AFTERMODIFY priority represents the notification will be 
- * sent after any internal modification has finished.
- * <p>
- * The PRI_BEFOREMODIFY proirity represents the notification will be
- * sent before any internal modification happens.
- * <p>
- * So an element mark with PRI_BEFOREMODIFY will be handled first,
- * and one with PRI_AFTERMODIFY will be handled at last.
- */
-enum ElementMarkPriority
-{
-	MINIMUM = 1,
-	AFTERMODIFY,
-	BEFOREMODIFY
-};
-
-/**
- * Defines types of element mark.
- * <p>
- * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
- * type represents a element collector.
- */
-enum ElementMarkType
-{
-	ELEMENTMARK = 1,
-	ELEMENTCOLLECTOR
-};
-
-/**
  * Interface of Security SAX Event Keeper.
  * <p>
  * This interface is an extension of the XSAXEventKeeper interface,

Modified: incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl (original)
+++ incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl Wed Nov 14 21:10:00 2012
@@ -28,27 +28,12 @@
 
 #include <com/sun/star/uno/XInterface.idl> 
 #include <com/sun/star/xml/sax/SAXException.idl> 
+#include <com/sun/star/xml/csax/XMLAttribute.idl>
  
  
 module com { module sun { module star { module xml { module csax {
 
 /**
- * A struct to keep information of an element's attribute.
- */
-struct XMLAttribute
-{
-	/**
-	 * the attribute name
-	 */
-	string sName;
-	
-	/**
-	 * the attribute value
-	 */
-	string sValue;
-}; 
-
-/**
  * A compressed XDocumentHandler interface.
  * <p>
  * All methods in this interface have the same function with methods

Modified: incubator/ooo/branches/gbuild/main/offapi/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/offapi/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,109 +1 @@
 oa	offapi	:	udkapi idlc solenv NULL
-oa	offapi									usr1	-	all	oa_mkout NULL
-oa	offapi\com\sun\star\script				nmake	-	all	oa_script oa_embed NULL
-oa	offapi\com\sun\star\script\browse	nmake	-	all	oa_sfbrowse NULL
-oa	offapi\com\sun\star\script\provider	nmake	-	all	oa_sfprovider NULL
-oa	offapi\com\sun\star\script\vba		nmake	-	all	oa_script_vba NULL
-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\awt\tab				nmake	-	all	oa_awttab 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
-oa	offapi\com\sun\star\configuration		nmake	-	all	oa_config NULL
-oa	offapi\com\sun\star\configuration\bootstrap	nmake	-	all	oa_configbootstrap NULL
-oa	offapi\com\sun\star\configuration\backend	nmake	-	all	oa_configbackend NULL
-oa	offapi\com\sun\star\configuration\backend\xml	nmake	-	all	oa_configbackend_xml NULL
-oa	offapi\com\sun\star\datatransfer		nmake	-	all	oa_datatransfer NULL
-oa	offapi\com\sun\star\datatransfer\clipboard			nmake	-	all	oa_datatrans_clip NULL
-oa	offapi\com\sun\star\datatransfer\dnd	nmake	-	all	oa_datatrans_dnd oa_awt NULL
-oa	offapi\com\sun\star\deployment				nmake	-	all	oa_deployment oa_ucb oa_xml_input NULL
-oa	offapi\com\sun\star\deployment\test			nmake	-	all	oa_deploymenttest oa_ucb  NULL
-oa	offapi\com\sun\star\deployment\ui			nmake	-	all	oa_deployment_ui oa_awt oa_ui_dialogs NULL
-oa	offapi\com\sun\star\document			nmake	-	all	oa_docu oa_embed NULL
-oa	offapi\com\sun\star\drawing				nmake	-	all	oa_draw NULL
-oa	offapi\com\sun\star\drawing\framework	nmake	-	all	oa_draw_framework NULL
-oa	offapi\com\sun\star\embed				nmake	-	all	oa_embed NULL
-oa	offapi\com\sun\star\form				nmake	-	all	oa_form oa_inspection NULL
-oa	offapi\com\sun\star\form\component		nmake	-	all	oa_fcomp oa_form oa_form_submission NULL
-oa	offapi\com\sun\star\form\inspection     nmake   -   all	oa_finsp oa_fcomp oa_inspection NULL
-oa	offapi\com\sun\star\form\binding        nmake	-	all	oa_form_binding oa_fcomp NULL
-oa	offapi\com\sun\star\form\validation     nmake   -   all oa_form_validation oa_form_binding NULL
-oa	offapi\com\sun\star\form\submission     nmake   -   all oa_form_submission NULL
-oa	offapi\com\sun\star\form\control		nmake	-	all	oa_fcontr oa_form_submission NULL
-oa  offapi\com\sun\star\form\runtime        nmake   -   all oa_fruntime oa_fcomp NULL
-oa	offapi\com\sun\star\xforms				nmake	-	all	oa_xforms oa_xsd oa_form_submission NULL
-oa	offapi\com\sun\star\formula				nmake	-	all	oa_formula NULL
-oa	offapi\com\sun\star\frame\status		nmake	-	all	oa_frame_status NULL
-oa	offapi\com\sun\star\frame				nmake	-	all	oa_frame NULL
-oa	offapi\com\sun\star\gallery				nmake	-	all	oa_gallery NULL
-oa	offapi\com\sun\star\graphic				nmake	-	all	oa_graphic NULL
-oa	offapi\com\sun\star\i18n				nmake	-	all	oa_i18n NULL
-oa	offapi\com\sun\star\installation		nmake	-	all	oa_inst NULL
-oa	offapi\com\sun\star\ldap			    nmake	-	all	oa_ldap NULL
-oa	offapi\com\sun\star\linguistic2			nmake	-	all	oa_ling2 NULL
-oa  offapi\com\sun\star\logging             nmake   -   all oa_logging NULL
-oa	offapi\com\sun\star\mail    			nmake	-	all	oa_mail NULL
-oa	offapi\com\sun\star\media				nmake	-	all	oa_media NULL
-oa	offapi\com\sun\star\mozilla				nmake	-	all	oa_mozilla NULL
-oa	offapi\com\sun\star\oooimprovement		nmake	-	all	oa_oooimprovement NULL
-oa	offapi\com\sun\star\packages			nmake	-	all	oa_packages NULL
-oa	offapi\com\sun\star\packages\manifest	nmake	-	all	oa_manifest NULL
-oa	offapi\com\sun\star\packages\zip	    nmake	-	all	oa_zippackage NULL
-oa	offapi\com\sun\star\plugin				nmake	-	all	oa_plug NULL
-oa	offapi\com\sun\star\presentation		nmake	-	all	oa_pres NULL
-oa	offapi\com\sun\star\animations			nmake	-	all oa_animations oa_pres NULL
-oa	offapi\com\sun\star\presentation\textfield		nmake	-	all	oa_prestextfield NULL
-oa	offapi\com\sun\star\resource			nmake	-	all	oa_resrc NULL
-oa	offapi\com\sun\star\xml\sax				nmake	-	all	oa_sax NULL
-oa	offapi\com\sun\star\xml					nmake	-	all	oa_xml NULL
-oa	offapi\com\sun\star\xml\input			nmake	-	all	oa_xml_input oa_sax NULL
-oa	offapi\com\sun\star\xml\dom				nmake	-	all	oa_xml_dom oa_sax NULL
-oa	offapi\com\sun\star\xml\xpath			nmake	-	all	oa_xml_xpath oa_xml_dom NULL
-oa	offapi\com\sun\star\xml\dom\views			nmake	-	all	oa_xml_views NULL
-oa	offapi\com\sun\star\xml\dom\events			nmake	-	all	oa_xml_events oa_xml_views oa_xml_dom NULL
-oa	offapi\com\sun\star\scanner				nmake	-	all	oa_scan NULL
-oa	offapi\com\sun\star\setup				nmake	-	all	oa_setup NULL
-oa	offapi\com\sun\star\sheet				nmake	-	all	oa_sheet NULL
-oa  offapi\com\sun\star\smarttags           nmake   -   all oa_smarttags NULL
-oa  offapi\com\sun\star\style               nmake   -   all oa_style NULL
-oa	offapi\com\sun\star\svg					nmake	-	all	oa_svg NULL
-oa	offapi\com\sun\star\sync				nmake	-	all	oa_sync NULL
-oa	offapi\com\sun\star\sync2				nmake	-	all	oa_sync2 NULL
-oa	offapi\com\sun\star\system				nmake	-	all	oa_system NULL
-oa	offapi\com\sun\star\table				nmake	-	all	oa_table oa_form_binding NULL
-oa	offapi\com\sun\star\task				nmake	-	all	oa_task NULL
-oa	offapi\com\sun\star\text				nmake	-	all	oa_text NULL
-oa	offapi\com\sun\star\text\textfield		nmake	-	all	oa_textfield NULL
-oa  offapi\com\sun\star\text\textfield\docinfo     nmake   -   all oa_docinfo NULL
-oa  offapi\com\sun\star\text\fieldmaster    nmake   -   all oa_fieldmaster NULL
-oa	offapi\com\sun\star\ucb					nmake	-	all	oa_ucb NULL
-oa	offapi\com\sun\star\util				nmake	-	all	oa_putil NULL
-oa	offapi\com\sun\star\view				nmake	-	all	oa_view NULL
-oa	offapi\com\sun\star\report				nmake	-	all	oa_report NULL
-oa	offapi\com\sun\star\report\inspection	nmake	-	all	oa_reportins oa_report  NULL
-oa	offapi\com\sun\star\report\meta	        nmake	-	all	oa_reportmeta oa_report  NULL
-oa	offapi\com\sun\star\sdbcx				nmake	-	all	oa_sdbcx NULL
-oa	offapi\com\sun\star\sdbc				nmake	-	all	oa_sdbc NULL
-oa	offapi\com\sun\star\sdb					nmake	-	all	oa_sdb NULL
-oa	offapi\com\sun\star\sdb\tools           nmake	-	all	oa_sdbtools NULL
-oa  offapi\com\sun\star\sdb\application     nmake   -   all oa_sdbapp NULL
-oa	offapi\com\sun\star\image				nmake	-	all	oa_image NULL
-oa  offapi\com\sun\star\xsd                 nmake   -   all oa_xsd NULL
-oa  offapi\com\sun\star\inspection          nmake   -   all oa_inspection NULL
-oa	offapi\com\sun\star\ui  				nmake	-	all	oa_ui NULL
-oa	offapi\com\sun\star\ui\dialogs			nmake	-	all	oa_ui_dialogs NULL
-oa	offapi\com\sun\star  				    nmake	-	all	oa_starme NULL
-oa	offapi\com\sun\star\security            nmake	-	all	oa_security NULL
-oa	offapi\com\sun\star\xml\crypto\sax     	nmake	-	all	oa_crypto_sax oa_wrapper oa_csax NULL
-oa	offapi\com\sun\star\xml\crypto     	    nmake	-	all	oa_crypto oa_wrapper oa_security NULL
-oa	offapi\com\sun\star\xml\csax     	    nmake	-	all	oa_csax oa_sax NULL
-oa	offapi\com\sun\star\xml\wrapper		    nmake	-	all	oa_wrapper oa_sax NULL
-oa	offapi\com\sun\star\geometry		    nmake	-	all	oa_geometry NULL
-oa	offapi\com\sun\star\rendering	        nmake	-	all oa_rendering oa_geometry NULL
-oa	offapi\com\sun\star\rdf	                nmake	-	all oa_rdf  oa_datatransfer oa_text NULL
-oa	offapi\com\sun\star\office              nmake	-	all oa_office oa_text NULL
-oa  offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_awttab 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_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement oa_office oa_prestextfield oa_starme oa_script_vba NULL

Modified: incubator/ooo/branches/gbuild/main/offapi/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/offapi/prj/d.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/offapi/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/offapi/prj/d.lst Wed Nov 14 21:10:00 2012
@@ -1,224 +0,0 @@
-##############################################################################
-#
-# NOTE: when you make changes in this file please ensure an alphabetical order
-#
-##############################################################################
-
-mkdir: %COMMON_DEST%\idl%_EXT%\com
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\accessibility
-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\awt\tab
-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
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend\xml
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\bootstrap
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\clipboard
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\dnd
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment\ui
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\document
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing\framework
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\embed
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\binding
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\component
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\control
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\inspection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\runtime
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\submission
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\validation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\formula
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\frame
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\frame\status
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\gallery
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\geometry
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\graphic
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\i18n
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\image
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\inspection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\installation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ldap
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\linguistic2
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\logging
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\mail
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\media
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\mozilla
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\oooimprovement
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\packages
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\manifest
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\zip
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\plugin
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\presentation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\rdf
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\rendering
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\report
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\report\inspection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\report\meta
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\resource
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\scanner
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\browse
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\provider
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\vba
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\application
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\tools
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbc
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbcx
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\setup
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sheet
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\smarttags
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\style
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\svg
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sync
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sync2
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\system
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\table
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text\fieldmaster
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield\docinfo
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb\smart
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ui
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ui\dialogs
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\view
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xforms
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto\sax
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\csax
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\views
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\events
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\input
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\sax
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\wrapper
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\xpath
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xsd
-
-..\%__SRC%\ucr\offapi.db %_DEST%\bin%_EXT%\offapi.rdb
-..\%__SRC%\ucrdoc\offapi_doc.db %_DEST%\bin%_EXT%\offapi_doc.rdb
-..\%__SRC%\ucr\types.db %_DEST%\bin%_EXT%\types.rdb
-..\%__SRC%\ucrdoc\types_doc.db %_DEST%\bin%_EXT%\types_doc.rdb
-
-..\%__SRC%\misc\unotype_statistics.txt %_DEST%\bin%_EXT%\unotype_statistics.txt
-
-..\com\sun\star\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star
-..\com\sun\star\accessibility\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\accessibility
-..\com\sun\star\animations\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\animations
-..\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\awt\tab\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tab
-..\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
-..\com\sun\star\configuration\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration
-..\com\sun\star\configuration\backend\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend
-..\com\sun\star\configuration\backend\xml\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend\xml
-..\com\sun\star\configuration\bootstrap\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\bootstrap
-..\com\sun\star\datatransfer\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer
-..\com\sun\star\datatransfer\clipboard\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\clipboard
-..\com\sun\star\datatransfer\dnd\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\dnd
-..\com\sun\star\deployment\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment
-..\com\sun\star\deployment\ui\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment\ui
-..\com\sun\star\document\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\document
-..\com\sun\star\drawing\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing
-..\com\sun\star\drawing\framework\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing\framework
-..\com\sun\star\embed\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\embed
-..\com\sun\star\form\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form
-..\com\sun\star\form\binding\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\binding
-..\com\sun\star\form\component\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\component
-..\com\sun\star\form\control\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\control
-..\com\sun\star\form\inspection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\inspection
-..\com\sun\star\form\runtime\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\runtime
-..\com\sun\star\form\submission\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\submission
-..\com\sun\star\form\validation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\validation
-..\com\sun\star\formula\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\formula
-..\com\sun\star\frame\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\frame
-..\com\sun\star\frame\status\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\frame\status
-..\com\sun\star\gallery\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\gallery
-..\com\sun\star\geometry\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\geometry
-..\com\sun\star\graphic\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\graphic
-..\com\sun\star\i18n\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\i18n
-..\com\sun\star\image\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\image
-..\com\sun\star\inspection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\inspection
-..\com\sun\star\installation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\installation
-..\com\sun\star\ldap\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ldap
-..\com\sun\star\linguistic2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\linguistic2
-..\com\sun\star\logging\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\logging
-..\com\sun\star\mail\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\mail
-..\com\sun\star\media\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\media
-..\com\sun\star\mozilla\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\mozilla
-..\com\sun\star\oooimprovement\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\oooimprovement
-..\com\sun\star\packages\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\packages
-..\com\sun\star\packages\manifest\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\manifest
-..\com\sun\star\packages\zip\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\zip
-..\com\sun\star\plugin\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\plugin
-..\com\sun\star\presentation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\presentation
-..\com\sun\star\rdf\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\rdf
-..\com\sun\star\rendering\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\rendering
-..\com\sun\star\report\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\report
-..\com\sun\star\report\inspection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\report\inspection
-..\com\sun\star\report\meta\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\report\meta
-..\com\sun\star\resource\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\resource
-..\com\sun\star\scanner\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\scanner
-..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-..\com\sun\star\script\browse\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\browse
-..\com\sun\star\script\provider\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\provider
-..\com\sun\star\script\vba\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\vba
-..\com\sun\star\sdb\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb
-..\com\sun\star\sdb\application\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\application
-..\com\sun\star\sdb\tools\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\tools
-..\com\sun\star\sdbc\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbc
-..\com\sun\star\sdbcx\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbcx
-..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-..\com\sun\star\setup\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\setup
-..\com\sun\star\sheet\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sheet
-..\com\sun\star\smarttags\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\smarttags
-..\com\sun\star\style\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\style
-..\com\sun\star\svg\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\svg
-..\com\sun\star\sync\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sync
-..\com\sun\star\sync2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sync2
-..\com\sun\star\system\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\system
-..\com\sun\star\table\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\table
-..\com\sun\star\task\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-..\com\sun\star\text\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text
-..\com\sun\star\text\fieldmaster\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text\fieldmaster
-..\com\sun\star\text\textfield\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield
-..\com\sun\star\text\textfield\docinfo\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield\docinfo
-..\com\sun\star\ucb\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb
-..\com\sun\star\ucb\smart\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb\smart
-..\com\sun\star\ui\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ui
-..\com\sun\star\ui\dialogs\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ui\dialogs
-..\com\sun\star\util\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-..\com\sun\star\view\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\view
-..\com\sun\star\xforms\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xforms
-..\com\sun\star\xml\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml
-..\com\sun\star\xml\crypto\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto
-..\com\sun\star\xml\crypto\sax\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto\sax
-..\com\sun\star\xml\csax\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\csax
-..\com\sun\star\xml\dom\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom
-..\com\sun\star\xml\dom\views\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\views
-..\com\sun\star\xml\dom\events\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\events
-..\com\sun\star\xml\input\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\input
-..\com\sun\star\xml\sax\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\sax
-..\com\sun\star\xml\wrapper\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\wrapper
-..\com\sun\star\xml\xpath\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\xpath
-..\com\sun\star\xsd\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xsd

Modified: incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObject.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObject.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObject.idl (original)
+++ incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObject.idl Wed Nov 14 21:10:00 2012
@@ -24,7 +24,10 @@
 #ifndef __ooo_vba_excel_SheetObject_idl__
 #define __ooo_vba_excel_SheetObject_idl__
 
+#include <ooo/vba/excel/XSheetObject.idl>
+
 #include <ooo/vba/excel/XCharacters.idl>
+#include <ooo/vba/excel/XButton.idl>
 
 //=============================================================================
 
@@ -38,78 +41,6 @@ module ooo {  module vba { module excel 
 
 //=============================================================================
 
-/** Base interface for graphic objects and drawing controls in a single sheet.
-    
-    <p>The objects supporting this interface are now deprecated in VBA in
-    favour of the Shapes and OLEObjects collections, but are kept for
-    compatibility with old VBA scripts. All form control objects do NOT belong
-    to ActiveX form controls but to the old-style drawing controls.</p>
- */
-interface XSheetObject : ooo::vba::XHelperInterface
-{
-    /** Left coordinate of the drawing object, in points. */
-    [attribute] double Left;
-
-    /** Top coordinate of the drawing object, in points. */
-    [attribute] double Top;
-
-    /** Width of the drawing object, in points. */
-    [attribute] double Width;
-
-    /** Height of the drawing object, in points. */
-    [attribute] double Height;
-
-    /** The name of the drawing object, used as collection key. */
-    [attribute] string Name;
-
-    /** Name of a macro that will be executed when the drawing object is clicked. */
-    [attribute] string OnAction;
-
-    /** Anchor mode of the object (fixed or variable position and size). Must
-        be a value from <type>ooo::vba::excel::XlPlacement</type>. */
-    [attribute] long Placement;
-    
-    /** True = print object, false = skip object on printing. */
-    [attribute] boolean PrintObject;
-};
-
-//=============================================================================
-
-/** Additional attributes for all drawing controls (this interface does not
-    belong to ActiveX form controls).
- */
-interface XControlObject : com::sun::star::uno::XInterface
-{
-    [attribute] boolean AutoSize;
-};
-
-//=============================================================================
-
-/** Additional attributes for a push button drawing control (this interface
-    does not belong to ActiveX form controls).
- */
-interface XButton : com::sun::star::uno::XInterface
-{
-    /** Visible caption of the button. */
-    [attribute] string Caption;
-
-    /** Font settings for the entire caption text. */
-    [attribute] XFont Font;
-
-    /** Horizontal alignment of the caption. */
-    [attribute] long HorizontalAlignment;
-
-    /** Vertical alignment of the caption. */
-    [attribute] long VerticalAlignment;
-    
-    /** Orientation (rotation) of the text. Must be a value from
-        <type>ooo::vba::excel::XlOrientation</type>. */
-    [attribute] long Orientation;
-
-    /** Access to text and text formatting of the button caption. */
-    XCharacters Characters( [in] any Start, [in] any Length );
-};
-
 //=============================================================================
 
 /** Represents a drawing button control in a spreadsheet. */

Modified: incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObjects.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObjects.idl?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObjects.idl (original)
+++ incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObjects.idl Wed Nov 14 21:10:00 2012
@@ -25,6 +25,7 @@
 #define __ooo_vba_excel_SheetObjects_idl__
 
 #include <ooo/vba/XCollection.idl>
+#include <ooo/vba/excel/XGraphicObjects.idl>
 
 //=============================================================================
 
@@ -41,50 +42,6 @@ module ooo {  module vba { module excel 
 /** Collections that implement this interface provide access to a specific type
     of drawing objects in a single sheet.
     
-    <p>The following sheet symbols represent collections of graphic objects,
-    and therefore implement this interface:</p>
-    <ul><li>Buttons: push button (command button) controls,</li>
-    <li>ChartObjects: chart objects embedded in the sheet,</li>
-    <li>CheckBoxes: check box controls,</li>
-    <li>DropDowns: drop-down listbox controls,</li>
-    <li>EditBoxes: text edit controls (dialog sheets only),</li>
-    <li>GroupBoxes: group frame controls,</li>
-    <li>GroupObjects: group objects containing other child objects,</li>
-    <li>Labels: fixed text controls,</li>
-    <li>ListBoxes: plain listbox controls,</li>
-    <li>OptionButtons: option button (radio button) controls,</li>
-    <li>Ovals: simple ovals and circles,</li>
-    <li>Pictures: picture objects,</li>
-    <li>Rectangles: simple rectangle objects,</li>
-    <li>ScrollBars: scrollbar controls,</li>
-    <li>Spinners: spinner (spin button) controls,</li>
-    <li>TextBoxes: rectangle objects with embedded text.</li></ul>
-
-    <p>These symbols are now deprecated in VBA but kept for compatibility with
-    old VBA scripts. All symbols representing collections of form controls do
-    NOT belong to ActiveX form controls but to the old-style drawing controls.
-    </p>
- */
-interface XGraphicObjects : com::sun::star::uno::XInterface
-{
-    /** Adds a new graphic object to the sheet this collection belongs to. The
-        type of the object is determined by the type of the collection.
-        
-        @param Left  Position of the left border in points (1/72 inch).
-        @param Top  Position of the top border in points (1/72 inch).
-        @param Width  Width of the object in points (1/72 inch).
-        @param Height  Height of the object in points (1/72 inch).
-        
-        @return  The created graphic object.
-     */
-    any Add( [in] any Left, [in] any Top, [in] any Width, [in] any Height );
-};
-
-//=============================================================================
-
-/** Collections that implement this interface provide access to a specific type
-    of drawing objects in a single sheet.
-
     <p>The following sheet symbols represent collections of line objects, and
     therefore implement this interface:</p>
     <ul><li>Arcs: arc objects, and</li>

Modified: incubator/ooo/branches/gbuild/main/oovbaapi/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/oovbaapi/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/oovbaapi/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/oovbaapi/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,9 +1,3 @@
 ovba	oovbaapi	:	offapi solenv NULL
 ovba	oovbaapi                            usr1	-	all	ovba_mkout NULL
-ovba	oovbaapi\genconstidl                nmake	-	all	ovba_genconstidl NULL
-ovba	oovbaapi\ooo\vba\constants          nmake	-	all	ovba_constants  ovba_genconstidl NULL
-ovba	oovbaapi\ooo\vba                    nmake	-	all	ovba_vba NULL
-ovba	oovbaapi\ooo\vba\excel              nmake	-	all	ovba_excel NULL
-ovba	oovbaapi\ooo\vba\word               nmake	-	all	ovba_word NULL
-ovba	oovbaapi\ooo\vba\msforms            nmake	-	all	ovba_msforms NULL
-ovba   oovbaapi\util                             nmake   -   all ovba_util ovba_vba ovba_excel ovba_word ovba_msforms ovba_constants ovba_genconstidl NULL
+ovba	oovbaapi\prj                        nmake	-   all ovba_prj NULL

Modified: incubator/ooo/branches/gbuild/main/oovbaapi/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/oovbaapi/prj/d.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/oovbaapi/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/oovbaapi/prj/d.lst Wed Nov 14 21:10:00 2012
@@ -1,15 +0,0 @@
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo
-
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba 
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba\constants 
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba\excel 
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba\msforms
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba\word
-
-..\%__SRC%\ucr\oovbaapi.db %_DEST%\bin%_EXT%\oovbaapi.rdb
-
-..\ooo\vba\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba
-..\ooo\vba\constants\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba\constants 
-..\ooo\vba\excel\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba\excel
-..\ooo\vba\msforms\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba\msforms
-..\ooo\vba\word\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba\word

Modified: incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk (original)
+++ incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk Wed Nov 14 21:10:00 2012
@@ -26,7 +26,6 @@ $(eval $(call gb_Executable_Executable,s
 $(eval $(call gb_Executable_set_include,spadmin.bin,\
 	$$(INCLUDE) \
 	-I$(OUTDIR)/inc \
-	-I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\
@@ -37,6 +36,11 @@ $(eval $(call gb_Executable_add_linked_s
     vclmain \
 ))
 
+$(eval $(call gb_Executable_add_api,spadmin.bin,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\
     spa \
 	svt \

Modified: incubator/ooo/branches/gbuild/main/padmin/Library_spa.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/padmin/Library_spa.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/padmin/Library_spa.mk (original)
+++ incubator/ooo/branches/gbuild/main/padmin/Library_spa.mk Wed Nov 14 21:10:00 2012
@@ -25,7 +25,6 @@ $(eval $(call gb_Library_Library,spa))
 
 $(eval $(call gb_Library_set_include,spa,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 ))
 
@@ -34,6 +33,11 @@ $(eval $(call gb_Library_set_defs,spa,\
 	-DSPA_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,spa,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,spa,\
     svt \
     vcl \

Modified: incubator/ooo/branches/gbuild/main/remotebridges/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/remotebridges/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/remotebridges/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/remotebridges/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,2 +1,2 @@
-rb	remotebridges	: LIBXSLT:libxslt cppu cppuhelper offuh rdbmaker sal NULL
+rb	remotebridges	: LIBXSLT:libxslt cppu cppuhelper offapi rdbmaker sal NULL
 rb	remotebridges\source\unourl_resolver	nmake	-	all	rb_urlresolv NULL

Modified: incubator/ooo/branches/gbuild/main/reportdesign/source/ui/report/propbrw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/source/ui/report/propbrw.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/source/ui/report/propbrw.cxx (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/source/ui/report/propbrw.cxx Wed Nov 14 21:10:00 2012
@@ -45,7 +45,7 @@
 #include <svx/svditer.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/property.hxx>
 #include <comphelper/namecontainer.hxx>

Modified: incubator/ooo/branches/gbuild/main/sc/source/filter/excel/xlstyle.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sc/source/filter/excel/xlstyle.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sc/source/filter/excel/xlstyle.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sc/source/filter/excel/xlstyle.cxx Wed Nov 14 21:10:00 2012
@@ -32,7 +32,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/font.hxx>
 #include <rtl/tencinfo.h>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <editeng/svxfont.hxx>
 #include "global.hxx"
 #include "xlroot.hxx"

Modified: incubator/ooo/branches/gbuild/main/sc/source/ui/unoobj/targuno.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sc/source/ui/unoobj/targuno.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sc/source/ui/unoobj/targuno.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sc/source/ui/unoobj/targuno.cxx Wed Nov 14 21:10:00 2012
@@ -29,7 +29,7 @@
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
 //#include <toolkit/unoiface.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/smplhint.hxx>
 #include <vcl/svapp.hxx>

Modified: incubator/ooo/branches/gbuild/main/sc/source/ui/vba/vbaeventshelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sc/source/ui/vba/vbaeventshelper.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sc/source/ui/vba/vbaeventshelper.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sc/source/ui/vba/vbaeventshelper.cxx Wed Nov 14 21:10:00 2012
@@ -37,8 +37,8 @@
 #include <com/sun/star/util/XChangesNotifier.hpp>
 
 #include <cppuhelper/implbase4.hxx>
-#include <toolkit/unohlp.hxx>
 #include <unotools/eventcfg.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vbahelper/helperdecl.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>

Modified: incubator/ooo/branches/gbuild/main/sccomp/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sccomp/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sccomp/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/sccomp/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,4 +1,4 @@
-scc	sccomp	:    L10N:l10n offuh comphelper COINMP:coinmp tools rsc LIBXSLT:libxslt NULL
+scc	sccomp	:    L10N:l10n offapi comphelper COINMP:coinmp tools rsc LIBXSLT:libxslt NULL
 scc	sccomp									usr1	-	all	scc_mkout NULL
 scc	sccomp\prj								get		-	all	scc_prj NULL
 scc	sccomp\source\solver					nmake	-	all	scc_solver NULL

Modified: incubator/ooo/branches/gbuild/main/sd/inc/pch/precompiled_sd.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/inc/pch/precompiled_sd.hxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/inc/pch/precompiled_sd.hxx (original)
+++ incubator/ooo/branches/gbuild/main/sd/inc/pch/precompiled_sd.hxx Wed Nov 14 21:10:00 2012
@@ -786,7 +786,6 @@
 
 #include "toolkit/awt/vclxdevice.hxx"
 #include "toolkit/helper/vclunohelper.hxx"
-#include "toolkit/unohlp.hxx"
 
 #include "tools/bigint.hxx"
 #include "tools/color.hxx"

Modified: incubator/ooo/branches/gbuild/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/source/filter/eppt/epptso.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/source/filter/eppt/epptso.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sd/source/filter/eppt/epptso.cxx Wed Nov 14 21:10:00 2012
@@ -90,7 +90,7 @@
 #include <ucbhelper/contentbroker.hxx>
 #endif
 #ifndef _TOOLKIT_UNOHLP_HXX
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <rtl/crc.h>
 #include <sot/clsids.hxx>

Modified: incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshow.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshow.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshow.cxx Wed Nov 14 21:10:00 2012
@@ -42,7 +42,7 @@
 
 #include <sfx2/viewfrm.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <svx/unoprov.hxx>
 
 #include "framework/FrameworkHelper.hxx"

Modified: incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshowimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshowimpl.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshowimpl.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshowimpl.cxx Wed Nov 14 21:10:00 2012
@@ -43,7 +43,7 @@
 #include <svl/aeitem.hxx>
 #include <svl/urihelper.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <sfx2/imagemgr.hxx>
 #include <sfx2/request.hxx>