incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1394707 [3/4] - in /incubator/ooo/branches/buildsys: ext_libraries/apr-util/ ext_libraries/serf/win/ main/ main/UnoControls/prj/ main/accessibility/prj/ main/animations/prj/ main/basctl/source/dlged/ main/basebmp/inc/basebmp/ main/basic/pr...
Date Fri, 05 Oct 2012 18:23:26 GMT
Modified: incubator/ooo/branches/buildsys/main/offapi/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/prj/d.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/offapi/prj/d.lst Fri Oct  5 18:23:17 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/buildsys/main/oovbaapi/ooo/vba/excel/SheetObject.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oovbaapi/ooo/vba/excel/SheetObject.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oovbaapi/ooo/vba/excel/SheetObject.idl (original)
+++ incubator/ooo/branches/buildsys/main/oovbaapi/ooo/vba/excel/SheetObject.idl Fri Oct  5 18:23:17 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/buildsys/main/oovbaapi/ooo/vba/excel/SheetObjects.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oovbaapi/ooo/vba/excel/SheetObjects.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oovbaapi/ooo/vba/excel/SheetObjects.idl (original)
+++ incubator/ooo/branches/buildsys/main/oovbaapi/ooo/vba/excel/SheetObjects.idl Fri Oct  5 18:23:17 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/buildsys/main/oovbaapi/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oovbaapi/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oovbaapi/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/oovbaapi/prj/build.lst Fri Oct  5 18:23:17 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/buildsys/main/oovbaapi/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oovbaapi/prj/d.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oovbaapi/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/oovbaapi/prj/d.lst Fri Oct  5 18:23:17 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/buildsys/main/oox/source/token/properties.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oox/source/token/properties.pl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oox/source/token/properties.pl (original)
+++ incubator/ooo/branches/buildsys/main/oox/source/token/properties.pl Fri Oct  5 18:23:17 2012
@@ -21,43 +21,33 @@
 
 
 
-$ARGV0 = shift @ARGV;
-$ARGV1 = shift @ARGV;
-$ARGV2 = shift @ARGV;
+# operation mode (1 = identifiers, 2 = names)
+$op = shift @ARGV;
+die "Error: invalid operation" unless( $op >= 1 && $op <= 2);
 
-# parse input file
-
-open( INFILE, $ARGV0 ) or die "Error: cannot open input file: $!";
-my %props;
-while( <INFILE> )
-{
+$i = 0;
+while( <> ) {
     # trim newline
     chomp( $_ );
     # trim leading/trailing whitespace
     $_ =~ s/^\s*//g;
     $_ =~ s/\s*$//g;
-    # check for valid characters
-    $_ =~ /^[A-Z][a-zA-Z0-9]*$/ or die "Error: invalid character in property '$_'";
-    $id = "PROP_$_";
-    $props{$_} = $id;
+    # skip empty lines
+    if( $_ ) {
+        # check for valid characters
+        $_ =~ /^[A-Z][a-zA-Z0-9]+$/ or die "Error: invalid entry: '$_'";
+        # generate output
+        if( $op == 1 ) {
+            print( "const sal_Int32 PROP_$_ = $i;\n" );
+        } elsif( $op == 2 ) {
+            print( "/* $i */ \"$_\",\n" );
+        }
+        ++$i;
+    }
 }
-close( INFILE );
-
-# generate output files
-
-open( IDFILE, ">$ARGV1" ) or die "Error: cannot open output file: $!";
-open( NAMEFILE, ">$ARGV2" ) or die "Error: cannot open output file: $!";
 
-$i = 0;
-foreach( sort( keys( %props ) ) )
-{
-    print( IDFILE "const sal_Int32 $props{$_} = $i;\n" );
-    print( NAMEFILE "/* $i */ \"$_\",\n" );
-    ++$i;
+if( $op == 1 ) {
+    print( "const sal_Int32 PROP_COUNT = $i;\nconst sal_Int32 PROP_INVALID = -1;\n" );
+} elsif( $op == 2 ) {
+    print( "    \"\"\n" );
 }
-
-print( IDFILE "const sal_Int32 PROP_COUNT = $i;\n" );
-print( IDFILE "const sal_Int32 PROP_INVALID = -1;\n" );
-
-close( IDFILE );
-close( NAMEFILE );

Modified: incubator/ooo/branches/buildsys/main/padmin/Executable_spadmin.bin.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/padmin/Executable_spadmin.bin.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/padmin/Executable_spadmin.bin.mk (original)
+++ incubator/ooo/branches/buildsys/main/padmin/Executable_spadmin.bin.mk Fri Oct  5 18:23:17 2012
@@ -26,13 +26,17 @@ $(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_add_linked_static_libs,spadmin.bin,\
     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/buildsys/main/padmin/Library_spa.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/padmin/Library_spa.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/padmin/Library_spa.mk (original)
+++ incubator/ooo/branches/buildsys/main/padmin/Library_spa.mk Fri Oct  5 18:23:17 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 \
 ))
 
@@ -33,6 +32,11 @@ $(eval $(call gb_Library_add_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/buildsys/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/postprocess/packcomponents/makefile.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/postprocess/packcomponents/makefile.mk Fri Oct  5 18:23:17 2012
@@ -44,19 +44,30 @@ my_components = \
     bib \
     cached1 \
     calc \
-    canvasfactory \
     chartcontroller \
     chartmodel \
     charttools \
     chartview \
+    component/canvas/source/factory/canvasfactory \
+    component/canvas/source/simplecanvas/simplecanvas \
+    component/canvas/source/vcl/vclcanvas \
     component/comphelper/util/comphelp \
     component/cui/util/cui \
     component/drawinglayer/drawinglayer \
+	component/dbaccess/source/ext/adabas/adabasui \
+	component/dbaccess/source/ext/macromigration/dbmm \
+	component/dbaccess/source/filter/xml/dbaxml \
+	component/dbaccess/util/dba \
+	component/dbaccess/util/dbu \
+	component/dbaccess/util/sdbt \
     component/framework/util/fwk \
     component/framework/util/fwl \
     component/framework/util/fwm \
     component/linguistic/source/lng \
     component/oox/oox \
+	component/reportdesign/source/filter/xml/rptxml \
+	component/reportdesign/util/rpt \
+	component/reportdesign/util/rptui \
     component/vbahelper/util/msforms \
     component/sd/util/sd \
     component/sd/util/sdd \
@@ -109,7 +120,6 @@ my_components = \
     hwp \
     i18npool \
     i18nsearch \
-    lng \
     lnth \
     localebe1 \
     log \

Modified: incubator/ooo/branches/buildsys/main/remotebridges/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/remotebridges/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/remotebridges/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/remotebridges/prj/build.lst Fri Oct  5 18:23:17 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/buildsys/main/reportdesign/source/ui/report/propbrw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/ui/report/propbrw.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/ui/report/propbrw.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/ui/report/propbrw.cxx Fri Oct  5 18:23:17 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/buildsys/main/sc/source/filter/excel/xlstyle.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sc/source/filter/excel/xlstyle.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sc/source/filter/excel/xlstyle.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sc/source/filter/excel/xlstyle.cxx Fri Oct  5 18:23:17 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/buildsys/main/sc/source/ui/unoobj/targuno.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sc/source/ui/unoobj/targuno.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sc/source/ui/unoobj/targuno.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sc/source/ui/unoobj/targuno.cxx Fri Oct  5 18:23:17 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/buildsys/main/sc/source/ui/vba/vbaeventshelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sc/source/ui/vba/vbaeventshelper.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sc/source/ui/vba/vbaeventshelper.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sc/source/ui/vba/vbaeventshelper.cxx Fri Oct  5 18:23:17 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/buildsys/main/sccomp/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sccomp/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sccomp/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/sccomp/prj/build.lst Fri Oct  5 18:23:17 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/buildsys/main/sd/inc/pch/precompiled_sd.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/inc/pch/precompiled_sd.hxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/inc/pch/precompiled_sd.hxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/inc/pch/precompiled_sd.hxx Fri Oct  5 18:23:17 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/buildsys/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/filter/eppt/epptso.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/filter/eppt/epptso.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/filter/eppt/epptso.cxx Fri Oct  5 18:23:17 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/buildsys/main/sd/source/ui/app/strings.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/app/strings.src?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/app/strings.src (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/app/strings.src Fri Oct  5 18:23:17 2012
@@ -1313,3 +1313,49 @@ String STR_SAR_WRAP_BACKWARD_DRAW
 {
 	Text [ en-US ] = "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?";
 };
+
+String RID_DRAW_VIEWER_TOOLBOX
+{
+	Text [ en-US ] = "Function Bar (viewing mode)" ;
+};
+
+String RID_GRAPHIC_VIEWER_TOOLBOX
+{
+	Text [ en-US ] = "Function Bar (viewing mode)" ;
+};
+
+String RID_DRAW_MEDIA_TOOLBOX
+{
+	Text [ en-US ] = "Media Playback" ;
+};
+
+String RID_DRAW_TABLE_TOOLBOX
+{
+	TEXT [ de ] = "Tabelle" ;
+	Text [ en-US ] = "Table" ;
+};
+
+String STR_SAR_NOT_FOUND
+{
+	Text [ en-US ] = "Search key not found.";
+};
+
+String STR_SAR_WRAP_FORWARD
+{
+	Text [ en-US ] = "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?";
+};
+
+String STR_SAR_WRAP_BACKWARD
+{
+	Text [ en-US ] = "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?";
+};
+
+String STR_SAR_WRAP_FORWARD_DRAW
+{
+	Text [ en-US ] = "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?";
+};
+
+String STR_SAR_WRAP_BACKWARD_DRAW
+{
+	Text [ en-US ] = "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?";
+};

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/ins_paste.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/ins_paste.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/ins_paste.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/ins_paste.cxx Fri Oct  5 18:23:17 2012
@@ -26,6 +26,8 @@
 
 #include "sdresid.hxx"
 
+#include "sdresid.hxx"
+
 #ifdef SD_DLLIMPLEMENTATION
 #undef SD_DLLIMPLEMENTATION
 #endif

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/slideshow/slideshow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/slideshow/slideshow.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/slideshow/slideshow.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/slideshow/slideshow.cxx Fri Oct  5 18:23:17 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/buildsys/main/sd/source/ui/slideshow/slideshowimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/slideshow/slideshowimpl.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/slideshow/slideshowimpl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/slideshow/slideshowimpl.cxx Fri Oct  5 18:23:17 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>

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/unoidl/unopage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/unoidl/unopage.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/unoidl/unopage.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/unoidl/unopage.cxx Fri Oct  5 18:23:17 2012
@@ -37,7 +37,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/metaact.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unomodel.hxx>

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/view/ToolBarManager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/view/ToolBarManager.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/view/ToolBarManager.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/view/ToolBarManager.cxx Fri Oct  5 18:23:17 2012
@@ -47,7 +47,7 @@
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <tools/link.hxx>
 

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/view/drviews8.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/view/drviews8.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/view/drviews8.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/view/drviews8.cxx Fri Oct  5 18:23:17 2012
@@ -29,7 +29,7 @@
 #include "ViewShellHint.hxx"
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <sfx2/dispatch.hxx>
 #ifndef _SVXIDS_HXX

Modified: incubator/ooo/branches/buildsys/main/sdext/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sdext/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sdext/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/sdext/prj/build.lst Fri Oct  5 18:23:17 2012
@@ -1,4 +1,4 @@
-dx	sdext	:	L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp NULL
+dx	sdext	:	L10N:l10n offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp NULL
 dx	sdext									usr1	-	all	sdext_mkout NULL
 dx	sdext\prj								get		-	all	sdext_prj NULL
 dx	sdext\source\minimizer					nmake	-	all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_inc NULL

Modified: incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/inc/pdfihelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/inc/pdfihelper.hxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/inc/pdfihelper.hxx (original)
+++ incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/inc/pdfihelper.hxx Fri Oct  5 18:23:17 2012
@@ -26,6 +26,8 @@
 
 #define BASEGFX_STATICLIBRARY
 
+#define BASEGFX_STATICLIBRARY
+
 #include "contentsink.hxx"
 
 #include <rtl/ustring.hxx>

Modified: incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/test/tests.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/test/tests.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/test/tests.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/test/tests.cxx Fri Oct  5 18:23:17 2012
@@ -26,6 +26,8 @@
 
 #define BASEGFX_STATICLIBRARY
 
+#define BASEGFX_STATICLIBRARY
+
 #ifdef SYSTEM_ZLIB
 #include "zlib.h"
 #else

Modified: incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx (original)
+++ incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx Fri Oct  5 18:23:17 2012
@@ -26,6 +26,8 @@
 
 #include "pdfihelper.hxx"
 
+#include "pdfihelper.hxx"
+
 #include <com/sun/star/util/XStringMapping.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>

Modified: incubator/ooo/branches/buildsys/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/set_soenv.in?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/set_soenv.in (original)
+++ incubator/ooo/branches/buildsys/main/set_soenv.in Fri Oct  5 18:23:17 2012
@@ -2099,20 +2099,6 @@ if ( $platform =~ m/os2/ )
 {  ToFile( "alias gunzip",       "gzip -d",         "a" );
 }
 
-ToFile( "endif",             $empty, "y");
-ToFile( "fi",                $empty, "z");
-
-# Check if the right dmake version is used. (W32 only)
-if ( $platform =~ m/cygwin/ ) {
-    ToFile( "Check if the right dmake version is used.", $empty, "c" );
-    # Invalidate build environment.
-    ToFile( "WORK_STAMP", "_invalid_", "e" );
-    # Don't test the dmake version if this file is sourced by bootstrap
-    ToFile( "bash -c 'if test -n \"\$_ISBOOTSTRAP_\" || (dmake.exe -V | grep -e \"-cygwin\\|OS := cygwin\" > /dev/null ); then true; else echo -e \"\\n\\nERROR: Not a cygwin build dmake or dmake missing, please check!\\n\\n\" ; sleep 5; false ; fi' || exit 1", $empty, "y");
-    # Restore valid environment if test was successful.
-    ToFile( "WORK_STAMP",        $WORK_STAMP,        "e" );
-    ToFile( "", $empty, "n");
-}
 
 # on Solaris, MacOSX and FreeBSD (and Windows) set GNUPATCH and GPERF
 if ($platform =~ m/solaris|darwin|freebsd|cygwin/)

Modified: incubator/ooo/branches/buildsys/main/sfx2/CppunitTest_sfx2_metadatable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/CppunitTest_sfx2_metadatable.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/CppunitTest_sfx2_metadatable.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/CppunitTest_sfx2_metadatable.mk Fri Oct  5 18:23:17 2012
@@ -27,6 +27,11 @@ $(eval $(call gb_CppunitTest_add_excepti
 	sfx2/qa/cppunit/test_metadatable \
 ))
 
+$(eval $(call gb_CppunitTest_add_api,sfx2_metadatable, \
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
     sal \
     sfx \
@@ -36,7 +41,6 @@ $(eval $(call gb_CppunitTest_add_linked_
 
 $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc \
 ))
 

Modified: incubator/ooo/branches/buildsys/main/sfx2/Library_sfx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/Library_sfx.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/Library_sfx.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/Library_sfx.mk Fri Oct  5 18:23:17 2012
@@ -34,6 +34,11 @@ $(eval $(call gb_Library_add_sdi_headers
 
 $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
 
+$(eval $(call gb_Library_add_api,sfx,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,sfx,\
 	-I$(SRCDIR)/sfx2/inc \
 	-I$(SRCDIR)/sfx2/inc/sfx2 \
@@ -42,9 +47,7 @@ $(eval $(call gb_Library_set_include,sfx
 	-I$(WORKDIR)/SdiTarget/sfx2/sdi \
 	-I$(WORKDIR)/inc/ \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc \
-	$(LIBXML_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_add_defs,sfx,\

Modified: incubator/ooo/branches/buildsys/main/sfx2/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/Package_inc.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/Package_inc.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/Package_inc.mk Fri Oct  5 18:23:17 2012
@@ -132,3 +132,4 @@ $(eval $(call gb_Package_add_file,sfx2_i
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/qswin32.h,sfx2/qswin32.h))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/qswin32.h,sfx2/qswin32.h))

Modified: incubator/ooo/branches/buildsys/main/sfx2/source/doc/objmisc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/source/doc/objmisc.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/source/doc/objmisc.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/source/doc/objmisc.cxx Fri Oct  5 18:23:17 2012
@@ -66,7 +66,7 @@
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 #include <com/sun/star/uno/Reference.h>

Modified: incubator/ooo/branches/buildsys/main/sfx2/source/inet/inettbc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/source/inet/inettbc.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/source/inet/inettbc.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/source/inet/inettbc.cxx Fri Oct  5 18:23:17 2012
@@ -39,7 +39,7 @@
 #include <svl/folderrestriction.hxx>
 #include <vcl/toolbox.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _VOS_THREAD_HXX //autogen
 #include <vos/thread.hxx>

Modified: incubator/ooo/branches/buildsys/main/sfx2/source/menu/virtmenu.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/source/menu/virtmenu.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/source/menu/virtmenu.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/source/menu/virtmenu.cxx Fri Oct  5 18:23:17 2012
@@ -32,7 +32,7 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <comphelper/processfactory.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/urlobj.hxx>
 
 #include "virtmenu.hxx"

Modified: incubator/ooo/branches/buildsys/main/sfx2/source/statbar/stbitem.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/source/statbar/stbitem.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/source/statbar/stbitem.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/source/statbar/stbitem.cxx Fri Oct  5 18:23:17 2012
@@ -54,7 +54,7 @@
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
 

Modified: incubator/ooo/branches/buildsys/main/sfx2/source/view/viewfrm.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/source/view/viewfrm.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/source/view/viewfrm.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/source/view/viewfrm.cxx Fri Oct  5 18:23:17 2012
@@ -32,7 +32,7 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/splitwin.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svl/intitem.hxx>

Modified: incubator/ooo/branches/buildsys/main/sfx2/source/view/viewsh.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/source/view/viewsh.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/source/view/viewsh.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/source/view/viewsh.cxx Fri Oct  5 18:23:17 2012
@@ -58,7 +58,7 @@
 #include <framework/actiontriggerhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 
 #include <sfx2/app.hxx>

Modified: incubator/ooo/branches/buildsys/main/shell/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/shell/prj/build.lst Fri Oct  5 18:23:17 2012
@@ -1,4 +1,4 @@
-sl    shell	:    L10N:l10n offuh rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL
+sl    shell	:    L10N:l10n offapi rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL
 sl    shell\inc			                           nmake   -   all sl_inc NULL
 sl    shell\source\win32                           nmake   -   w   sl_win32 sl_inc NULL
 sl    shell\source\win32\simplemail                nmake   -   w   sl_win32_simplemail sl_inc NULL

Modified: incubator/ooo/branches/buildsys/main/slideshow/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/slideshow/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/slideshow/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/slideshow/prj/build.lst Fri Oct  5 18:23:17 2012
@@ -1,4 +1,4 @@
-pe	slideshow	:	tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia LIBXSLT:libxslt NULL
+pe	slideshow	:	tools sal cppu vcl comphelper cppuhelper offapi cppcanvas basegfx svtools unotools toolkit animations avmedia LIBXSLT:libxslt NULL
 pe	slideshow								usr1	-	all	pe_mkout NULL
 pe	slideshow\inc							nmake	-	all	pe_inc NULL
 pe	slideshow\source\engine					nmake	-	all	pe_engine pe_inc NULL

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/AllLangResTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/AllLangResTarget.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/AllLangResTarget.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/AllLangResTarget.mk Fri Oct  5 18:23:17 2012
@@ -242,8 +242,8 @@ $(call gb_ResTarget_get_imagelist_target
 
 $(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) 
 $(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1))
 
 endef
 

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/CppunitTest.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/CppunitTest.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/CppunitTest.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/CppunitTest.mk Fri Oct  5 18:23:17 2012
@@ -94,6 +94,7 @@ $(eval $(foreach method,\
 	set_ldflags \
 	add_libs \
 	set_library_path_flags \
+	add_api \
 	add_linked_libs \
 	add_linked_static_libs \
 	use_external \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Deliver.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Deliver.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Deliver.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Deliver.mk Fri Oct  5 18:23:17 2012
@@ -30,15 +30,30 @@ gb_Deliver_CLEARONDELIVER := $(true)
 
 define gb_Deliver_init
 gb_Deliver_DELIVERABLES :=
+gb_Deliver_DELIVERABLES_INDEX := 
 
 endef
 
-define gb_Deliver_add_deliverable
-gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
+define gb_Deliver_do_add
+$$(if $(3),,$$(error - missing third parameter for deliverable $(1)))
+gb_Deliver_DELIVERABLES_$(notdir $(3)) += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
+gb_Deliver_DELIVERABLES_INDEX := $(sort $(gb_Deliver_DELIVERABLES_INDEX) $(notdir $(3)))
 $(if $(gb_HIRESTIME),,.LOW_RESOLUTION_TIME : $(1))
 
 endef
 
+define gb_Deliver_add_deliverable
+ifeq ($(MAKECMDGOALS),showdeliverables)
+$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
+else
+ifneq ($(CWS_WORK_STAMP),)
+else
+$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
+endif
+endif
+
+endef
+
 ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
 define gb_Deliver__deliver
 mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $(1) $(2) && touch -r $(1) $(2)
@@ -66,7 +81,7 @@ ifeq ($$(words $(gb_Module_ALLMODULES)),
 $$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1))
 deliverlog : COMMAND := \
  mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) \
- && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(gb_Deliver_DELIVERABLES))) \
+ && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(foreach list,$$(gb_Deliver_DELIVERABLES_INDEX),$$(gb_Deliver_DELIVERABLES_$$(list))))) \
  && $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk < $$$${RESPONSEFILE} \
         > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \
  && rm -f $$$${RESPONSEFILE}
@@ -91,7 +106,7 @@ endef
 
 showdeliverables :
 	$(eval MAKEFLAGS := s)
-	$(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\
+	$(foreach deliverable,$(sort $(foreach list,$(gb_Deliver_DELIVERABLES_INDEX),$(gb_Deliver_DELIVERABLES_$(list)))),\
 			$(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
 	true
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Executable.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Executable.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Executable.mk Fri Oct  5 18:23:17 2012
@@ -50,7 +50,7 @@ $(call gb_Executable_get_target,$(1)) : 
 $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Executable_Executable_platform,$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
 
 endef
 
@@ -59,6 +59,11 @@ $(call gb_Executable_get_target,$(1)) : 
 endef
 
 
+define gb_Executable_set_targettype_gui
+$(call gb_Executable_get_target,$(1)) : gb_Executable_TARGETGUI := $(2)
+endef
+
+
 define gb_Executable_forward_to_Linktarget
 gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3))
 
@@ -88,6 +93,7 @@ $(eval $(foreach method,\
 	set_ldflags \
 	add_libs \
 	set_library_path_flags \
+	add_api \
 	add_linked_libs \
 	add_linked_static_libs \
 	use_external \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Helper.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Helper.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Helper.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Helper.mk Fri Oct  5 18:23:17 2012
@@ -28,10 +28,22 @@ gb_Helper_MISC := $(WORKDIR)/Misc
 ifeq ($(JAVACOMPILER),)
 JAVACOMPILER := javac
 endif
+$(foreach group,$(gb_Library_VALIDGROUPS),\
+ $(foreach target,$(2),\
+  $(if $(filter $(target),$(gb_Library_$(group))),\
+   $(call gb_Output_error,gb_Helper_register_libraries: already registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_libraries: contains duplicates: $(2)))
 
 ifeq ($(JAVAINTERPRETER),)
 JAVAINTERPRETER := java
 endif
+$(foreach group,$(gb_Executable_VALIDGROUPS),\
+ $(foreach target,$(2),\
+  $(if $(filter $(target),$(gb_Executable_$(group))),\
+   $(call gb_Output_error,gb_Helper_register_executables: already registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_executables: contains duplicates: $(2)))
 
 # general propose phony target
 gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Library.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Library.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Library.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Library.mk Fri Oct  5 18:23:17 2012
@@ -124,6 +124,7 @@ $(eval $(foreach method,\
 	set_ldflags \
 	add_libs \
 	set_library_path_flags \
+	add_api \
 	add_linked_libs \
 	add_linked_static_libs \
 	add_external_libs \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/LinkTarget.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/LinkTarget.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/LinkTarget.mk Fri Oct  5 18:23:17 2012
@@ -19,6 +19,24 @@
 #  
 #**************************************************************
 
+#the following user-defined variables are supported:
+# CPPFLAGS
+# CFLAGS
+# CXXFLAGS
+# OBJCXXFLAGS
+# LDFLAGS
+
+# CFLAGS from environment override debug/optimization flags
+ifeq ($(gb_DEBUGLEVEL),2)
+CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
+CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
+OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
+else
+CFLAGS ?= $(gb_COMPILEROPTFLAGS)
+CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
+OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
+endif
+
 
 # For every object there is a dep file (if gb_FULLDEPS is active).
 # The dep file depends on the object: the Object__command also updates the
@@ -40,6 +58,25 @@ endif
 
 
 
+# For every object there is a dep file (if gb_FULLDEPS is active).
+# The dep file depends on the object: the Object__command also updates the
+# dep file as a side effect.
+# In the dep file rule just touch it so it's newer than the object.
+
+# The gb_Object__command_dep generates an "always rebuild" dep file;
+# It is _only_ used in case the user deletes the object dep file.
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_Object__command_dep
+mkdir -p $(dir $(1)) && \
+	echo '$(2) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_Object__command_dep = \
+ $(call gb_Output_error,gb_Object__command_dep is only for gb_FULLDEPS)
+endif
+
+
 # CObject class
 
 gb_CObject_REPOS := $(gb_REPOS)
@@ -323,7 +360,7 @@ $(call gb_LinkTarget_get_headers_target,
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
-$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $$(gb_LinkTarget_LDFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(LDFLAGS)
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := 
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := 
 $(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_LIBS := 
@@ -367,6 +404,17 @@ $(call gb_LinkTarget_get_dep_target,$(1)
 endif
 endef
 
+define gb_LinkTarget_add_defs
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS += $(2)
+endif
+endef
+
 define gb_LinkTarget_set_defs
 ifeq (,)
 $$(call gb_Output_error,\
@@ -403,6 +451,7 @@ ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2)
 endif
 endif
+endif
 
 endef
 
@@ -451,6 +500,7 @@ ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2)
 endif
 endif
+endif
 
 endef
 
@@ -485,6 +535,21 @@ define gb_LinkTarget_add_libs
 $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
 endef
 
+define gb_LinkTarget_add_api
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+	$$(foreach api,$(2),$$(call gb_Package_get_target,$$(api)_inc))
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
+endif
+
+endef
+
+define gb_LinkTarget_add_libs
+$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
+endef
+
 define gb_LinkTarget_add_linked_libs
 ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
 $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
@@ -720,4 +785,17 @@ gb_LinkTarget_use_externals = \
  $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external)))
 
 
+# this forwards to functions that must be defined in RepositoryExternal.mk.
+# $(call gb_LinkTarget_use_external,library,external)
+define gb_LinkTarget_use_external
+$(eval $(if $(value gb_LinkTarget__use_$(2)),\
+  $(call gb_LinkTarget__use_$(2),$(1)),\
+  $(error gb_LinkTarget_use_external: unknown external: $(2))))
+endef
+
+# $(call gb_LinkTarget_use_externals,library,externals)
+gb_LinkTarget_use_externals = \
+ $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external)))
+
+
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Package.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Package.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Package.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Package.mk Fri Oct  5 18:23:17 2012
@@ -30,8 +30,7 @@ $(foreach destination,$(call gb_PackageP
 define gb_PackagePart_PackagePart
 $(OUTDIR)/$(1) : $(2)
 $(2) :| $(3)
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2))
-
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2),$(3))
 endef
 
 
@@ -40,8 +39,9 @@ endef
 .PHONY : $(call gb_Package_get_clean_target,%)
 $(call gb_Package_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PKG,2)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(FILES))
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
+	&& cat $${RESPONSEFILE} | xargs rm -f \
+ 	&& rm -f $${RESPONSEFILE}
 
 $(call gb_Package_get_preparation_target,%) :
 	mkdir -p $(dir $@) && touch $@

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/StaticLibrary.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/StaticLibrary.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/StaticLibrary.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/StaticLibrary.mk Fri Oct  5 18:23:17 2012
@@ -66,7 +66,7 @@ $(call gb_StaticLibrary_get_target,$(1))
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
 
 endef
 
@@ -98,6 +98,7 @@ $(eval $(foreach method,\
 	set_ldflags \
 	add_libs \
 	set_library_path_flags \
+	add_api \
 	add_linked_libs \
 	add_linked_static_libs \
 	add_package_headers \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/TargetLocations.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/TargetLocations.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/TargetLocations.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/TargetLocations.mk Fri Oct  5 18:23:17 2012
@@ -24,8 +24,9 @@
 # outdir target pattern
 
 gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
+gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
 gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
-gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin
+gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin $(OUTDIR)/idl $(OUTDIR)/pck
 gb_PackagePart_get_target = $(OUTDIR)/$(1)
 gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
 gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
@@ -66,6 +67,10 @@ gb_JunitTest_get_userdir = $(WORKDIR)/Ju
 gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1)
 gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1)
 gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1)
+gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
+gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb
+gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
+gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
 gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1)
 gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
 gb_Module_get_target = $(WORKDIR)/Module/$(1)
@@ -119,6 +124,8 @@ $(eval $(call gb_Helper_make_clean_targe
 	SrsTarget \
 	CppunitTest \
 	CustomTarget \
+	UnoApiTarget \
+	Zip \
 ))
 
 $(eval $(call gb_Helper_make_outdir_clean_targets,\
@@ -126,6 +133,7 @@ $(eval $(call gb_Helper_make_outdir_clea
 	Library \
 	Package \
 	StaticLibrary \
+	UnoApiOutTarget \
 ))
 
 $(eval $(call gb_Helper_make_dep_targets,\
@@ -135,6 +143,7 @@ $(eval $(call gb_Helper_make_dep_targets
 	LinkTarget \
 	SrsPartTarget \
 	SrsTarget \
+	UnoApiTarget \
 ))
 
 # other getters

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/gbuild.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/gbuild.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/gbuild.mk Fri Oct  5 18:23:17 2012
@@ -210,6 +210,10 @@ include $(GBUILDDIR)/Deliver.mk
 
 $(eval $(call gb_Deliver_init))
 
+include $(SOLARENV)/inc/minor.mk
+
+include $(SOLARENV)/inc/minor.mk
+
 # We are using a set of scopes that we might as well call classes.
 
 # It is important to include them in the right order as that is

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/linux.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/linux.mk Fri Oct  5 18:23:17 2012
@@ -141,6 +141,12 @@ ifeq ($(gb_DEBUGLEVEL),0)
 gb_LinkTarget_LDFLAGS += -Wl,-O1
 endif
 
+ifeq ($(gb_DEBUGLEVEL),0)
+gb_LinkTarget_LDFLAGS += -Wl,-O1
+endif
+
+gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
 
 ifeq ($(gb_DEBUGLEVEL),2)
@@ -180,6 +186,12 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(INCLUDE))
 endef
 
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
 
 # CxxObject class
 
@@ -415,6 +427,19 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH
 gb_Library_COMPONENTPREFIXES := \
     OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
     URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
+# UnoApiTarget
 
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/macosx.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/macosx.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/macosx.mk Fri Oct  5 18:23:17 2012
@@ -128,6 +128,8 @@ gb_LinkTarget_LDFLAGS := \
 
 gb_DEBUG_CFLAGS := -g
 
+gb_DEBUG_CFLAGS := -g
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 else
@@ -147,6 +149,13 @@ define gb_Helper_convert_native
 $(1)
 endef
 
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
 
 # CObject class
 
@@ -445,6 +454,19 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
 
 # ComponentTarget
 

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/os2.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/os2.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/os2.mk Fri Oct  5 18:23:17 2012
@@ -436,11 +436,11 @@ $(call gb_Library_get_clean_target,$(1))
 		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
 		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))),$(patsubst %.dll,%.pdb,$(3)))
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))),$(patsubst %.dll,%.ilk,$(3)))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))),$(patsubst %.dll,%.pdb,$(3)),$(1))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))),$(patsubst %.dll,%.ilk,$(3)),$(1))
 endif
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
@@ -502,7 +502,7 @@ define gb_Executable_Executable_platform
 
 #$(call gb_Executable_get_target,$(1)) \
 #$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest
-#$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest)
+#$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest,$(1))
 
 #$(call gb_LinkTarget_get_target,$(2)) \
 #$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/solaris.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/solaris.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/solaris.mk Fri Oct  5 18:23:17 2012
@@ -107,6 +107,9 @@ gb_LinkTarget_LDFLAGS := \
 
 gb_DEBUG_CFLAGS := -g
 
+
+gb_DEBUG_CFLAGS := -g
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS :=
 else
@@ -134,6 +137,13 @@ define gb_Helper_convert_native
 $(1)
 endef
 
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
 
 # CObject class
 
@@ -397,6 +407,19 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH
 gb_Library_COMPONENTPREFIXES := \
     OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
     URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
+# UnoApiTarget
 
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/windows.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/windows.mk Fri Oct  5 18:23:17 2012
@@ -122,7 +122,6 @@ gb_CXXFLAGS := \
 	-GR \
 	-Gs \
 	-GS \
-	-Gy \
 	-nologo \
 	-Wall \
 	-wd4005 \
@@ -237,6 +236,17 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR
 $(1)))))
 endef
 
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
 
 # CObject class
 
@@ -414,6 +424,7 @@ $(call gb_Helper_abbreviate_dirs_native,
 		$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
 		$(patsubst %,%.lib,$(EXTERNAL_LIBS)) \
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
+		$(LIBS) \
 		$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
 	$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
 endef
@@ -448,8 +459,8 @@ gb_Library_PLAINLIBS_NONE += \
 	user32 \
 	uuid \
 	uwinapi \
+	winmm \
 	winspool \
-	z \
 	cppunit
 
 gb_Library_LAYER := \
@@ -506,17 +517,20 @@ $(call gb_LinkTarget_set_auxtargets,$(2)
 $(call gb_Library_get_target,$(1)) \
 $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
 
+gb_DEBUG_CFLAGS := -Zi
+
+# this does not use CFLAGS so it is not overridable
 ifneq ($(ENABLE_CRASHDUMP),)
 $(call gb_Library_get_target,$(1)) \
 $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
 		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
 		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))),$(patsubst %.dll,%.pdb,$(3)))
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))),$(patsubst %.dll,%.ilk,$(3)))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))),$(patsubst %.dll,%.pdb,$(3)),$(1))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))),$(patsubst %.dll,%.ilk,$(3)),$(1))
 endif
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
@@ -588,7 +602,7 @@ $(call gb_LinkTarget_set_auxtargets,$(2)
 
 $(call gb_Executable_get_target,$(1)) \
 $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest
-$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest)
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest,$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
@@ -744,5 +758,19 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:
 gb_Library_COMPONENTPREFIXES := \
     OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
     URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
+gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
+gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
+gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
 # vim: set noet sw=4 ts=4:



Mime
View raw message