You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 22:10:21 UTC
svn commit: r1409400 [1/4] - in /incubator/ooo/branches/gbuild/main: ./
UnoControls/prj/ accessibility/prj/ animations/prj/ basctl/source/dlged/
basegfx/prj/ basic/prj/ binaryurp/prj/ binfilter/bf_svx/source/items/
binfilter/bf_svx/source/unodraw/ binf...
Author: arist
Date: Wed Nov 14 21:10:00 2012
New Revision: 1409400
URL: http://svn.apache.org/viewvc?rev=1409400&view=rev
Log:
ause130_1_68d35aa69a0a.patch
# HG changeset patch
# User Hans-Joachim Lankenau <hj...@openoffice.org>
# Date 1299774172 -3600
# Node ID 68d35aa69a0ad9dbfa0e8b47f394a97e3c6f5c4f
# Parent ce7cdd32bdeafb1082506dd67abd12e96bd8dc31
ause130: #i117218# change .idl handling to gnu make
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/UnoControls/prj/build.lst
incubator/ooo/branches/gbuild/main/accessibility/prj/build.lst
incubator/ooo/branches/gbuild/main/animations/prj/build.lst
incubator/ooo/branches/gbuild/main/basctl/source/dlged/propbrw.cxx
incubator/ooo/branches/gbuild/main/basegfx/prj/build.lst
incubator/ooo/branches/gbuild/main/basic/prj/build.lst
incubator/ooo/branches/gbuild/main/binaryurp/prj/build.lst
incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/items/svx_textitem.cxx
incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx
incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
incubator/ooo/branches/gbuild/main/binfilter/bf_xmloff/source/style/xmloff_weighhdl.cxx
incubator/ooo/branches/gbuild/main/binfilter/prj/build.lst
incubator/ooo/branches/gbuild/main/canvas/prj/build.lst
incubator/ooo/branches/gbuild/main/chart2/prj/build.lst
incubator/ooo/branches/gbuild/main/codemaker/prj/build.lst
incubator/ooo/branches/gbuild/main/comphelper/Library_comphelp.mk
incubator/ooo/branches/gbuild/main/comphelper/prj/build.lst
incubator/ooo/branches/gbuild/main/configmgr/prj/build.lst
incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst
incubator/ooo/branches/gbuild/main/cppu/prj/build.lst
incubator/ooo/branches/gbuild/main/cppuhelper/prj/build.lst
incubator/ooo/branches/gbuild/main/cpputools/prj/build.lst
incubator/ooo/branches/gbuild/main/cui/source/customize/cfg.cxx
incubator/ooo/branches/gbuild/main/cui/source/dialogs/hlmarkwn.cxx
incubator/ooo/branches/gbuild/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx
incubator/ooo/branches/gbuild/main/dbaccess/source/ui/app/AppControllerGen.cxx
incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/dataview.cxx
incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/unodatbr.cxx
incubator/ooo/branches/gbuild/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/QueryTextView.cxx
incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
incubator/ooo/branches/gbuild/main/desktop/prj/build.lst
incubator/ooo/branches/gbuild/main/desktop/source/app/app.cxx
incubator/ooo/branches/gbuild/main/drawinglayer/Library_drawinglayer.mk
incubator/ooo/branches/gbuild/main/drawinglayer/prj/build.lst
incubator/ooo/branches/gbuild/main/dtrans/prj/build.lst
incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk
incubator/ooo/branches/gbuild/main/editeng/source/items/textitem.cxx
incubator/ooo/branches/gbuild/main/editeng/source/uno/unonrule.cxx
incubator/ooo/branches/gbuild/main/embeddedobj/prj/build.lst
incubator/ooo/branches/gbuild/main/embedserv/prj/build.lst
incubator/ooo/branches/gbuild/main/extensions/prj/build.lst
incubator/ooo/branches/gbuild/main/extensions/source/abpilot/admininvokationimpl.cxx
incubator/ooo/branches/gbuild/main/extensions/source/abpilot/fieldmappingimpl.cxx
incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/fontdialog.cxx
incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/propcontroller.cxx
incubator/ooo/branches/gbuild/main/filter/source/graphicfilter/icgm/actimpr.cxx
incubator/ooo/branches/gbuild/main/filter/source/msfilter/escherex.cxx
incubator/ooo/branches/gbuild/main/filter/source/msfilter/eschesdo.cxx
incubator/ooo/branches/gbuild/main/filter/source/msfilter/svdfppt.cxx
incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk
incubator/ooo/branches/gbuild/main/framework/Library_fwi.mk
incubator/ooo/branches/gbuild/main/framework/Library_fwk.mk
incubator/ooo/branches/gbuild/main/framework/Library_fwl.mk
incubator/ooo/branches/gbuild/main/framework/Library_fwm.mk
incubator/ooo/branches/gbuild/main/framework/inc/pch/precompiled_framework.hxx
incubator/ooo/branches/gbuild/main/framework/source/classes/menumanager.cxx
incubator/ooo/branches/gbuild/main/framework/source/helper/persistentwindowstate.cxx
incubator/ooo/branches/gbuild/main/framework/source/helper/statusindicatorfactory.cxx
incubator/ooo/branches/gbuild/main/framework/source/helper/tagwindowasmodified.cxx
incubator/ooo/branches/gbuild/main/framework/source/helper/titlebarupdate.cxx
incubator/ooo/branches/gbuild/main/framework/source/helper/vclstatusindicator.cxx
incubator/ooo/branches/gbuild/main/framework/source/inc/pattern/window.hxx
incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/helpers.cxx
incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/layoutmanager.cxx
incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panel.cxx
incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panelmanager.cxx
incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
incubator/ooo/branches/gbuild/main/framework/source/loadenv/loadenv.cxx
incubator/ooo/branches/gbuild/main/framework/source/services/frame.cxx
incubator/ooo/branches/gbuild/main/framework/source/services/taskcreatorsrv.cxx
incubator/ooo/branches/gbuild/main/framework/source/tabwin/tabwindow.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarmanager.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarwrapper.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/logoimagestatusbarcontroller.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/logotextstatusbarcontroller.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/menubarmanager.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/panelwrapper.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/popupmenucontroller.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/simpletextstatusbarcontroller.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarmanager.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarwrapper.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarmanager.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarsmenucontroller.cxx
incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarwrapper.cxx
incubator/ooo/branches/gbuild/main/hwpfilter/prj/build.lst
incubator/ooo/branches/gbuild/main/i18nutil/prj/build.lst
incubator/ooo/branches/gbuild/main/jvmaccess/prj/build.lst
incubator/ooo/branches/gbuild/main/mysqlc/prj/build.lst
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/SlideSorter.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XPresenterHelper.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/frame/XUntitledNumbers.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/inspection/XStringRepresentation.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XSlideShow.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/presentation/XTransitionFactory.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XCanvas.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/rendering/XColorSpace.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedLine.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFixedText.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormatCondition.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFormattedField.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XFunction.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroup.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XGroups.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XImageControl.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlFormat.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportControlModel.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XReportDefinition.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XSection.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/report/XShape.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/setup/InstallResponse.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/sync/SyncInfo.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/util/XTextSearch.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
incubator/ooo/branches/gbuild/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
incubator/ooo/branches/gbuild/main/offapi/prj/build.lst
incubator/ooo/branches/gbuild/main/offapi/prj/d.lst
incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObject.idl
incubator/ooo/branches/gbuild/main/oovbaapi/ooo/vba/excel/SheetObjects.idl
incubator/ooo/branches/gbuild/main/oovbaapi/prj/build.lst
incubator/ooo/branches/gbuild/main/oovbaapi/prj/d.lst
incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk
incubator/ooo/branches/gbuild/main/padmin/Library_spa.mk
incubator/ooo/branches/gbuild/main/remotebridges/prj/build.lst
incubator/ooo/branches/gbuild/main/reportdesign/source/ui/report/propbrw.cxx
incubator/ooo/branches/gbuild/main/sc/source/filter/excel/xlstyle.cxx
incubator/ooo/branches/gbuild/main/sc/source/ui/unoobj/targuno.cxx
incubator/ooo/branches/gbuild/main/sc/source/ui/vba/vbaeventshelper.cxx
incubator/ooo/branches/gbuild/main/sccomp/prj/build.lst
incubator/ooo/branches/gbuild/main/sd/inc/pch/precompiled_sd.hxx
incubator/ooo/branches/gbuild/main/sd/source/filter/eppt/epptso.cxx
incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshow.cxx
incubator/ooo/branches/gbuild/main/sd/source/ui/slideshow/slideshowimpl.cxx
incubator/ooo/branches/gbuild/main/sd/source/ui/unoidl/unopage.cxx
incubator/ooo/branches/gbuild/main/sd/source/ui/view/ToolBarManager.cxx
incubator/ooo/branches/gbuild/main/sd/source/ui/view/drviews8.cxx
incubator/ooo/branches/gbuild/main/sdext/prj/build.lst
incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk
incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk
incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk
incubator/ooo/branches/gbuild/main/sfx2/source/doc/objmisc.cxx
incubator/ooo/branches/gbuild/main/sfx2/source/inet/inettbc.cxx
incubator/ooo/branches/gbuild/main/sfx2/source/menu/virtmenu.cxx
incubator/ooo/branches/gbuild/main/sfx2/source/statbar/stbitem.cxx
incubator/ooo/branches/gbuild/main/sfx2/source/view/viewfrm.cxx
incubator/ooo/branches/gbuild/main/sfx2/source/view/viewsh.cxx
incubator/ooo/branches/gbuild/main/shell/prj/build.lst
incubator/ooo/branches/gbuild/main/slideshow/prj/build.lst
incubator/ooo/branches/gbuild/main/solenv/gbuild/AllLangResTarget.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/os2.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
incubator/ooo/branches/gbuild/main/solenv/inc/target.mk
incubator/ooo/branches/gbuild/main/sot/Library_sot.mk
incubator/ooo/branches/gbuild/main/svgio/Library_svgio.mk
incubator/ooo/branches/gbuild/main/svl/Library_fsstorage.mk
incubator/ooo/branches/gbuild/main/svl/Library_passwordcontainer.mk
incubator/ooo/branches/gbuild/main/svl/Library_svl.mk
incubator/ooo/branches/gbuild/main/svl/prj/build.lst
incubator/ooo/branches/gbuild/main/svtools/Executable_bmp.mk
incubator/ooo/branches/gbuild/main/svtools/Executable_bmpsum.mk
incubator/ooo/branches/gbuild/main/svtools/Executable_g2g.mk
incubator/ooo/branches/gbuild/main/svtools/Library_hatchwindowfactory.mk
incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk
incubator/ooo/branches/gbuild/main/svtools/prj/build.lst
incubator/ooo/branches/gbuild/main/svtools/source/uno/contextmenuhelper.cxx
incubator/ooo/branches/gbuild/main/svtools/source/uno/statusbarcontroller.cxx
incubator/ooo/branches/gbuild/main/svtools/source/uno/toolboxcontroller.cxx
incubator/ooo/branches/gbuild/main/svx/Library_svx.mk
incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk
incubator/ooo/branches/gbuild/main/svx/Library_textconversiondlgs.mk
incubator/ooo/branches/gbuild/main/svx/source/dialog/docrecovery.cxx
incubator/ooo/branches/gbuild/main/svx/source/dialog/srchdlg.cxx
incubator/ooo/branches/gbuild/main/svx/source/form/fmPropBrw.cxx
incubator/ooo/branches/gbuild/main/svx/source/form/fmtools.cxx
incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshap2.cxx
incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshape.cxx
incubator/ooo/branches/gbuild/main/svx/source/xoutdev/xattrbmp.cxx
incubator/ooo/branches/gbuild/main/svx/workben/msview/msview.cxx
incubator/ooo/branches/gbuild/main/sw/Library_msword.mk
incubator/ooo/branches/gbuild/main/sw/Library_sw.mk
incubator/ooo/branches/gbuild/main/sw/Library_swd.mk
incubator/ooo/branches/gbuild/main/sw/Library_swui.mk
incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk
incubator/ooo/branches/gbuild/main/sw/inc/pch/precompiled_sw.hxx
incubator/ooo/branches/gbuild/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx
incubator/ooo/branches/gbuild/main/sw/source/ui/envelp/mailmrge.cxx
incubator/ooo/branches/gbuild/main/sw/source/ui/uiview/view.cxx
incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk
incubator/ooo/branches/gbuild/main/toolkit/Package_inc.mk
incubator/ooo/branches/gbuild/main/tools/Library_tl.mk
incubator/ooo/branches/gbuild/main/tools/StaticLibrary_ooopathutils.mk
incubator/ooo/branches/gbuild/main/tools/prj/build.lst
incubator/ooo/branches/gbuild/main/ucbhelper/prj/build.lst
incubator/ooo/branches/gbuild/main/udkapi/prj/build.lst
incubator/ooo/branches/gbuild/main/udkapi/prj/d.lst
incubator/ooo/branches/gbuild/main/unotools/prj/build.lst
incubator/ooo/branches/gbuild/main/unoxml/prj/build.lst
incubator/ooo/branches/gbuild/main/vbahelper/Library_msforms.mk
incubator/ooo/branches/gbuild/main/vbahelper/Library_vbahelper.mk
incubator/ooo/branches/gbuild/main/vbahelper/prj/build.lst
incubator/ooo/branches/gbuild/main/vcl/Library_desktop_detector.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_svp.mk
incubator/ooo/branches/gbuild/main/vcl/StaticLibrary_vclmain.mk
incubator/ooo/branches/gbuild/main/vcl/prj/build.lst
incubator/ooo/branches/gbuild/main/xmloff/Library_xo.mk
incubator/ooo/branches/gbuild/main/xmloff/Library_xof.mk
incubator/ooo/branches/gbuild/main/xmlreader/prj/build.lst
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 21:10:00 2012
@@ -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 \
))
# vim: set noet ts=4 sw=4:
Modified: incubator/ooo/branches/gbuild/main/UnoControls/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/UnoControls/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/UnoControls/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/UnoControls/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/accessibility/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/accessibility/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/accessibility/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/accessibility/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/animations/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/animations/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/animations/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/animations/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/basctl/source/dlged/propbrw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basctl/source/dlged/propbrw.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basctl/source/dlged/propbrw.cxx (original)
+++ incubator/ooo/branches/gbuild/main/basctl/source/dlged/propbrw.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/basegfx/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basegfx/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basegfx/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/basegfx/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/basic/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basic/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basic/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/basic/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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\app nmake - all sb_app sb_class sb_inc NULL
Modified: incubator/ooo/branches/gbuild/main/binaryurp/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/binaryurp/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/binaryurp/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/binaryurp/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/items/svx_textitem.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/items/svx_textitem.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/items/svx_textitem.cxx (original)
+++ incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/items/svx_textitem.cxx Wed Nov 14 21:10:00 2012
@@ -27,7 +27,7 @@
#ifndef _STREAM_HXX
#include <tools/stream.hxx>
#endif
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <math.h>
#ifndef INCLUDED_RTL_MATH_HXX
#include <rtl/math.hxx>
Modified: incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx (original)
+++ incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx Wed Nov 14 21:10:00 2012
@@ -43,7 +43,7 @@
#include <vos/mutex.hxx>
#endif
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <rtl/uuid.h>
#include <rtl/memory.h>
Modified: incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx (original)
+++ incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx Wed Nov 14 21:10:00 2012
@@ -1548,7 +1548,7 @@ uno::Sequence< OUString > SAL_CALL SvxSh
#endif
#endif
-#include "toolkit/unohlp.hxx"
+#include "toolkit/helper/vclunohelper.hxx"
namespace binfilter {//STRIP009
//----------------------------------------------------------------------
SvxGraphicObject::SvxGraphicObject( SdrObject* pObj ) throw()
Modified: incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx (original)
+++ incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx Wed Nov 14 21:10:00 2012
@@ -35,7 +35,7 @@
#include <bf_svtools/fltcall.hxx>
#endif
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <rtl/uuid.h>
#include <rtl/memory.h>
Modified: incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx (original)
+++ incubator/ooo/branches/gbuild/main/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx Wed Nov 14 21:10:00 2012
@@ -23,7 +23,7 @@
#include <com/sun/star/awt/XBitmap.hpp>
#include <vcl/virdev.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#ifndef _SFXSTYLE_HXX
#include <bf_svtools/style.hxx>
Modified: incubator/ooo/branches/gbuild/main/binfilter/bf_xmloff/source/style/xmloff_weighhdl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/binfilter/bf_xmloff/source/style/xmloff_weighhdl.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/binfilter/bf_xmloff/source/style/xmloff_weighhdl.cxx (original)
+++ incubator/ooo/branches/gbuild/main/binfilter/bf_xmloff/source/style/xmloff_weighhdl.cxx Wed Nov 14 21:10:00 2012
@@ -44,7 +44,7 @@
#include "rtl/ustring.hxx"
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
namespace binfilter {
Modified: incubator/ooo/branches/gbuild/main/binfilter/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/binfilter/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/binfilter/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/binfilter/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,4 +1,4 @@
-bf binfilter : basic vcl xmlscript connectivity framework svtools offuh LIBXSLT:libxslt NULL
+bf binfilter : basic vcl xmlscript connectivity framework svtools offapi LIBXSLT:libxslt NULL
bf binfilter usr1 - all bf_mkout NULL
bf binfilter\bf_svtools\source\inc get - all bf_svt_sinc NULL
bf binfilter\bf_svtools\source\config nmake - all bf_svt_config NULL
Modified: incubator/ooo/branches/gbuild/main/canvas/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/canvas/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/chart2/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/chart2/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/chart2/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/chart2/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/codemaker/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/codemaker/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/codemaker/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/codemaker/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/comphelper/Library_comphelp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/comphelper/Library_comphelp.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/comphelper/Library_comphelp.mk (original)
+++ incubator/ooo/branches/gbuild/main/comphelper/Library_comphelp.mk Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/comphelper/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/comphelper/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/comphelper/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/comphelper/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/configmgr/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/configmgr/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/configmgr/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/configmgr/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/cppu/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppu/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppu/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/cppu/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/cppuhelper/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppuhelper/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppuhelper/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/cppuhelper/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/cpputools/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cpputools/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cpputools/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/cpputools/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/cui/source/customize/cfg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cui/source/customize/cfg.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cui/source/customize/cfg.cxx (original)
+++ incubator/ooo/branches/gbuild/main/cui/source/customize/cfg.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/cui/source/dialogs/hlmarkwn.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cui/source/dialogs/hlmarkwn.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cui/source/dialogs/hlmarkwn.cxx (original)
+++ incubator/ooo/branches/gbuild/main/cui/source/dialogs/hlmarkwn.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/dbaccess/source/ui/app/AppControllerGen.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/source/ui/app/AppControllerGen.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/source/ui/app/AppControllerGen.cxx (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/source/ui/app/AppControllerGen.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/dataview.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/dataview.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/dataview.cxx (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/dataview.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/unodatbr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/unodatbr.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/unodatbr.cxx (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/source/ui/browser/unodatbr.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/QueryTextView.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/QueryTextView.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/QueryTextView.cxx (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/QueryTextView.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/desktop/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/desktop/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/desktop/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/desktop/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/desktop/source/app/app.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/desktop/source/app/app.cxx (original)
+++ incubator/ooo/branches/gbuild/main/desktop/source/app/app.cxx Wed Nov 14 21:10:00 2012
@@ -98,7 +98,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: incubator/ooo/branches/gbuild/main/drawinglayer/Library_drawinglayer.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/drawinglayer/Library_drawinglayer.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/drawinglayer/Library_drawinglayer.mk (original)
+++ incubator/ooo/branches/gbuild/main/drawinglayer/Library_drawinglayer.mk Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/drawinglayer/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/drawinglayer/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/drawinglayer/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/drawinglayer/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/dtrans/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dtrans/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dtrans/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/dtrans/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk (original)
+++ incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/editeng/source/items/textitem.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/editeng/source/items/textitem.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/editeng/source/items/textitem.cxx (original)
+++ incubator/ooo/branches/gbuild/main/editeng/source/items/textitem.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/editeng/source/uno/unonrule.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/editeng/source/uno/unonrule.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/editeng/source/uno/unonrule.cxx (original)
+++ incubator/ooo/branches/gbuild/main/editeng/source/uno/unonrule.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/embeddedobj/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/embeddedobj/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/embeddedobj/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/embeddedobj/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/embedserv/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/embedserv/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/embedserv/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/embedserv/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/extensions/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/extensions/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/extensions/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/extensions/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/extensions/source/abpilot/admininvokationimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/extensions/source/abpilot/admininvokationimpl.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/extensions/source/abpilot/admininvokationimpl.cxx (original)
+++ incubator/ooo/branches/gbuild/main/extensions/source/abpilot/admininvokationimpl.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/extensions/source/abpilot/fieldmappingimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/extensions/source/abpilot/fieldmappingimpl.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/extensions/source/abpilot/fieldmappingimpl.cxx (original)
+++ incubator/ooo/branches/gbuild/main/extensions/source/abpilot/fieldmappingimpl.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/fontdialog.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/fontdialog.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/fontdialog.cxx (original)
+++ incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/fontdialog.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/propcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/propcontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/propcontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/extensions/source/propctrlr/propcontroller.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/filter/source/graphicfilter/icgm/actimpr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/filter/source/graphicfilter/icgm/actimpr.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/filter/source/graphicfilter/icgm/actimpr.cxx (original)
+++ incubator/ooo/branches/gbuild/main/filter/source/graphicfilter/icgm/actimpr.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/filter/source/msfilter/escherex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/filter/source/msfilter/escherex.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/filter/source/msfilter/escherex.cxx (original)
+++ incubator/ooo/branches/gbuild/main/filter/source/msfilter/escherex.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/filter/source/msfilter/eschesdo.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/filter/source/msfilter/eschesdo.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/filter/source/msfilter/eschesdo.cxx (original)
+++ incubator/ooo/branches/gbuild/main/filter/source/msfilter/eschesdo.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/filter/source/msfilter/svdfppt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/filter/source/msfilter/svdfppt.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/filter/source/msfilter/svdfppt.cxx (original)
+++ incubator/ooo/branches/gbuild/main/filter/source/msfilter/svdfppt.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk (original)
+++ incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/Library_fwi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/Library_fwi.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/Library_fwi.mk (original)
+++ incubator/ooo/branches/gbuild/main/framework/Library_fwi.mk Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/Library_fwk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/Library_fwk.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/Library_fwk.mk (original)
+++ incubator/ooo/branches/gbuild/main/framework/Library_fwk.mk Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/Library_fwl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/Library_fwl.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/Library_fwl.mk (original)
+++ incubator/ooo/branches/gbuild/main/framework/Library_fwl.mk Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/Library_fwm.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/Library_fwm.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/Library_fwm.mk (original)
+++ incubator/ooo/branches/gbuild/main/framework/Library_fwm.mk Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/inc/pch/precompiled_framework.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/inc/pch/precompiled_framework.hxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/inc/pch/precompiled_framework.hxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/inc/pch/precompiled_framework.hxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/classes/menumanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/classes/menumanager.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/classes/menumanager.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/classes/menumanager.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/helper/persistentwindowstate.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/helper/persistentwindowstate.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/helper/persistentwindowstate.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/helper/persistentwindowstate.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/helper/statusindicatorfactory.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/helper/statusindicatorfactory.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/helper/statusindicatorfactory.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/helper/statusindicatorfactory.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/helper/tagwindowasmodified.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/helper/tagwindowasmodified.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/helper/tagwindowasmodified.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/helper/tagwindowasmodified.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/helper/titlebarupdate.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/helper/titlebarupdate.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/helper/titlebarupdate.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/helper/titlebarupdate.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/helper/vclstatusindicator.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/helper/vclstatusindicator.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/helper/vclstatusindicator.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/helper/vclstatusindicator.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/inc/pattern/window.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/inc/pattern/window.hxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/inc/pattern/window.hxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/inc/pattern/window.hxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/helpers.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/helpers.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/helpers.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/helpers.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/layoutmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/layoutmanager.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/layoutmanager.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/layoutmanager.cxx Wed Nov 14 21:10:00 2012
@@ -76,7 +76,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: incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panel.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panel.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panel.cxx Wed Nov 14 21:10:00 2012
@@ -37,7 +37,7 @@
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
//_________________________________________________________________________________________________________________
// namespace
Modified: incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panelmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panelmanager.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panelmanager.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/panelmanager.cxx Wed Nov 14 21:10:00 2012
@@ -42,7 +42,7 @@
//_________________________________________________________________________________________________________________
#include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
//_________________________________________________________________________________________________________________
// namespace
Modified: incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/loadenv/loadenv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/loadenv/loadenv.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/loadenv/loadenv.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/loadenv/loadenv.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/services/frame.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/services/frame.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/services/frame.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/services/frame.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/services/taskcreatorsrv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/services/taskcreatorsrv.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/services/taskcreatorsrv.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/services/taskcreatorsrv.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/tabwin/tabwindow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/tabwin/tabwindow.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/tabwin/tabwindow.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/tabwin/tabwindow.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarmanager.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarmanager.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarmanager.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarwrapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarwrapper.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarwrapper.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/addonstoolbarwrapper.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/langselectionstatusbarcontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/langselectionstatusbarcontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/langselectionstatusbarcontroller.cxx Wed Nov 14 21:10:00 2012
@@ -32,13 +32,10 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/status.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
-#endif
+#include <toolkit/helper/vclunohelper.hxx>
#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"
@@ -60,7 +57,6 @@
#include <com/sun/star/util/XURLTransformer.hpp>
#include <comphelper/processfactory.hxx>
-#include <toolkit/unohlp.hxx>
#include <tools/gen.hxx>
#include <com/sun/star/awt/Command.hpp>
#include <svl/languageoptions.hxx>
Modified: incubator/ooo/branches/gbuild/main/framework/source/uielement/logoimagestatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/logoimagestatusbarcontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/logoimagestatusbarcontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/logoimagestatusbarcontroller.cxx Wed Nov 14 21:10:00 2012
@@ -32,7 +32,7 @@
#include <vcl/window.hxx>
#include <vcl/status.hxx>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
#include <toolkit/helper/convert.hxx>
Modified: incubator/ooo/branches/gbuild/main/framework/source/uielement/logotextstatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/logotextstatusbarcontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/logotextstatusbarcontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/logotextstatusbarcontroller.cxx Wed Nov 14 21:10:00 2012
@@ -32,7 +32,7 @@
#include <vcl/window.hxx>
#include <vcl/status.hxx>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
#include <toolkit/helper/convert.hxx>
Modified: incubator/ooo/branches/gbuild/main/framework/source/uielement/menubarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/menubarmanager.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/menubarmanager.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/menubarmanager.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/uielement/panelwrapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/panelwrapper.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/panelwrapper.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/panelwrapper.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/uielement/popupmenucontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/popupmenucontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/popupmenucontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/popupmenucontroller.cxx Wed Nov 14 21:10:00 2012
@@ -28,7 +28,6 @@
#include <com/sun/star/frame/XPopupMenuController.hpp>
#include <toolkit/helper/vclunohelper.hxx>
-//#include <toolkit/unohlp.hxx>
#include <rtl/ref.hxx>
Modified: incubator/ooo/branches/gbuild/main/framework/source/uielement/simpletextstatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/simpletextstatusbarcontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/simpletextstatusbarcontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/simpletextstatusbarcontroller.cxx Wed Nov 14 21:10:00 2012
@@ -32,7 +32,7 @@
#include <vcl/window.hxx>
#include <vcl/status.hxx>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
#include <toolkit/helper/convert.hxx>
Modified: incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarmanager.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarmanager.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarmanager.cxx Wed Nov 14 21:10:00 2012
@@ -59,7 +59,7 @@
//_________________________________________________________________________________________________________________
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
#include <svtools/statusbarcontroller.hxx>
Modified: incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarwrapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarwrapper.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarwrapper.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/statusbarwrapper.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarmanager.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarmanager.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarmanager.cxx Wed Nov 14 21:10:00 2012
@@ -81,7 +81,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 <svtools/miscopt.hxx>
Modified: incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarsmenucontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarsmenucontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarsmenucontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarsmenucontroller.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarwrapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarwrapper.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarwrapper.cxx (original)
+++ incubator/ooo/branches/gbuild/main/framework/source/uielement/toolbarwrapper.cxx Wed Nov 14 21:10:00 2012
@@ -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>