diff options
80 files changed, 69 insertions, 93 deletions
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 24ec2d76aa17..4a050e70ad86 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/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> diff --git a/bin/moveglobalheaders.sh b/bin/moveglobalheaders.sh index e852a34534b3..6c8cff729505 100755 --- a/bin/moveglobalheaders.sh +++ b/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 diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index b2386ceb8e1b..8cf9483c56b7 100644 --- a/cui/source/customize/cfg.cxx +++ b/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> diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 343eb9cbbbe1..c07b37587a7c 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/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> diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index aacd18023f24..32c812790d0d 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/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> diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 271a6b8645f3..ce9ad063044f 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/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> diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 425a66654d17..90ee541463b0 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/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> diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 745d243c4fdb..f4b59c71b9ed 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/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> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index d7994baba16f..278e9f1fd730 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/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> diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 7944f4f9656e..d05cda78fb91 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/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> diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 5adef14b0df0..4a0b2ae0df59 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/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> diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 2c04309c68be..a99e407dabaf 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/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> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b8623f773ef5..f2b7a0e23a55 100644 --- a/desktop/source/app/app.cxx +++ b/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> diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index f9f342e44575..6c666e35cf7b 100644 --- a/editeng/source/items/textitem.cxx +++ b/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> diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 0aeb0db850fe..d3a45cbb1dbb 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/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> diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index aac47f1197b8..7339d1420b45 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/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> diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 455f8905536a..909917863368 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/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" diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 0402d6cbca2f..6d3e38c4cdf5 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/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> diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 312e6e25a8d5..eb58101ec1d6 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/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> diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index bd6b0e40ba82..d6edcb772a28 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/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> diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index d0f3c2b7ff43..a325215b2744 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/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> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 1f1e3a66ca36..cc922bcbed03 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/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> diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index fea88de034c9..63b363633683 100644 --- a/framework/source/classes/menumanager.cxx +++ b/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> diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 4cc20cd7a3df..d46b21a21fac 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/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> diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index d01955178560..b91833f1f2c4 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/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> diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 605a815d97f6..6cd5a2faaee6 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/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> diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 5899b83d56a6..683393363e36 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/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> diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 75c12bdf1022..90348340bc77 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/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> diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 9a4399215ae8..b332c6794a2a 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/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> diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 46ed6b443359..e6d54103cf56 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/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; diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 9da074e95aec..bb04155f389d 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/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> diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index ebc54594322e..4491671f34a5 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/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> diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index ef4272219417..4320edf29158 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/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> diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index edf60e1f8f0a..69a01d59977b 100644 --- a/framework/source/services/frame.cxx +++ b/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> diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 7d90b9293791..cc748de85248 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/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> //_______________________________________________ diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index c950e15901ea..74cce4e8e6f7 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/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> //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 7334c1ee0a75..8168326bf877 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/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> diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 3153b2abbafc..92cfa0fa5274 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/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> diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 4f31d403c12e..bb38c5e5c269 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/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> diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 5a86dd64296f..6cdf841bdd34 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/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> diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index f89b2e957420..869841bb26ec 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/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> diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 841ebbcac67c..5bd44ee752e7 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/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> diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index a1d8cd78ae1a..39cfd555bccb 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/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> diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index b70a27d9ac2c..3eba7d9c6250 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/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> diff --git a/include/toolkit/unohlp.hxx b/include/toolkit/unohlp.hxx deleted file mode 100644 index eb3bd19f1fe5..000000000000 --- a/include/toolkit/unohlp.hxx +++ /dev/null @@ -1,3 +0,0 @@ -// 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> diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 0b14f2a267cd..17809a41db67 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/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> diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 2c9d432b729c..8afe9f2c682b 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/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> diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index e2b3f1843519..ca4c4a3b9489 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/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" diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index e7196b037359..df4479931aaf 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/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> diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 9135324f8dfb..d072d043f0c7 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/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> diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 5ba7e608aa34..716a2a150844 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/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> diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 3d45f89b109b..2f901f55ec9e 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/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> diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index f9154e255431..0fa31942940d 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/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" diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 6f67a1b2b7f2..0afcf29708c3 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/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> diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index cb09121890bb..6a65ba079eb7 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/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> diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 6c1eac406d29..65e0f71ac63c 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/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> diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index cf220e184f66..215158d51abf 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/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> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 49fb3b2d33ea..d8f4319163fa 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/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> diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index d3920d469dd5..8b3cc69c13e8 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/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> diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index ac5f07b20600..454ab9372475 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/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> diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 609550496a5c..0f0a05c1a53b 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/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; diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 3e60a2f69c75..97f9344c1678 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/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> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 0ac1b2093c16..0f58a322dfe0 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/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> diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 1748c3fead70..129c56ed72e3 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/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> diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index ad63ad97f717..5a39529a268c 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/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> diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 5a3716283f43..4c74be5e50ec 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/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> diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 563b48ea4c7d..8f861075932d 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/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> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 9b48bb7a8654..6b73d98bdace 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/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> diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 9eeff086e14b..29ecb5288df4 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/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> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index b88cd1f95d9d..472d9c323f4b 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/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" diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index e62eb9776fb3..66ab3f32c3d9 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/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> diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 716d550b5679..b7e3c65d6a31 100644 --- a/svx/source/form/fmtools.cxx +++ b/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> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 546b890ab987..d2ecf6b8516c 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1440,7 +1440,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic #include <sfx2/app.hxx> #include <sfx2/fcontnr.hxx> -#include "toolkit/unohlp.hxx" +#include <toolkit/helper/vclunohelper.hxx> //---------------------------------------------------------------------- SvxGraphicObject::SvxGraphicObject( SdrObject* pObj ) throw() diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index dffbd73ea403..4c1628b3f706 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -34,7 +34,7 @@ #include <comphelper/scopeguard.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/serviceinfohelper.hxx> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <vcl/gfxlink.hxx> #include <vcl/virdev.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 3734e4a0d9e9..78e56e87eea2 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -23,7 +23,7 @@ #include <vcl/window.hxx> #include <vcl/virdev.hxx> #include <vcl/bitmapex.hxx> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <svl/style.hxx> #include <editeng/memberids.hrc> #include <svx/dialogs.hrc> diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 0a5add1befe7..2980724d156b 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -42,7 +42,7 @@ #include <svtools/svmedit.hxx> #include <sfx2/filedlghelper.hxx> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <tools/stream.hxx> #include <tools/resmgr.hxx> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 2567a5212605..99fc5858439f 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -955,7 +955,6 @@ #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/unohlp.hxx> #include <tools/bigint.hxx> #include <tools/cachestr.hxx> #include <tools/color.hxx> diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index f9d2dafe17c7..e1faea9f6218 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -21,7 +21,7 @@ #include <dbtablepreviewdialog.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/Frame.hpp> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <dbui.hrc> #include <dbtablepreviewdialog.hrc> diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 4937fe1d9850..8ae22f1b1ef6 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -53,7 +53,7 @@ #include <com/sun/star/sdb/XResultSetAccess.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 0e0f4c3df343..178919720955 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -90,7 +90,7 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/scanner/ScannerContext.hpp> #include <com/sun/star/scanner/XScannerManager2.hpp> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <rtl/ustrbuf.hxx> #include <sax/tools/converter.hxx> |