diff options
40 files changed, 63 insertions, 63 deletions
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx index 0e1bd931ac0f..01a21625aeb3 100644 --- a/svtools/source/control/filectrl2.cxx +++ b/svtools/source/control/filectrl2.cxx @@ -19,7 +19,7 @@ // this file contains code from filectrl.cxx which needs to be compiled with enabled exception hanling -#include <filectrl.hxx> +#include <svtools/filectrl.hxx> #include <com/sun/star/ui/dialogs/FilePicker.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <comphelper/processfactory.hxx> diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index ab9fba967b85..914f25dbbc5e 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <fileurlbox.hxx> +#include <svtools/fileurlbox.hxx> #include <osl/file.h> #include "svl/filenotation.hxx" diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 6bf9af7144ef..bc6bd449ae1e 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -25,7 +25,7 @@ #include <unotools/localedatawrapper.hxx> #include <vcl/svapp.hxx> #include <svl/zformat.hxx> -#include <fmtfield.hxx> +#include <svtools/fmtfield.hxx> #include <i18nlangtag/languagetag.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/SearchOptions.hpp> diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 2facccf5c578..2ebec04d7645 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <headbar.hxx> +#include <svtools/headbar.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index 4c6abc8bac59..a67c3842b547 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hyperlabel.hxx> +#include <svtools/hyperlabel.hxx> #include <vcl/bitmap.hxx> #include <tools/color.hxx> diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index b8b25c8e6abd..c80507f015a7 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -18,9 +18,9 @@ */ -#include <svtresid.hxx> -#include <svtools.hrc> -#include <indexentryres.hxx> +#include <svtools/svtresid.hxx> +#include <svtools/svtools.hrc> +#include <svtools/indexentryres.hxx> // ------------------------------------------------------------------------- // diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index f2bc0abce509..f1ce85d3f165 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -22,7 +22,7 @@ #include <sys/types.h> #endif -#include <inettbc.hxx> +#include <svtools/inettbc.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/beans/Property.hpp> @@ -57,7 +57,7 @@ #include <unotools/localfilehelper.hxx> #include <unotools/ucbhelper.hxx> #include "iodlg.hrc" -#include <asynclink.hxx> +#include <svtools/asynclink.hxx> #include <svl/urlfilter.hxx> #include <vector> diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index c9b030b7dc8b..a07a1eacd5e6 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <roadmap.hxx> +#include <svtools/roadmap.hxx> #ifndef _STRING_HXX #define _STRING_HXX diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 7abdc36c0f66..3ca7f3e95d54 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -23,7 +23,7 @@ #include <tools/poly.hxx> #include <vcl/i18nhelp.hxx> -#include <ruler.hxx> +#include <svtools/ruler.hxx> // ======================================================================= diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 3d250d21b2a7..46f40fc1a1b9 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <scriptedtext.hxx> +#include <svtools/scriptedtext.hxx> #include <vector> #include <rtl/ustring.hxx> #include <vcl/outdev.hxx> diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 72b37137a0c7..5535e4c0df1a 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <scrwin.hxx> +#include <svtools/scrwin.hxx> //=================================================================== diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx index d8323d2fa443..c966bebdba04 100644 --- a/svtools/source/control/stdctrl.cxx +++ b/svtools/source/control/stdctrl.cxx @@ -18,7 +18,7 @@ */ -#include <stdctrl.hxx> +#include <svtools/stdctrl.hxx> // ======================================================================= diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index 09b041281526..3a192a19b540 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -21,8 +21,8 @@ #include <string.h> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> -#include <ctrltool.hxx> -#include <stdmenu.hxx> +#include <svtools/ctrltool.hxx> +#include <svtools/stdmenu.hxx> // ======================================================================== diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 216b95a303f8..e10bb9621246 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -18,7 +18,7 @@ */ -#include <tabbar.hxx> +#include <svtools/tabbar.hxx> #include <tools/time.hxx> #include <tools/debug.hxx> #include <tools/poly.hxx> @@ -30,8 +30,8 @@ #include <vcl/image.hxx> #include "svtaccessiblefactory.hxx" #include <filectrl.hrc> -#include <svtresid.hxx> -#include <svtools.hrc> +#include <svtools/svtresid.hxx> +#include <svtools/svtools.hrc> #include <limits> // ======================================================================= diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 7f57c96cda48..caaedd00f675 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -27,8 +27,8 @@ #include <vcl/taskpanelist.hxx> #include <vcl/toolbox.hxx> -#include "valueset.hxx" -#include "toolbarmenu.hxx" +#include "svtools/valueset.hxx" +#include "svtools/toolbarmenu.hxx" #include "toolbarmenuimp.hxx" using namespace ::com::sun::star::uno; diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index e9d55f560c11..c7f008e8e87a 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -26,7 +26,7 @@ #include <vcl/svapp.hxx> -#include "toolbarmenu.hxx" +#include "svtools/toolbarmenu.hxx" #include "toolbarmenuimp.hxx" diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index b22de6a639ba..ee62f1b49255 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -18,7 +18,7 @@ */ -#include <urlcontrol.hxx> +#include <svtools/urlcontrol.hxx> #include "svl/filenotation.hxx" //......................................................................... diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index f5e7224a7772..1bef13a9a1ef 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -19,7 +19,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <vcl/svapp.hxx> -#include <valueset.hxx> +#include <svtools/valueset.hxx> #include "valueimp.hxx" #include <comphelper/servicehelper.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 3d709e52f8c8..75a8d5374c54 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -30,7 +30,7 @@ #include <rtl/ustring.hxx> #include "valueimp.hxx" -#include <valueset.hxx> +#include <svtools/valueset.hxx> namespace { diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 534c3d1f1f22..8b51a33ef211 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -11,7 +11,7 @@ #include "ServerDetailsControls.hxx" #include <officecfg/Office/Common.hxx> -#include <svtresid.hxx> +#include <svtools/svtresid.hxx> #include <vcl/msgbox.hxx> using namespace boost; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 427a09ee1ea5..b85eecf59c03 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -19,11 +19,11 @@ #include <stdio.h> -#include <addresstemplate.hxx> +#include <svtools/addresstemplate.hxx> #include "addresstemplate.hrc" -#include <svtools.hrc> -#include <helpid.hrc> -#include <svtresid.hxx> +#include <svtools/svtools.hrc> +#include <svtools/helpid.hrc> +#include <svtools/svtresid.hxx> #include <tools/debug.hxx> #include <comphelper/extract.hxx> #include <comphelper/interaction.hxx> @@ -47,7 +47,7 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdb/CommandType.hpp> -#include <localresaccess.hxx> +#include <svtools/localresaccess.hxx> #include "svl/filenotation.hxx" #include <tools/urlobj.hxx> #include <algorithm> diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 51b1b743c25f..21a70661dd11 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -28,7 +28,7 @@ #include <toolkit/helper/vclunohelper.hxx> -#include <colrdlg.hxx> +#include <svtools/colrdlg.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 2490b0751db8..10b1fdaf42d6 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <insdlg.hxx> -#include <sores.hxx> -#include <svtresid.hxx> +#include <svtools/insdlg.hxx> +#include <svtools/sores.hxx> +#include <svtools/svtresid.hxx> #include <unotools/configmgr.hxx> #include <comphelper/classids.hxx> diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 498680e43aee..4e2889d7f4b9 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <prnsetup.hxx> -#include <svtools.hrc> -#include <svtresid.hxx> +#include <svtools/prnsetup.hxx> +#include <svtools/svtools.hrc> +#include <svtools/svtresid.hxx> #include <vcl/print.hxx> // ======================================================================= diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index e17b932a8d14..81655a5dc8c3 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -15,7 +15,7 @@ #include "com/sun/star/task/XInteractionHandler.hpp" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XComponentContext.hpp" -#include "restartdialog.hxx" +#include "svtools/restartdialog.hxx" #include "tools/link.hxx" #include "vcl/button.hxx" #include "vcl/dialog.hxx" diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 12ab9887d47c..8687e3d46305 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -18,10 +18,10 @@ */ -#include <roadmapwizard.hxx> -#include <svtools.hrc> -#include <svtresid.hxx> -#include <roadmap.hxx> +#include <svtools/roadmapwizard.hxx> +#include <svtools/svtools.hrc> +#include <svtools/svtresid.hxx> +#include <svtools/roadmap.hxx> #include <tools/debug.hxx> #include <stdarg.h> diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index af1522c64588..2e2112bac3e5 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <wizardmachine.hxx> -#include <helpid.hrc> +#include <svtools/wizardmachine.hxx> +#include <svtools/helpid.hrc> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> -#include <svtresid.hxx> -#include <svtools.hrc> +#include <svtools/svtresid.hxx> +#include <svtools/svtools.hrc> //......................................................................... namespace svt diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 8a8a970cdf83..1a9191af5855 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -20,7 +20,7 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <vcl/tabpage.hxx> -#include <wizdlg.hxx> +#include <svtools/wizdlg.hxx> // ======================================================================= diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index fdb6f7b1a77d..d8bde9c7e14c 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -18,10 +18,10 @@ */ -#include <svmedit.hxx> +#include <svtools/svmedit.hxx> #include <vcl/xtextedt.hxx> #include <vcl/builder.hxx> -#include <editsyntaxhighlighter.hxx> +#include <svtools/editsyntaxhighlighter.hxx> #include <vcl/txtattr.hxx> diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 4a455bea27d0..6a7c977c234c 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -20,7 +20,7 @@ #include "unoiface.hxx" -#include <textwindowpeer.hxx> +#include <svtools/textwindowpeer.hxx> diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx index 677101afe8c8..2e71b0d48c43 100644 --- a/svtools/source/edit/svmedit2.cxx +++ b/svtools/source/edit/svmedit2.cxx @@ -18,7 +18,7 @@ */ -#include <svmedit2.hxx> +#include <svtools/svmedit2.hxx> #include <vcl/xtextedt.hxx> ExtMultiLineEdit::ExtMultiLineEdit( Window* pParent, WinBits nWinStyle ) : diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx index 4f7d65d8d6e6..bbe30dd9f894 100644 --- a/svtools/source/edit/textwindowpeer.cxx +++ b/svtools/source/edit/textwindowpeer.cxx @@ -18,7 +18,7 @@ */ -#include <textwindowpeer.hxx> +#include <svtools/textwindowpeer.hxx> #include <vcl/textview.hxx> #include "svtaccessiblefactory.hxx" diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 103fbb899c10..c9e648b75940 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -25,8 +25,8 @@ #include <tools/stream.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/FilterConfigItem.hxx> -#include <svtools.hrc> -#include <svtresid.hxx> +#include <svtools/svtools.hrc> +#include <svtools/svtresid.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> #include <com/sun/star/drawing/XDrawView.hpp> diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx index 8c2bc12c590c..b7fffe7645ec 100644 --- a/svtools/source/graphic/graphicunofactory.cxx +++ b/svtools/source/graphic/graphicunofactory.cxx @@ -22,7 +22,7 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/graphic/XGraphicObject.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <grfmgr.hxx> +#include <svtools/grfmgr.hxx> using namespace com::sun::star; diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index 0af9dea0839a..33234ed7d5bb 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -19,7 +19,7 @@ #include <tools/vcompat.hxx> -#include <grfmgr.hxx> +#include <svtools/grfmgr.hxx> // --------------- // - GraphicAttr - diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index fea0f916f6f5..f0d462967ca5 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -18,7 +18,7 @@ */ #include <salhelper/timer.hxx> -#include <grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <tools/debug.hxx> #include <vcl/metaact.hxx> #include <vcl/outdev.hxx> diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index b146c0124353..6577c0ef1d89 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -31,7 +31,7 @@ #include <vcl/cvtgrf.hxx> #include <vcl/metaact.hxx> #include <vcl/virdev.hxx> -#include <grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <vcl/pdfextoutdevdata.hxx> diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 6305e5b23189..45c368612b2c 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -28,7 +28,7 @@ #include <vcl/alpha.hxx> #include <vcl/virdev.hxx> #include "grfcache.hxx" -#include <grfmgr.hxx> +#include <svtools/grfmgr.hxx> // ----------- // - defines - diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 200a24fcb5a7..9bc54b915211 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -37,7 +37,7 @@ #include "descriptor.hxx" #include "graphic.hxx" -#include <grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include "provider.hxx" #include <vcl/dibtools.hxx> diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 6d8da70301f6..95097fbe7bd1 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -26,7 +26,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/propertysetinfo.hxx> #include <svl/itemprop.hxx> -#include <grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <comphelper/servicehelper.hxx> #include "graphic.hxx" #include "renderer.hxx" |