remove toolkit/unohlp.hxx hack

Change-Id: Idb9971d848870f4d00dbf77e80e48bf7dfde8913
Reviewed-on: https://gerrit.libreoffice.org/4601Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

basctl/source/dlged/propbrw.cxx

@@ -35,7 +35,7 @@
 #include <cppuhelper/component_context.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdview.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/stdtext.hxx>
 

bin/moveglobalheaders.sh

@@ -42,9 +42,3 @@ git add svtools/Library_svt.mk sfx2/Library_sfx.mk sfx2/Library_qstart_gtk.mk
 # urgh
 sed -ie 's/\.\.\/svx\//svx\//' svx/source/svdraw/svdoashp.cxx
 git add svx/source/svdraw/svdoashp.cxx
-
-# this one is making me speechless ...
-echo "// ah, yes: thats a sane thing to do -- deliver the same header _twice_ with different names" > include/toolkit/unohlp.hxx
-echo "// please kill me (this file)!" >> include/toolkit/unohlp.hxx
-echo "#include <toolkit/helper/vclunohelper.hxx>" >> include/toolkit/unohlp.hxx
-git add include/toolkit/unohlp.hxx

cui/source/customize/cfg.cxx

@@ -47,7 +47,7 @@
 #include "svtools/treelistentry.hxx"
 #include "svtools/viewdataentry.hxx"
 #include <tools/diagnose_ex.h>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
 #include <cuires.hrc>

cui/source/dialogs/hlmarkwn.cxx

@@ -32,7 +32,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 "svtools/treelistentry.hxx"
 
 #include <cuires.hrc>

dbaccess/inc/pch/precompiled_dbu.hxx

@@ -426,7 +426,6 @@
 #include <svx/svxdlg.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/unohlp.hxx>
 #include <tools/color.hxx>
 #include <tools/config.hxx>
 #include <tools/contnr.hxx>

dbaccess/source/ui/app/AppControllerGen.cxx

@@ -58,7 +58,7 @@
 #include <connectivity/sqlerror.hxx>
 #include <sfx2/mailmodelapi.hxx>
 #include <svx/dbaexchange.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <unotools/bootstrap.hxx>

dbaccess/source/ui/browser/dataview.cxx

@@ -19,7 +19,7 @@
 
 
 #include <dbaccess/dataview.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <sfx2/app.hxx>

dbaccess/source/ui/browser/sbagrid.cxx

@@ -49,17 +49,11 @@
 #include <tools/diagnose_ex.h>
 
 #include <svl/intitem.hxx>
-
 #include <svx/algitem.hxx>
-
 #include <tools/multisel.hxx>
-
 #include <svl/numuno.hxx>
-
 #include <svl/itempool.hxx>
-
 #include <svl/itemset.hxx>
-
 #include <svl/rngitem.hxx>
 
 #include <vcl/waitobj.hxx>

dbaccess/source/ui/browser/unodatbr.cxx

@@ -113,7 +113,7 @@
 #include <svx/algitem.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/databaseregistrationui.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <tools/multisel.hxx>

dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx

@@ -43,7 +43,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>

dbaccess/source/ui/querydesign/QueryTextView.cxx

@@ -26,7 +26,7 @@
 #include "querycontroller.hxx"
 #include "dbu_qry.hrc"
 #include "dbustrings.hrc"
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/types.hxx>

dbaccess/source/ui/querydesign/querycontainerwindow.cxx

@@ -23,7 +23,7 @@
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include "JoinController.hxx"
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include "dbustrings.hrc"
 #include <sfx2/sfxsids.hrc>
 #include <vcl/fixed.hxx>

desktop/source/app/app.cxx

@@ -73,7 +73,7 @@
 #include <com/sun/star/frame/PopupMenuControllerFactory.hpp>
 #include <com/sun/star/office/Quickstart.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/configuration.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/bootstrap.hxx>

editeng/source/items/textitem.cxx

@@ -22,7 +22,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>

editeng/source/uno/unonrule.cxx

@@ -24,7 +24,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/graph.hxx>
 #include <svtools/grfmgr.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <editeng/brushitem.hxx>
 #include <editeng/unoprnms.hxx>

extensions/source/abpilot/admininvokationimpl.cxx

@@ -24,7 +24,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/sdbc/DriverManager.hpp>
 #include <vcl/stdtext.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include "abpresid.hrc"
 #include "componentmodule.hxx"
 #include <vcl/waitobj.hxx>

extensions/source/abpilot/fieldmappingimpl.cxx

@@ -26,7 +26,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <tools/debug.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/stdtext.hxx>
 #include <com/sun/star/util/AliasProgrammaticPair.hpp>
 #include "abpresid.hrc"

extensions/source/propctrlr/fontdialog.cxx

@@ -23,7 +23,7 @@
 #include "modulepcr.hxx"
 #include "formlocalid.hrc"
 #include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/extract.hxx>
 #include <com/sun/star/awt/FontDescriptor.hpp>

extensions/source/propctrlr/propcontroller.cxx

@@ -39,7 +39,7 @@
 #include <comphelper/types.hxx>
 #include <comphelper/extract.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/property.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>

filter/source/msfilter/escherex.cxx

@@ -86,7 +86,7 @@
 #include <unotools/localfilehelper.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/string.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/virdev.hxx>
 #include <rtl/crc.h>
 #include <rtl/strbuf.hxx>

filter/source/msfilter/eschesdo.cxx

@@ -28,7 +28,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>

filter/source/msfilter/svdfppt.cxx

@@ -90,7 +90,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>

framework/source/classes/menumanager.cxx

@@ -46,7 +46,7 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/urlobj.hxx>
 
 #include <vcl/svapp.hxx>

framework/source/helper/persistentwindowstate.cxx

@@ -35,7 +35,7 @@
 #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 <rtl/string.hxx>

framework/source/helper/statusindicatorfactory.cxx

@@ -38,7 +38,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XLayoutManager2.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/mediadescriptor.hxx>

framework/source/helper/tagwindowasmodified.cxx

@@ -31,7 +31,7 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/frame/FrameAction.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/svapp.hxx>

framework/source/helper/titlebarupdate.cxx

@@ -42,7 +42,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>

framework/source/helper/vclstatusindicator.cxx

@@ -22,7 +22,7 @@
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 
 

framework/source/inc/pattern/window.hxx

@@ -25,7 +25,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/wrkwin.hxx>

framework/source/layoutmanager/helpers.cxx

@@ -33,7 +33,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/mediadescriptor.hxx>
 #include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 using namespace com::sun::star;
 

framework/source/layoutmanager/layoutmanager.cxx

@@ -68,7 +68,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>

framework/source/layoutmanager/toolbarlayoutmanager.cxx

@@ -35,7 +35,7 @@
 #include <com/sun/star/ui/XUIFunctionListener.hpp>
 
 #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>

framework/source/loadenv/loadenv.cxx

@@ -77,7 +77,7 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/syswin.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svtools/sfxecode.hxx>
 #include <unotools/ucbhelper.hxx>

framework/source/services/frame.cxx

@@ -77,7 +77,7 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/moduleoptions.hxx>

framework/source/services/taskcreatorsrv.cxx

@@ -40,7 +40,7 @@
 #include <svtools/colorcfg.hxx>
 #include <vcl/svapp.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
 
 //_______________________________________________

framework/source/tabwin/tabwindow.cxx

@@ -33,7 +33,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 
 //_________________________________________________________________________________________________________________

framework/source/uielement/addonstoolbarmanager.cxx

@@ -48,7 +48,7 @@
 #include <comphelper/processfactory.hxx>
 #include <svtools/imgdef.hxx>
 #include <svtools/toolboxcontroller.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <svtools/miscopt.hxx>
 #include <vcl/svapp.hxx>

framework/source/uielement/addonstoolbarwrapper.cxx

@@ -33,7 +33,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
 

framework/source/uielement/menubarmanager.cxx

@@ -65,7 +65,7 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/cmdoptions.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <osl/mutex.hxx>

framework/source/uielement/statusbarmanager.cxx

@@ -45,7 +45,6 @@
 #include <com/sun/star/awt/Command.hpp>
 #include <com/sun/star/ui/XStatusbarItem.hdl>
 #include <comphelper/processfactory.hxx>
-#include <toolkit/unohlp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/statusbarcontroller.hxx>
 #include <comphelper/processfactory.hxx>

framework/source/uielement/statusbarwrapper.cxx

@@ -36,7 +36,7 @@
 #include <com/sun/star/ui/UIElementType.hpp>
 
 #include <comphelper/processfactory.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <tools/solar.h>
 #include <vcl/svapp.hxx>

framework/source/uielement/toolbarmanager.cxx

@@ -58,7 +58,7 @@
 #include <svtools/imgdef.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #include <unotools/cmdoptions.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/miscopt.hxx>

framework/source/uielement/toolbarsmenucontroller.cxx

@@ -49,7 +49,7 @@
 #include <vcl/i18nhelp.hxx>
 #include <vcl/image.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
 #include <svtools/menuoptions.hxx>
 #include <unotools/cmdoptions.hxx>

framework/source/uielement/toolbarwrapper.cxx

@@ -33,7 +33,7 @@
 #include <com/sun/star/ui/UIElementType.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
 

include/toolkit/unohlp.hxx

-// ah, yes: thats a sane thing to do -- deliver the same header _twice_ with different names
-// please kill me (this file)!
-#include <toolkit/helper/vclunohelper.hxx>

reportdesign/source/ui/report/propbrw.cxx

@@ -39,7 +39,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svditer.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/namecontainer.hxx>
 #include <comphelper/stl_types.hxx>

sc/inc/pch/precompiled_sc.hxx

@@ -868,7 +868,6 @@
 #include <toolkit/awt/vclxdevice.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/unohlp.hxx>
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>

sc/source/filter/excel/xlstyle.cxx

@@ -28,7 +28,7 @@
 #include <sal/macros.h>
 #include <rtl/tencinfo.h>
 #include <svtools/colorcfg.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <editeng/svxfont.hxx>
 #include "global.hxx"
 #include "xlroot.hxx"

sc/source/ui/unoobj/targuno.cxx

@@ -19,7 +19,7 @@
 
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/smplhint.hxx>
 #include <vcl/svapp.hxx>

sc/source/ui/vba/vbaeventshelper.cxx

@@ -33,7 +33,7 @@
 #include <com/sun/star/util/XChangesNotifier.hpp>
 
 #include <cppuhelper/implbase4.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/eventcfg.hxx>
 #include <vbahelper/helperdecl.hxx>
 #include <vcl/svapp.hxx>

sd/inc/pch/precompiled_sd.hxx

@@ -790,7 +790,6 @@
 #include <time.h>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/unohlp.hxx>
 #include <tools/color.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>

sd/source/filter/eppt/epptso.cxx

@@ -64,7 +64,7 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/extract.hxx>
 #include <cppuhelper/proptypehlp.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <rtl/crc.h>
 #include <comphelper/classids.hxx>
 #include <unotools/ucbstreamhelper.hxx>

sd/source/ui/slideshow/slideshow.cxx

@@ -37,7 +37,7 @@
 
 #include <sfx2/viewfrm.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <svx/unoprov.hxx>
 
 #include "framework/FrameworkHelper.hxx"

sd/source/ui/slideshow/slideshowimpl.cxx

@@ -35,7 +35,7 @@
 #include <svl/aeitem.hxx>
 #include <svl/urihelper.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <sfx2/infobar.hxx>
 #include <sfx2/imagemgr.hxx>

sd/source/ui/unoidl/unopage.cxx

@@ -31,7 +31,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/metaact.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unomodel.hxx>

sd/source/ui/view/ToolBarManager.cxx

@@ -40,7 +40,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/link.hxx>
 
 #include <map>

sd/source/ui/view/drviews8.cxx

@@ -22,7 +22,7 @@
 
 #include "ViewShellHint.hxx"
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svxids.hrc>
 #include <vcl/msgbox.hxx>

sfx2/source/doc/objmisc.cxx

@@ -55,7 +55,7 @@
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Any.h>

sfx2/source/inet/inettbc.cxx

@@ -28,7 +28,7 @@
 #include <svl/stritem.hxx>
 #include <unotools/historyoptions.hxx>
 #include <vcl/toolbox.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <osl/thread.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>

sfx2/source/menu/virtmenu.cxx

@@ -26,7 +26,7 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <comphelper/processfactory.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include "virtmenu.hxx"
 #include <sfx2/msgpool.hxx>

sfx2/source/statbar/stbitem.cxx

@@ -45,7 +45,7 @@
 #include <comphelper/processfactory.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>
 
 using namespace ::com::sun::star;

sfx2/source/view/viewfrm.cxx

@@ -32,7 +32,7 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/ui/UIElementFactoryManager.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/splitwin.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svl/intitem.hxx>

sfx2/source/view/viewsh.cxx

@@ -49,7 +49,7 @@
 #include <framework/actiontriggerhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 
 #include <sfx2/app.hxx>

svtools/inc/pch/precompiled_svt.hxx

@@ -363,7 +363,6 @@
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/unohlp.hxx>
 #include <tools/color.hxx>
 #include <tools/config.hxx>
 #include <tools/date.hxx>

svtools/source/uno/contextmenuhelper.cxx

@@ -41,7 +41,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 

svtools/source/uno/toolboxcontroller.cxx

@@ -30,7 +30,7 @@
 #include <vcl/svapp.hxx>
 #include <svtools/imgdef.hxx>
 #include <svtools/miscopt.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/toolbox.hxx>
 #include <comphelper/processfactory.hxx>
 

svx/inc/pch/precompiled_svx.hxx

@@ -359,7 +359,6 @@
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/externallock.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/unohlp.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <tools/errinf.hxx>

svx/inc/pch/precompiled_svxcore.hxx

@@ -37,7 +37,6 @@
 #include "sal/config.h"
 #include "sal/types.h"
 #include "svtools/treelistentry.hxx"
-#include "toolkit/unohlp.hxx"
 #include "uno/lbnames.h"
 #include "xmloff/DashStyle.hxx"
 #include "xmloff/GradientStyle.hxx"
@@ -532,7 +531,6 @@
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/unohlp.hxx>
 #include <tools/b3dtrans.hxx>
 #include <tools/bigint.hxx>
 #include <tools/color.hxx>

svx/source/dialog/docrecovery.cxx

@@ -37,7 +37,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <vcl/scrbar.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>

svx/source/dialog/srchdlg.cxx

@@ -47,7 +47,7 @@
 #include <svl/intitem.hxx>
 
 #include <sfx2/app.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include "svx/srchdlg.hxx"
 

svx/source/form/fmPropBrw.cxx

@@ -58,7 +58,7 @@
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/shl.hxx>

svx/source/form/fmtools.cxx

@@ -76,7 +76,7 @@
 #include <rtl/logfile.hxx>
 #include <rtl/math.hxx>
 #include <sfx2/bindings.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>

svx/source/unodraw/unoshap2.cxx

@@ -1440,7 +1440,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic
 #include <sfx2/app.hxx>