Author: damjan
Date: Sun Feb 21 11:57:04 2016
New Revision: 1731524

URL: http://svn.apache.org/viewvc?rev=1731524&view=rev
Log:
Merge r1409400 from branches/gbuild:
#i117218# change .idl handling to gnu make

DOESN'T BUILD

Build updates by: me


Modified:
    openoffice/branches/gbuild-reintegration/   (props changed)
    openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
    openoffice/branches/gbuild-reintegration/main/UnoControls/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/accessibility/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/animations/prj/build.lst
    
openoffice/branches/gbuild-reintegration/main/basctl/source/dlged/propbrw.cxx
    openoffice/branches/gbuild-reintegration/main/basegfx/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/basic/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/binaryurp/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/chart2/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/codemaker/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk
    openoffice/branches/gbuild-reintegration/main/comphelper/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/configmgr/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/cppu/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/cppuhelper/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/cpputools/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/cui/source/customize/cfg.cxx
    
openoffice/branches/gbuild-reintegration/main/cui/source/dialogs/hlmarkwn.cxx
    
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx
    
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppControllerGen.cxx
    
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dataview.cxx
    
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/unodatbr.cxx
    
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
    
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryTextView.cxx
    
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
    openoffice/branches/gbuild-reintegration/main/desktop/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/desktop/source/app/app.cxx
    
openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk
    openoffice/branches/gbuild-reintegration/main/drawinglayer/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/dtrans/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk
    
openoffice/branches/gbuild-reintegration/main/editeng/source/items/textitem.cxx
    
openoffice/branches/gbuild-reintegration/main/editeng/source/uno/unonrule.cxx
    openoffice/branches/gbuild-reintegration/main/embeddedobj/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/embedserv/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/extensions/prj/build.lst
    
openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/admininvokationimpl.cxx
    
openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/fieldmappingimpl.cxx
    
openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/fontdialog.cxx
    
openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/propcontroller.cxx
    
openoffice/branches/gbuild-reintegration/main/filter/source/graphicfilter/icgm/actimpr.cxx
    
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/escherex.cxx
    
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/eschesdo.cxx
    
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/svdfppt.cxx
    openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk
    openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk
    openoffice/branches/gbuild-reintegration/main/framework/Library_fwk.mk
    openoffice/branches/gbuild-reintegration/main/framework/Library_fwl.mk
    openoffice/branches/gbuild-reintegration/main/framework/Library_fwm.mk
    
openoffice/branches/gbuild-reintegration/main/framework/inc/pch/precompiled_framework.hxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/classes/menumanager.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/helper/persistentwindowstate.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/helper/statusindicatorfactory.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/helper/tagwindowasmodified.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/helper/titlebarupdate.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/helper/vclstatusindicator.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/inc/pattern/window.hxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/helpers.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/layoutmanager.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panel.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panelmanager.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/loadenv/loadenv.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/services/frame.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/services/taskcreatorsrv.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/tabwin/tabwindow.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarmanager.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarwrapper.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/menubarmanager.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/panelwrapper.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/statusbarwrapper.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarmanager.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarsmenucontroller.cxx
    
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarwrapper.cxx
    openoffice/branches/gbuild-reintegration/main/i18nutil/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/jvmaccess/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/mysqlc/prj/build.lst
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/drawing/SlideSorter.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/drawing/XPresenterHelper.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/frame/XUntitledNumbers.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/inspection/XStringRepresentation.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/presentation/XSlideShow.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/presentation/XTransitionFactory.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/rendering/XCanvas.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/rendering/XColorSpace.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XFixedLine.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XFixedText.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XFormatCondition.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XFormattedField.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XFunction.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XGroup.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XGroups.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XImageControl.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XReportControlFormat.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XReportControlModel.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XReportDefinition.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XSection.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/report/XShape.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/setup/InstallResponse.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/sync/SyncInfo.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/util/XTextSearch.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
    
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
    openoffice/branches/gbuild-reintegration/main/offapi/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/offapi/prj/d.lst
    
openoffice/branches/gbuild-reintegration/main/oovbaapi/ooo/vba/excel/SheetObject.idl
    
openoffice/branches/gbuild-reintegration/main/oovbaapi/ooo/vba/excel/SheetObjects.idl
    openoffice/branches/gbuild-reintegration/main/oovbaapi/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/oovbaapi/prj/d.lst
    
openoffice/branches/gbuild-reintegration/main/padmin/Executable_spadmin.bin.mk
    openoffice/branches/gbuild-reintegration/main/padmin/Library_spa.mk
    openoffice/branches/gbuild-reintegration/main/remotebridges/prj/build.lst
    
openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/propbrw.cxx
    
openoffice/branches/gbuild-reintegration/main/sc/source/filter/excel/xlstyle.cxx
    
openoffice/branches/gbuild-reintegration/main/sc/source/ui/unoobj/targuno.cxx
    
openoffice/branches/gbuild-reintegration/main/sc/source/ui/vba/vbaeventshelper.cxx
    openoffice/branches/gbuild-reintegration/main/sccomp/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/sd/inc/pch/precompiled_sd.hxx
    
openoffice/branches/gbuild-reintegration/main/sd/source/filter/eppt/epptso.cxx
    
openoffice/branches/gbuild-reintegration/main/sd/source/ui/slideshow/slideshow.cxx
    
openoffice/branches/gbuild-reintegration/main/sd/source/ui/slideshow/slideshowimpl.cxx
    
openoffice/branches/gbuild-reintegration/main/sd/source/ui/unoidl/unopage.cxx
    
openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/ToolBarManager.cxx
    openoffice/branches/gbuild-reintegration/main/sd/source/ui/view/drviews8.cxx
    openoffice/branches/gbuild-reintegration/main/sdext/prj/build.lst
    
openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk
    openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk
    openoffice/branches/gbuild-reintegration/main/sfx2/Library_sfx.mk
    openoffice/branches/gbuild-reintegration/main/sfx2/source/doc/objmisc.cxx
    openoffice/branches/gbuild-reintegration/main/sfx2/source/inet/inettbc.cxx
    openoffice/branches/gbuild-reintegration/main/sfx2/source/menu/virtmenu.cxx
    
openoffice/branches/gbuild-reintegration/main/sfx2/source/statbar/stbitem.cxx
    openoffice/branches/gbuild-reintegration/main/sfx2/source/view/viewfrm.cxx
    openoffice/branches/gbuild-reintegration/main/sfx2/source/view/viewsh.cxx
    openoffice/branches/gbuild-reintegration/main/shell/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/slideshow/prj/build.lst
    
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/AllLangResTarget.mk
    
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/ComponentTarget.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Deliver.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Executable.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Package.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/StaticLibrary.mk
    
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/gbuild.mk
    
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
    
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
    
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
    
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
    
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
    openoffice/branches/gbuild-reintegration/main/solenv/inc/target.mk
    openoffice/branches/gbuild-reintegration/main/sot/Library_sot.mk
    openoffice/branches/gbuild-reintegration/main/svgio/Library_svgio.mk
    openoffice/branches/gbuild-reintegration/main/svl/Library_fsstorage.mk
    
openoffice/branches/gbuild-reintegration/main/svl/Library_passwordcontainer.mk
    openoffice/branches/gbuild-reintegration/main/svl/Library_svl.mk
    openoffice/branches/gbuild-reintegration/main/svl/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/svtools/Executable_bmp.mk
    openoffice/branches/gbuild-reintegration/main/svtools/Executable_bmpsum.mk
    openoffice/branches/gbuild-reintegration/main/svtools/Executable_g2g.mk
    
openoffice/branches/gbuild-reintegration/main/svtools/Library_hatchwindowfactory.mk
    openoffice/branches/gbuild-reintegration/main/svtools/Library_svt.mk
    openoffice/branches/gbuild-reintegration/main/svtools/prj/build.lst
    
openoffice/branches/gbuild-reintegration/main/svtools/source/uno/contextmenuhelper.cxx
    
openoffice/branches/gbuild-reintegration/main/svtools/source/uno/toolboxcontroller.cxx
    openoffice/branches/gbuild-reintegration/main/svx/Library_svx.mk
    openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk
    
openoffice/branches/gbuild-reintegration/main/svx/Library_textconversiondlgs.mk
    
openoffice/branches/gbuild-reintegration/main/svx/source/dialog/docrecovery.cxx
    openoffice/branches/gbuild-reintegration/main/svx/source/dialog/srchdlg.cxx
    openoffice/branches/gbuild-reintegration/main/svx/source/form/fmPropBrw.cxx
    openoffice/branches/gbuild-reintegration/main/svx/source/form/fmtools.cxx
    
openoffice/branches/gbuild-reintegration/main/svx/source/unodraw/unoshap2.cxx
    
openoffice/branches/gbuild-reintegration/main/svx/source/unodraw/unoshape.cxx
    
openoffice/branches/gbuild-reintegration/main/svx/source/xoutdev/xattrbmp.cxx
    openoffice/branches/gbuild-reintegration/main/svx/workben/msview/msview.cxx
    openoffice/branches/gbuild-reintegration/main/sw/Library_msword.mk
    openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk
    openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk
    openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk
    openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk
    openoffice/branches/gbuild-reintegration/main/sw/inc/pch/precompiled_sw.hxx
    
openoffice/branches/gbuild-reintegration/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx
    
openoffice/branches/gbuild-reintegration/main/sw/source/ui/envelp/mailmrge.cxx
    openoffice/branches/gbuild-reintegration/main/sw/source/ui/uiview/view.cxx
    openoffice/branches/gbuild-reintegration/main/toolkit/Library_tk.mk
    openoffice/branches/gbuild-reintegration/main/toolkit/Package_inc.mk
    openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk
    
openoffice/branches/gbuild-reintegration/main/tools/StaticLibrary_ooopathutils.mk
    openoffice/branches/gbuild-reintegration/main/tools/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/udkapi/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/udkapi/prj/d.lst
    openoffice/branches/gbuild-reintegration/main/unotools/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/unoxml/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/vbahelper/Library_msforms.mk
    openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk
    openoffice/branches/gbuild-reintegration/main/vbahelper/prj/build.lst
    
openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk
    openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk
    openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk
    openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk
    openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk
    openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk
    openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk
    openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk
    openoffice/branches/gbuild-reintegration/main/vcl/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk
    openoffice/branches/gbuild-reintegration/main/xmloff/Library_xof.mk
    openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst

Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409397
+/incubator/ooo/branches/gbuild:1409313-1409400
 /openoffice/branches/AOO400:1503684
 /openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
 /openoffice/branches/alg_writerframes:1556289-1579189

Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Sun Feb 21 
11:57:04 2016
@@ -26,22 +26,25 @@ $(eval $(call gb_Module_Module,ooo))
 $(eval $(call gb_Module_add_moduledirs,ooo,\
        comphelper \
        drawinglayer \
-       svgio \
-    editeng \
+       editeng \
        framework \
+       offapi \
+       oovbaapi \
        padmin \
        sfx2 \
-    sot \
+       sot \
+       svgio \
        svl \
        svtools \
        svx \
        sw \
        toolkit \
        tools \
-    vcl \
+       udkapi \
        unoxml \
+       vbahelper \
+       vcl \
        xmloff \
-    vbahelper \
        formula \
 ))
 

Modified: 
openoffice/branches/gbuild-reintegration/main/UnoControls/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/UnoControls/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/UnoControls/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/UnoControls/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-us     UnoControls     : LIBXSLT:libxslt cppuhelper offuh tools NULL
+us     UnoControls     : LIBXSLT:libxslt cppuhelper offapi tools NULL
 us     UnoControls                                                             
usr1    -       all     us_mkout NULL
 us     UnoControls\source\base                                 nmake   -       
all     us_base NULL
 us     UnoControls\source\controls                             nmake   -       
all     us_ctrls NULL

Modified: 
openoffice/branches/gbuild-reintegration/main/accessibility/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/accessibility/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/accessibility/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/accessibility/prj/build.lst 
Sun Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-ac  accessibility      :    L10N:l10n tools jurt offuh unoil vcl javaunohelper 
jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
+ac  accessibility      :    L10N:l10n tools jurt offapi unoil vcl 
javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
 ac     accessibility                                           usr1    -       
all     ac_mkout NULL
 ac     accessibility\inc                                       nmake   -       
all     ac_inc NULL
 ac     accessibility\bridge\org\openoffice\java\accessibility  nmake   -       
w       ac_ooja ac_inc NULL

Modified: openoffice/branches/gbuild-reintegration/main/animations/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/animations/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/animations/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/animations/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,3 +1,3 @@
-animations     animations      :       cppuhelper comphelper offuh 
LIBXSLT:libxslt NULL
+animations     animations      :       cppuhelper comphelper offapi 
LIBXSLT:libxslt NULL
 animations     animations                                              usr1    
-       all     animations_mkout NULL
 animations     animations\source\animcore              nmake   -       all     
animations_animcore NULL

Modified: 
openoffice/branches/gbuild-reintegration/main/basctl/source/dlged/propbrw.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basctl/source/dlged/propbrw.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/basctl/source/dlged/propbrw.cxx 
(original)
+++ 
openoffice/branches/gbuild-reintegration/main/basctl/source/dlged/propbrw.cxx 
Sun Feb 21 11:57:04 2016
@@ -52,7 +52,7 @@
 #include <sfx2/viewsh.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/property.hxx>
 #include <comphelper/composedprops.hxx>

Modified: openoffice/branches/gbuild-reintegration/main/basegfx/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basegfx/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/basegfx/prj/build.lst Sun Feb 
21 11:57:04 2016
@@ -1,4 +1,4 @@
-fx     basegfx :       o3tl sal offuh cppuhelper cppu NULL
+fx     basegfx :       o3tl sal offapi cppuhelper cppu NULL
 fx     basegfx                                                                 
usr1    -       all     fx_mkout NULL
 fx     basegfx\inc                                                             
nmake   -       all     fx_inc NULL
 fx     basegfx\prj                                                             
get             -       all     fx_prj NULL

Modified: openoffice/branches/gbuild-reintegration/main/basic/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basic/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basic/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/basic/prj/build.lst Sun Feb 
21 11:57:04 2016
@@ -1,4 +1,4 @@
-sb     basic   :    L10N:l10n offuh oovbaapi svtools xmlscript framework 
salhelper LIBXSLT:libxslt NULL
+sb     basic   :    L10N:l10n offapi oovbaapi svtools xmlscript framework 
salhelper LIBXSLT:libxslt NULL
 sb     basic                                                                   
usr1    -       all     sb_mkout NULL
 sb     basic\inc                                                               
nmake   -       all     sb_inc NULL
 sb     basic\source\basmgr                                             nmake   
-       all     sb_mgr sb_inc NULL

Modified: openoffice/branches/gbuild-reintegration/main/binaryurp/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/binaryurp/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/binaryurp/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/binaryurp/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,3 +1,3 @@
-bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offuh sal salhelper 
stlport NULL
+bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal 
salhelper stlport NULL
 bu binaryurp\source nmake - all bu_source NULL
 bu binaryurp\qa nmake - all bu_qa bu_source NULL

Modified: openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst Sun Feb 
21 11:57:04 2016
@@ -1,4 +1,4 @@
-cv     canvas  :       javaunohelper comphelper cppuhelper offuh unoil tools 
svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
+cv     canvas  :       javaunohelper comphelper cppuhelper offapi unoil tools 
svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
 cv     canvas                                                                  
                 usr1   -       all     cv_mkout NULL
 cv     canvas\inc                                                              
                 nmake  -       all     cv_inc NULL
 cv     canvas\source\tools                                                     
         nmake  -       all cv_tools cv_inc NULL

Modified: openoffice/branches/gbuild-reintegration/main/chart2/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/chart2/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/chart2/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/chart2/prj/build.lst Sun Feb 
21 11:57:04 2016
@@ -1,4 +1,4 @@
-ch     chart2  :    offapi offuh L10N:l10n comphelper cppu cppuhelper sal 
svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
+ch     chart2  :    offapi offapi L10N:l10n comphelper cppu cppuhelper sal 
svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
 ch     chart2                                                                  
        usr1    -       all     ch_mkout NULL
 ch     chart2\inc                                                              
        nmake   -       all     ch_inc NULL
 ch     chart2\source\inc                                                       
get             -       all     ch_source_inc NULL

Modified: openoffice/branches/gbuild-reintegration/main/codemaker/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/codemaker/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/codemaker/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/codemaker/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-cm     codemaker       :       udkapi NULL
+cm     codemaker       :       registry NULL
 cm     codemaker                                                               
usr1    -       all     cm_mkout NULL
 cm     codemaker\inc                                                   nmake   
-       all     cm_inc NULL
 cm     codemaker\prj                                                   get     
        -       all     cm_prj NULL

Modified: 
openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk 
(original)
+++ 
openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk 
Sun Feb 21 11:57:04 2016
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,com
        -I$(SRCDIR)/comphelper/inc/pch \
        -I$(SRCDIR)/comphelper/source/inc \
        $$(INCLUDE) \
-       -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,comphelper,\
@@ -51,6 +50,11 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_api,comphelper,\
+       udkapi \
+       offapi \
+))
+
 $(eval $(call gb_Library_add_exception_objects,comphelper,\
        comphelper/source/compare/AnyCompareFactory \
        comphelper/source/container/IndexedPropertyValuesContainer \

Modified: openoffice/branches/gbuild-reintegration/main/comphelper/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/comphelper/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/comphelper/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/comphelper/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,2 +1,2 @@
-ch comphelper : cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL
+ch comphelper : cppuhelper ucbhelper offapi vos salhelper LIBXSLT:libxslt NULL
 ch comphelper\prj nmake - all ch_all NULL

Modified: openoffice/branches/gbuild-reintegration/main/configmgr/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/configmgr/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/configmgr/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/configmgr/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offuh 
sal salhelper stlport xmlreader NULL
+cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi 
sal salhelper stlport xmlreader NULL
 cg configmgr\inc nmake - all cg_inc NULL
 cg configmgr\source nmake - all cg_source cg_inc NULL
 cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL

Modified: openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-cx     cppcanvas       :       comphelper cppuhelper offuh tools vcl basegfx 
canvas NULL
+cx     cppcanvas       :       comphelper cppuhelper offapi tools vcl basegfx 
canvas NULL
 cx     cppcanvas                                                       usr1    
-       all     cx_mkout NULL
 cx     cppcanvas\inc                                           nmake   -       
all     cx_inc NULL
 cx     cppcanvas\source\tools                          nmake   -       all     
cx_tools cx_inc NULL

Modified: openoffice/branches/gbuild-reintegration/main/cppu/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cppu/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/cppu/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/cppu/prj/build.lst Sun Feb 21 
11:57:04 2016
@@ -1,4 +1,4 @@
-cu     cppu    :       sal salhelper offuh BOOST:boost NULL
+cu     cppu    :       sal salhelper offapi BOOST:boost NULL
 cu     cppu                                                    usr1    -       
all     cu_mkout NULL
 cu     cppu\inc                                                nmake   -       
all     cu_inc NULL
 cu     cppu\source\uno                                 nmake   -       all     
cu_uno cu_inc NULL

Modified: openoffice/branches/gbuild-reintegration/main/cppuhelper/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cppuhelper/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/cppuhelper/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/cppuhelper/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-ch     cppuhelper      :       BOOST:boost LIBXSLT:libxslt codemaker cppu 
offuh NULL
+ch     cppuhelper      :       BOOST:boost LIBXSLT:libxslt codemaker cppu 
offapi NULL
 ch     cppuhelper                                                              
usr1    -       all     ch_mkout NULL
 ch     cppuhelper\inc                                                  nmake   
-       all     ch_include NULL
 ch     cppuhelper\source                                               nmake   
-       all     ch_source ch_unotypes ch_include NULL

Modified: openoffice/branches/gbuild-reintegration/main/cpputools/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cpputools/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/cpputools/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/cpputools/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-pt     cpputools       :       cppuhelper offuh LIBXML2:libxml2 NULL
+pt     cpputools       :       cppuhelper offapi LIBXML2:libxml2 NULL
 pt     cpputools                                                               
usr1    -       all     pt_mkout NULL
 pt     cpputools\prj                                                   get     
        -       all     pt_prj NULL
 pt     cpputools\source\registercomponent              nmake   -       all     
pt_regcomp NULL

Modified: 
openoffice/branches/gbuild-reintegration/main/cui/source/customize/cfg.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cui/source/customize/cfg.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/cui/source/customize/cfg.cxx 
(original)
+++ openoffice/branches/gbuild-reintegration/main/cui/source/customize/cfg.cxx 
Sun Feb 21 11:57:04 2016
@@ -57,7 +57,7 @@
 #include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
 #include <tools/diagnose_ex.h>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
 //add

Modified: 
openoffice/branches/gbuild-reintegration/main/cui/source/dialogs/hlmarkwn.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cui/source/dialogs/hlmarkwn.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/cui/source/dialogs/hlmarkwn.cxx 
(original)
+++ 
openoffice/branches/gbuild-reintegration/main/cui/source/dialogs/hlmarkwn.cxx 
Sun Feb 21 11:57:04 2016
@@ -40,7 +40,7 @@
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <cuires.hrc>
 #include "hlmarkwn.hrc"

Modified: 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx
 Sun Feb 21 11:57:04 2016
@@ -71,7 +71,7 @@
 #include <unotools/pathoptions.hxx>
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>

Modified: 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppControllerGen.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppControllerGen.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppControllerGen.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppControllerGen.cxx
 Sun Feb 21 11:57:04 2016
@@ -68,7 +68,7 @@
 #include <connectivity/dbexception.hxx>
 #include <sfx2/mailmodelapi.hxx>
 #include <svx/dbaexchange.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dataview.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dataview.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dataview.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dataview.cxx
 Sun Feb 21 11:57:04 2016
@@ -28,7 +28,7 @@
 #include "dataview.hxx"
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/unodatbr.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/unodatbr.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/unodatbr.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/unodatbr.cxx
 Sun Feb 21 11:57:04 2016
@@ -119,7 +119,7 @@
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/databaseregistrationui.hxx>
 #include <svx/gridctrl.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/multisel.hxx>
 #include <tools/urlobj.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
 Sun Feb 21 11:57:04 2016
@@ -50,7 +50,7 @@
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryTextView.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryTextView.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryTextView.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryTextView.cxx
 Sun Feb 21 11:57:04 2016
@@ -51,7 +51,7 @@
 #include "dbustrings.hrc"
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _SV_SPLIT_HXX 
 #include <vcl/split.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
 Sun Feb 21 11:57:04 2016
@@ -40,7 +40,7 @@
 #include "JoinController.hxx"
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"

Modified: openoffice/branches/gbuild-reintegration/main/desktop/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/desktop/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/desktop/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/desktop/prj/build.lst Sun Feb 
21 11:57:04 2016
@@ -1,4 +1,4 @@
-dt      desktop :    L10N:l10n sfx2 stoc sysui SO:sysui_so BOOST:boost svx 
xmlhelp sal unoil officecfg offuh filter LIBXSLT:libxslt NULL
+dt      desktop :    L10N:l10n sfx2 stoc sysui SO:sysui_so BOOST:boost svx 
xmlhelp sal unoil officecfg offapi filter LIBXSLT:libxslt NULL
 dt     desktop                                                                 
usr1    -       all     dt_mkout NULL
 dt     desktop\inc                                                             
nmake   -       all     dt_inc NULL
 dt     desktop\prj                                                             
get             -       all     dt_prj NULL

Modified: 
openoffice/branches/gbuild-reintegration/main/desktop/source/app/app.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/desktop/source/app/app.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/desktop/source/app/app.cxx 
(original)
+++ openoffice/branches/gbuild-reintegration/main/desktop/source/app/app.cxx 
Sun Feb 21 11:57:04 2016
@@ -97,7 +97,7 @@
 #include <tools/testtoolloader.hxx>
 #include <tools/solar.h>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vos/security.hxx>
 #include <vos/ref.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk
 Sun Feb 21 11:57:04 2016
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,dra
        -I$(SRCDIR)/drawinglayer/inc/pch \
        -I$(SRCDIR)/drawinglayer/source/processor2d \
        -I$(SRCDIR)/solenv/inc \
-       -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,drawinglayer,\
+       udkapi \
+       offapi \
 ))
 
 $(eval $(call gb_Library_set_defs,drawinglayer,\

Modified: 
openoffice/branches/gbuild-reintegration/main/drawinglayer/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/drawinglayer/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/drawinglayer/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/drawinglayer/prj/build.lst 
Sun Feb 21 11:57:04 2016
@@ -1,2 +1,2 @@
-dl     drawinglayer    :       sal vcl basegfx offuh cppuhelper cppu svtools 
avmedia canvas cppcanvas NULL
+dl     drawinglayer    :       sal vcl basegfx offapi cppuhelper cppu svtools 
avmedia canvas cppcanvas NULL
 dl     drawinglayer\prj nmake - all drawinglayer_prj NULL

Modified: openoffice/branches/gbuild-reintegration/main/dtrans/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dtrans/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dtrans/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/dtrans/prj/build.lst Sun Feb 
21 11:57:04 2016
@@ -1,4 +1,4 @@
-dr     dtrans  :       unotools offapi offuh rdbmaker vos stoc LIBXSLT:libxslt 
NULL
+dr     dtrans  :       unotools offapi offapi rdbmaker vos stoc 
LIBXSLT:libxslt NULL
 dr     dtrans                                                                  
usr1    -       all     dr_mkout NULL
 dr     dtrans\inc                                                              
nmake   -       all     dr_inc NULL
 dr     dtrans\source\cnttype                                   nmake   -       
all     dr_cnttype dr_generic dr_inc NULL

Modified: 
openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk 
(original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk 
Sun Feb 21 11:57:04 2016
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,edi
        $$(INCLUDE) \
        -I$(SRCDIR)/editeng/inc/pch \
     -I$(SRCDIR)/editeng/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,editeng,\
@@ -46,6 +45,11 @@ $(eval $(call gb_Library_set_defs,editen
 ))
 endif
 
+$(eval $(call gb_Library_add_api,editeng,\
+       udkapi \
+       offapi \
+))
+
 $(eval $(call gb_Library_add_exception_objects,editeng,\
     editeng/inc/pch/precompiled_editeng \
     editeng/source/accessibility/AccessibleComponentBase \

Modified: 
openoffice/branches/gbuild-reintegration/main/editeng/source/items/textitem.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/source/items/textitem.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/editeng/source/items/textitem.cxx 
(original)
+++ 
openoffice/branches/gbuild-reintegration/main/editeng/source/items/textitem.cxx 
Sun Feb 21 11:57:04 2016
@@ -30,7 +30,7 @@
 #include <com/sun/star/frame/status/FontHeight.hpp>
 #include <vcl/bitmapex.hxx>
 #include <tools/stream.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <math.h>
 #include <rtl/math.hxx>
 #include <unotools/fontdefs.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/editeng/source/uno/unonrule.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/source/uno/unonrule.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/editeng/source/uno/unonrule.cxx 
(original)
+++ 
openoffice/branches/gbuild-reintegration/main/editeng/source/uno/unonrule.cxx 
Sun Feb 21 11:57:04 2016
@@ -33,7 +33,7 @@
 #include <vos/mutex.hxx>
 #include <vcl/graph.hxx>
 #include <svtools/grfmgr.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 

Modified: 
openoffice/branches/gbuild-reintegration/main/embeddedobj/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embeddedobj/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embeddedobj/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/embeddedobj/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-eo     embeddedobj     :       offuh sal cppu cppuhelper comphelper tools 
unotools vos LIBXSLT:libxslt NULL
+eo     embeddedobj     :       offapi sal cppu cppuhelper comphelper tools 
unotools vos LIBXSLT:libxslt NULL
 eo     embeddedobj                                                             
        usr1    -       all     eo_mkout NULL
 eo     embeddedobj\inc                                                         
nmake   -       all     eo_inc NULL
 eo     embeddedobj\source\commonembedding                      nmake   -       
all     eo_commonembed eo_inc NULL

Modified: openoffice/branches/gbuild-reintegration/main/embedserv/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/embedserv/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/embedserv/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/embedserv/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-es     embedserv       :       offuh sal cppu cppuhelper comphelper 
LIBXSLT:libxslt NULL
+es     embedserv       :       offapi sal cppu cppuhelper comphelper 
LIBXSLT:libxslt NULL
 es     embedserv                                                               
usr1    -       w       es_mkout NULL
 es     embedserv\source\embed                                  nmake   -       
w       es_embed NULL
 es     embedserv\source\inprocserv                             nmake   -       
w       es_inproc NULL

Modified: openoffice/branches/gbuild-reintegration/main/extensions/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/extensions/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/extensions/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -1,4 +1,4 @@
-ex  extensions :  officecfg  L10N:l10n rdbmaker svx SANE:sane TWAIN:twain 
offuh stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
+ex  extensions :  officecfg  L10N:l10n rdbmaker svx SANE:sane TWAIN:twain 
offapi stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
 
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL

Modified: 
openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/admininvokationimpl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/admininvokationimpl.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/admininvokationimpl.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/admininvokationimpl.cxx
 Sun Feb 21 11:57:04 2016
@@ -30,7 +30,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <vcl/stdtext.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef EXTENSIONS_ABPRESID_HRC
 #include "abpresid.hrc"

Modified: 
openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/fieldmappingimpl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/fieldmappingimpl.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/fieldmappingimpl.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/extensions/source/abpilot/fieldmappingimpl.cxx
 Sun Feb 21 11:57:04 2016
@@ -32,7 +32,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <tools/debug.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/stdtext.hxx>
 #include <com/sun/star/util/AliasProgrammaticPair.hpp>

Modified: 
openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/fontdialog.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/fontdialog.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/fontdialog.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/fontdialog.cxx
 Sun Feb 21 11:57:04 2016
@@ -36,7 +36,7 @@
 #endif
 #include <vcl/svapp.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/types.hxx>
 #include <comphelper/extract.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/propcontroller.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/propcontroller.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/propcontroller.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/extensions/source/propctrlr/propcontroller.cxx
 Sun Feb 21 11:57:04 2016
@@ -54,7 +54,7 @@
 #include <comphelper/extract.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/property.hxx>
 #include <vcl/msgbox.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/filter/source/graphicfilter/icgm/actimpr.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/graphicfilter/icgm/actimpr.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/filter/source/graphicfilter/icgm/actimpr.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/filter/source/graphicfilter/icgm/actimpr.cxx
 Sun Feb 21 11:57:04 2016
@@ -47,7 +47,7 @@
 #include <unotools/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
-//#include <toolkit/unohlp.hxx>
+//#include <toolkit/helper/vclunohelper.hxx>
 
 #include "main.hxx"
 #include "outact.hxx"

Modified: 
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/escherex.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/escherex.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/escherex.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/escherex.cxx
 Sun Feb 21 11:57:04 2016
@@ -91,7 +91,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <comphelper/extract.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/virdev.hxx>
 #include <rtl/crc.h>
 #include <vos/xception.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/eschesdo.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/eschesdo.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/eschesdo.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/eschesdo.cxx
 Sun Feb 21 11:57:04 2016
@@ -34,7 +34,7 @@
 #include <vcl/graph.hxx>
 #include <tools/debug.hxx>
 #include <svx/fmdpage.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>

Modified: 
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/svdfppt.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/svdfppt.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/svdfppt.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/filter/source/msfilter/svdfppt.cxx
 Sun Feb 21 11:57:04 2016
@@ -106,7 +106,7 @@
 #include <editeng/langitem.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/unoapi.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>

Modified: openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk 
(original)
+++ openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk Sun 
Feb 21 11:57:04 2016
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_set_include,fwe
        -I$(WORKDIR)/inc/framework/ \
        $$(INCLUDE) \
        -I$(OUTDIR)/inc/framework \
-       -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,fwe,\
@@ -38,6 +37,11 @@ $(eval $(call gb_Library_set_defs,fwe,\
        -DFWE_DLLIMPLEMENTATION\
 ))
 
+$(eval $(call gb_Library_add_api,fwe,\
+       udkapi \
+       offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,fwe,\
        comphelper \
        cppu \

Modified: openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk 
(original)
+++ openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk Sun 
Feb 21 11:57:04 2016
@@ -30,6 +30,11 @@ $(eval $(call gb_Library_set_defs,fwi,\
        -DFWI_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,fwi,\
+       udkapi \
+       offapi \
+))
+
 $(eval $(call gb_Library_set_include,fwi,\
        -I$(SRCDIR)/framework/inc/pch \
        -I$(SRCDIR)/framework/source/inc \
@@ -37,7 +42,6 @@ $(eval $(call gb_Library_set_include,fwi
        -I$(WORKDIR)/inc/framework/ \
        $$(INCLUDE) \
        -I$(OUTDIR)/inc/framework \
-       -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,fwi,\

Modified: openoffice/branches/gbuild-reintegration/main/framework/Library_fwk.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/Library_fwk.mk?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/Library_fwk.mk 
(original)
+++ openoffice/branches/gbuild-reintegration/main/framework/Library_fwk.mk Sun 
Feb 21 11:57:04 2016
@@ -34,7 +34,11 @@ $(eval $(call gb_Library_set_include,fwk
        -I$(WORKDIR)/inc/framework/ \
        $$(INCLUDE) \
        -I$(OUTDIR)/inc/framework \
-       -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,fwk,\
+       udkapi \
+       offapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,fwk,\

Modified: openoffice/branches/gbuild-reintegration/main/framework/Library_fwl.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/Library_fwl.mk?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/Library_fwl.mk 
(original)
+++ openoffice/branches/gbuild-reintegration/main/framework/Library_fwl.mk Sun 
Feb 21 11:57:04 2016
@@ -32,7 +32,11 @@ $(eval $(call gb_Library_set_include,fwl
        -I$(WORKDIR)/inc/framework/ \
        $$(INCLUDE) \
        -I$(OUTDIR)/inc/framework \
-       -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,fwl,\
+       udkapi \
+       offapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,fwl,\

Modified: openoffice/branches/gbuild-reintegration/main/framework/Library_fwm.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/Library_fwm.mk?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/Library_fwm.mk 
(original)
+++ openoffice/branches/gbuild-reintegration/main/framework/Library_fwm.mk Sun 
Feb 21 11:57:04 2016
@@ -32,7 +32,11 @@ $(eval $(call gb_Library_set_include,fwm
        -I$(WORKDIR)/inc/framework/ \
        $$(INCLUDE) \
        -I$(OUTDIR)/inc/framework \
-       -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,fwm,\
+       udkapi \
+       offapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,fwm,\

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/inc/pch/precompiled_framework.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/inc/pch/precompiled_framework.hxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/inc/pch/precompiled_framework.hxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/inc/pch/precompiled_framework.hxx
 Sun Feb 21 11:57:04 2016
@@ -405,7 +405,6 @@
 #include "toolkit/awt/vclxwindow.hxx"
 #include "toolkit/helper/convert.hxx"
 #include "toolkit/helper/vclunohelper.hxx"
-#include "toolkit/unohlp.hxx"
 
 #include "tools/color.hxx"
 #include "tools/config.hxx"

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/classes/menumanager.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/classes/menumanager.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/classes/menumanager.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/classes/menumanager.cxx
 Sun Feb 21 11:57:04 2016
@@ -64,7 +64,7 @@
 #include <unotools/localfilehelper.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <tools/urlobj.hxx>
 

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/persistentwindowstate.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/helper/persistentwindowstate.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/persistentwindowstate.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/persistentwindowstate.cxx
 Sun Feb 21 11:57:04 2016
@@ -53,7 +53,7 @@
 #include <vcl/syswin.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/statusindicatorfactory.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/helper/statusindicatorfactory.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/statusindicatorfactory.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/statusindicatorfactory.cxx
 Sun Feb 21 11:57:04 2016
@@ -53,7 +53,7 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 //-----------------------------------------------

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/tagwindowasmodified.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/helper/tagwindowasmodified.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/tagwindowasmodified.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/tagwindowasmodified.cxx
 Sun Feb 21 11:57:04 2016
@@ -51,7 +51,7 @@
 
//_________________________________________________________________________________________________________________
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/titlebarupdate.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/helper/titlebarupdate.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/titlebarupdate.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/titlebarupdate.cxx
 Sun Feb 21 11:57:04 2016
@@ -105,7 +105,7 @@
 #include <unotools/bootstrap.hxx>
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <tools/diagnose_ex.h>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/vclstatusindicator.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/helper/vclstatusindicator.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/vclstatusindicator.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/helper/vclstatusindicator.cxx
 Sun Feb 21 11:57:04 2016
@@ -37,7 +37,7 @@
 // includes of external modules
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/svapp.hxx>
 

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/inc/pattern/window.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/inc/pattern/window.hxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/inc/pattern/window.hxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/inc/pattern/window.hxx
 Sun Feb 21 11:57:04 2016
@@ -38,7 +38,7 @@
 // other includes
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/helpers.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/helpers.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/helpers.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/helpers.cxx
 Sun Feb 21 11:57:04 2016
@@ -42,7 +42,7 @@
 #include <comphelper/mediadescriptor.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 // namespace
 using namespace com::sun::star;

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/layoutmanager.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/layoutmanager.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/layoutmanager.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/layoutmanager.cxx
 Sun Feb 21 11:57:04 2016
@@ -75,7 +75,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/wall.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <comphelper/mediadescriptor.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panel.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panel.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panel.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panel.cxx
 Sun Feb 21 11:57:04 2016
@@ -37,7 +37,7 @@
 
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 
//_________________________________________________________________________________________________________________
 //     namespace

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panelmanager.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panelmanager.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panelmanager.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/panelmanager.cxx
 Sun Feb 21 11:57:04 2016
@@ -42,7 +42,7 @@
 
//_________________________________________________________________________________________________________________
 
 #include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 
//_________________________________________________________________________________________________________________
 //     namespace

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
 Sun Feb 21 11:57:04 2016
@@ -42,7 +42,7 @@
 
 // other includes
 #include <unotools/cmdoptions.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <vcl/i18nhelp.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/loadenv/loadenv.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/loadenv/loadenv.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/loadenv/loadenv.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/loadenv/loadenv.cxx
 Sun Feb 21 11:57:04 2016
@@ -93,7 +93,7 @@
 #include <vcl/syswin.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <unotools/moduleoptions.hxx>
 #include <svtools/sfxecode.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/services/frame.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/services/frame.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/services/frame.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/services/frame.cxx
 Sun Feb 21 11:57:04 2016
@@ -94,7 +94,7 @@
 #include <vcl/svapp.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/services/taskcreatorsrv.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/services/taskcreatorsrv.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/services/taskcreatorsrv.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/services/taskcreatorsrv.cxx
 Sun Feb 21 11:57:04 2016
@@ -52,7 +52,7 @@
 #include <vcl/svapp.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/window.hxx>
 

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/tabwin/tabwindow.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/tabwin/tabwindow.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/tabwin/tabwindow.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/tabwin/tabwindow.cxx
 Sun Feb 21 11:57:04 2016
@@ -48,7 +48,7 @@
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/sequenceashashmap.hxx>
 

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarmanager.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarmanager.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarmanager.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarmanager.cxx
 Sun Feb 21 11:57:04 2016
@@ -83,7 +83,7 @@
 #include <svtools/imgdef.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 #include <svtools/miscopt.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarwrapper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarwrapper.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarwrapper.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/addonstoolbarwrapper.cxx
 Sun Feb 21 11:57:04 2016
@@ -57,7 +57,7 @@
 
//_________________________________________________________________________________________________________________
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/uielement/langselectionstatusbarcontroller.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
 Sun Feb 21 11:57:04 2016
@@ -35,7 +35,6 @@
 #include <toolkit/helper/convert.hxx>
 
 #include <com/sun/star/frame/XPopupMenuController.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/awt/PopupMenuDirection.hpp>
 #include <svtools/langtab.hxx>
 #include "sal/types.h"

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/menubarmanager.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/uielement/menubarmanager.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/menubarmanager.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/menubarmanager.cxx
 Sun Feb 21 11:57:04 2016
@@ -81,7 +81,7 @@
 #include <unotools/cmdoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/panelwrapper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/uielement/panelwrapper.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/panelwrapper.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/panelwrapper.cxx
 Sun Feb 21 11:57:04 2016
@@ -50,7 +50,7 @@
 //     other includes
 
//_________________________________________________________________________________________________________________
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/miscopt.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/statusbarwrapper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/uielement/statusbarwrapper.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/statusbarwrapper.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/statusbarwrapper.cxx
 Sun Feb 21 11:57:04 2016
@@ -52,7 +52,7 @@
 
//_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 #include <tools/solar.h>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarmanager.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarmanager.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarmanager.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarmanager.cxx
 Sun Feb 21 11:57:04 2016
@@ -82,7 +82,7 @@
 #include <svtools/toolboxcontroller.hxx>
 #include <unotools/cmdoptions.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarsmenucontroller.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarsmenucontroller.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarsmenucontroller.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarsmenucontroller.cxx
 Sun Feb 21 11:57:04 2016
@@ -68,7 +68,7 @@
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/window.hxx>
 #include <svtools/menuoptions.hxx>

Modified: 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarwrapper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarwrapper.cxx?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarwrapper.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/framework/source/uielement/toolbarwrapper.cxx
 Sun Feb 21 11:57:04 2016
@@ -56,7 +56,7 @@
 
//_________________________________________________________________________________________________________________
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>

Modified: openoffice/branches/gbuild-reintegration/main/i18nutil/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/i18nutil/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/i18nutil/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/i18nutil/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/jvmaccess/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/jvmaccess/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/jvmaccess/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/jvmaccess/prj/build.lst Sun 
Feb 21 11:57:04 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/mysqlc/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/mysqlc/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/mysqlc/prj/build.lst 
(original)
+++ openoffice/branches/gbuild-reintegration/main/mysqlc/prj/build.lst Sun Feb 
21 11:57:04 2016
@@ -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: 
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
 Sun Feb 21 11:57:04 2016
@@ -67,8 +67,6 @@ interface XTargetPropertiesCreator : ::c
 
 
//============================================================================= 
 
-service TargetPropertiesCreator: XTargetPropertiesCreator;
- 
 }; }; }; };  
 
 #endif

Modified: 
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl?rev=1731524&r1=1731523&r2=1731524&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
 Sun Feb 21 11:57:04 2016
@@ -206,10 +206,6 @@ interface XDatabaseDataProvider
        [attribute,bound] string DataSourceName;
 }; 
  
-service DatabaseDataProvider : XDatabaseDataProvider
-{
-    createWithConnection([in] com::sun::star::sdbc::XConnection connection);
-};
 
//============================================================================= 
  
  }; }; }; };  };



Reply via email to