[Libreoffice-commits] core.git: 2 commits - svtools/source
Michael Stahl
mstahl at redhat.com
Thu Aug 15 08:21:51 PDT 2013
svtools/source/brwbox/brwbox2.cxx | 4 ++--
svtools/source/brwbox/brwbox3.cxx | 4 ++--
svtools/source/brwbox/brwhead.cxx | 4 ++--
svtools/source/brwbox/datwin.hxx | 6 +++---
svtools/source/brwbox/ebbcontrols.cxx | 4 ++--
svtools/source/brwbox/editbrowsebox.cxx | 6 +++---
svtools/source/brwbox/editbrowsebox2.cxx | 2 +-
svtools/source/config/accessibilityoptions.cxx | 2 +-
svtools/source/config/colorcfg.cxx | 2 +-
svtools/source/config/fontsubstconfig.cxx | 2 +-
svtools/source/config/helpopt.cxx | 2 +-
svtools/source/config/htmlcfg.cxx | 4 ++--
svtools/source/config/itemholder2.cxx | 16 ++++++++--------
svtools/source/config/menuoptions.cxx | 2 +-
svtools/source/config/miscopt.cxx | 4 ++--
svtools/source/config/optionsdrawinglayer.cxx | 2 +-
svtools/source/config/printoptions.cxx | 2 +-
svtools/source/config/slidesorterbaropt.cxx | 2 +-
svtools/source/config/toolpanelopt.cxx | 4 ++--
svtools/source/contnr/DocumentInfoPreview.cxx | 2 +-
svtools/source/contnr/contentenumeration.cxx | 4 ++--
svtools/source/contnr/fileview.cxx | 14 +++++++-------
svtools/source/contnr/imivctl.hxx | 2 +-
svtools/source/contnr/imivctl1.cxx | 4 ++--
svtools/source/contnr/ivctrl.cxx | 2 +-
svtools/source/contnr/simptabl.cxx | 6 +++---
svtools/source/contnr/svimpbox.cxx | 12 ++++++------
svtools/source/contnr/svlbitm.cxx | 8 ++++----
svtools/source/contnr/svtabbx.cxx | 12 ++++++------
svtools/source/contnr/templwin.cxx | 20 ++++++++++----------
svtools/source/contnr/templwin.hxx | 4 ++--
svtools/source/contnr/treelist.cxx | 6 +++---
svtools/source/contnr/treelistbox.cxx | 10 +++++-----
svtools/source/contnr/treelistentry.cxx | 4 ++--
svtools/source/contnr/viewdataentry.cxx | 2 +-
svtools/source/control/asynclink.cxx | 2 +-
svtools/source/control/calendar.cxx | 6 +++---
svtools/source/control/collatorres.cxx | 6 +++---
svtools/source/control/ctrlbox.cxx | 12 ++++++------
svtools/source/control/ctrltool.cxx | 6 +++---
svtools/source/control/filectrl.cxx | 4 ++--
svtools/source/control/filectrl2.cxx | 2 +-
svtools/source/control/fileurlbox.cxx | 2 +-
svtools/source/control/fmtfield.cxx | 2 +-
svtools/source/control/headbar.cxx | 2 +-
svtools/source/control/hyperlabel.cxx | 2 +-
svtools/source/control/indexentryres.cxx | 6 +++---
svtools/source/control/inettbc.cxx | 4 ++--
svtools/source/control/roadmap.cxx | 2 +-
svtools/source/control/ruler.cxx | 2 +-
svtools/source/control/scriptedtext.cxx | 2 +-
svtools/source/control/scrwin.cxx | 2 +-
svtools/source/control/stdctrl.cxx | 2 +-
svtools/source/control/stdmenu.cxx | 4 ++--
svtools/source/control/tabbar.cxx | 6 +++---
svtools/source/control/toolbarmenu.cxx | 4 ++--
svtools/source/control/toolbarmenuacc.cxx | 2 +-
svtools/source/control/urlcontrol.cxx | 2 +-
svtools/source/control/valueacc.cxx | 2 +-
svtools/source/control/valueset.cxx | 2 +-
svtools/source/dialogs/PlaceEditDialog.cxx | 2 +-
svtools/source/dialogs/addresstemplate.cxx | 10 +++++-----
svtools/source/dialogs/colrdlg.cxx | 2 +-
svtools/source/dialogs/insdlg.cxx | 6 +++---
svtools/source/dialogs/prnsetup.cxx | 6 +++---
svtools/source/dialogs/restartdialog.cxx | 2 +-
svtools/source/dialogs/roadmapwizard.cxx | 8 ++++----
svtools/source/dialogs/wizardmachine.cxx | 8 ++++----
svtools/source/dialogs/wizdlg.cxx | 2 +-
svtools/source/edit/editsyntaxhighlighter.cxx | 4 ++--
svtools/source/edit/svmedit.cxx | 2 +-
svtools/source/edit/svmedit2.cxx | 2 +-
svtools/source/edit/textwindowpeer.cxx | 2 +-
svtools/source/filter/exportdialog.cxx | 4 ++--
svtools/source/graphic/graphicunofactory.cxx | 2 +-
svtools/source/graphic/grfattr.cxx | 2 +-
svtools/source/graphic/grfcache.cxx | 2 +-
svtools/source/graphic/grfmgr.cxx | 2 +-
svtools/source/graphic/grfmgr2.cxx | 2 +-
svtools/source/graphic/provider.cxx | 2 +-
svtools/source/graphic/renderer.cxx | 2 +-
81 files changed, 174 insertions(+), 174 deletions(-)
New commits:
commit 593a298dd3cf61781d0d069eaf2fa80a82eda502
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Aug 15 17:16:28 2013 +0200
Revert "fdo#63926 - remove extra include paths in svtools/ and sfx2/"
This reverts commit 389bdc162415abff78971b1ce7c5d47482e1d37b.
Sadly this was going in the wrong direction...
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 0e1bd93..01a2162 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 ab9fba9..914f25d 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 6bf9af7..bc6bd44 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 2facccf..2ebec04 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 4c6abc8..a67c384 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 b8b25c8..c80507f 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 f2bc0ab..f1ce85d 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 c9b030b..a07a1ea 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 7abdc36..3ca7f3e 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 3d250d2..46f40fc 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 72b3713..5535e4c 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 d8323d2..c966beb 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 09b0412..3a192a1 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 216b95a3..e10bb96 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 7f57c96..caaedd0 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 e9d55f5..c7f008e 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 b22de6a..ee62f1b 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 f5e7224..1bef13a 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 3d709e5..75a8d53 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 534c3d1..8b51a33 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 427a09e..b85eecf 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 51b1b74..21a7066 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 2490b07..10b1fda 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 498680e..4e2889d 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 e17b932..81655a5 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 12ab988..8687e3d 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 af1522c..2e2112b 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 8a8a970..1a9191a 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 fdb6f7b..d8bde9c 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 4a455be..6a7c977 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 677101a..2e71b0d 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 4f7d65d..bbe30dd 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 103fbb8..c9e648b7 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 8c2bc12c..b7fffe7 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 0af9dea..33234ed 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 fea0f91..f0d4629 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 b146c01..6577c0e 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 6305e5b..45c3686 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 200a24f..9bc54b9 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 6d8da703..95097fb 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"
commit fa96ed925fc40e20aca58551414e5bc5d61a87bd
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Aug 15 17:15:26 2013 +0200
Revert "fdo#63926 - remove extra include paths in svtools/ and sfx2/"
This reverts commit 1cbdcc31b8a921c508f2fdf09847f64d004a7faa.
Sadly this was going in the wrong direction...
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 53e6bd9..a93d65b 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -18,9 +18,9 @@
*/
#include <tools/debug.hxx>
-#include <brwbox.hxx>
+#include <svtools/brwbox.hxx>
#include "datwin.hxx"
-#include <colorcfg.hxx>
+#include <svtools/colorcfg.hxx>
#include <vcl/salgtype.hxx>
#include <tools/multisel.hxx>
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 7c93f14..7b511c0 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <brwbox.hxx>
-#include <AccessibleBrowseBoxObjType.hxx>
+#include <svtools/brwbox.hxx>
+#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <tools/debug.hxx>
#include <tools/multisel.hxx>
#include "datwin.hxx"
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index 76c7acd..d3b7a7e 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -18,8 +18,8 @@
*/
-#include <brwhead.hxx>
-#include <brwbox.hxx>
+#include <svtools/brwhead.hxx>
+#include <svtools/brwbox.hxx>
//===================================================================
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index b18627a..b668227 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -20,11 +20,11 @@
#ifndef _SFXDATWIN_HXX
#define _SFXDATWIN_HXX
-#include <brwbox.hxx>
-#include <brwhead.hxx>
+#include <svtools/brwbox.hxx>
+#include <svtools/brwhead.hxx>
#include <vcl/timer.hxx>
#include <vcl/image.hxx>
-#include <transfer.hxx>
+#include <svtools/transfer.hxx>
#include <vector>
//===================================================================
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index b826732..7e68ebf 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <editbrowsebox.hxx>
+#include <svtools/editbrowsebox.hxx>
#include <vcl/decoview.hxx>
-#include <fmtfield.hxx>
+#include <svtools/fmtfield.hxx>
#include <vcl/xtextedt.hxx>
#include <algorithm>
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 26d3127..9e0ab71 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <editbrowsebox.hxx>
+#include <svtools/editbrowsebox.hxx>
#include "editbrowsebox.hrc"
@@ -28,9 +28,9 @@
#include <vcl/edit.hxx>
#include <tools/resid.hxx>
#include <vcl/spinfld.hxx>
-#include <svtresid.hxx>
+#include <svtools/svtresid.hxx>
-#include <svtools.hrc>
+#include <svtools/svtools.hrc>
#include <algorithm>
#include <tools/multisel.hxx>
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 7b318a8e..b5e9b80 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <editbrowsebox.hxx>
+#include <svtools/editbrowsebox.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include "editbrowseboximpl.hxx"
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index daecf54..6ba0a24 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -18,7 +18,7 @@
*/
-#include <accessibilityoptions.hxx>
+#include <svtools/accessibilityoptions.hxx>
#include <unotools/configmgr.hxx>
#include <com/sun/star/uno/Any.hxx>
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 7a6c44a..f2dbec0 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -18,7 +18,7 @@
*/
-#include <colorcfg.hxx>
+#include <svtools/colorcfg.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 7390e21..eb189e4 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <fontsubstconfig.hxx>
+#include <svtools/fontsubstconfig.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 9c8ec2b..aa1a874 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -18,7 +18,7 @@
*/
-#include <helpopt.hxx>
+#include <svtools/helpopt.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 37e8501..f3f2e7d 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -18,8 +18,8 @@
*/
-#include <htmlcfg.hxx>
-#include <parhtml.hxx>
+#include <svtools/htmlcfg.hxx>
+#include <svtools/parhtml.hxx>
#include <unotools/syslocale.hxx>
#include <tools/debug.hxx>
#include <tools/link.hxx>
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index ae06e59..856125f 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -24,15 +24,15 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
-#include <accessibilityoptions.hxx>
-#include <apearcfg.hxx>
-#include <menuoptions.hxx>
-#include <colorcfg.hxx>
-#include <fontsubstconfig.hxx>
-#include <helpopt.hxx>
-#include <printoptions.hxx>
+#include <svtools/accessibilityoptions.hxx>
+#include <svtools/apearcfg.hxx>
+#include <svtools/menuoptions.hxx>
+#include <svtools/colorcfg.hxx>
+#include <svtools/fontsubstconfig.hxx>
+#include <svtools/helpopt.hxx>
+#include <svtools/printoptions.hxx>
#include <unotools/options.hxx>
-#include <miscopt.hxx>
+#include <svtools/miscopt.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 813d852..1a320b1 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -18,7 +18,7 @@
*/
-#include <menuoptions.hxx>
+#include <svtools/menuoptions.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 2a4cb2a..fc5aac8 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <miscopt.hxx>
+#include <svtools/miscopt.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
#include <tools/debug.hxx>
@@ -28,7 +28,7 @@
#include <rtl/instance.hxx>
#include "itemholder2.hxx"
-#include <imgdef.hxx>
+#include <svtools/imgdef.hxx>
#include <vcl/svapp.hxx>
#include <list>
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 150e2bd..31a84c2 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -21,7 +21,7 @@
#pragma hdrstop
#endif
-#include <optionsdrawinglayer.hxx>
+#include <svtools/optionsdrawinglayer.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 87a6e49..f75866f 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <printoptions.hxx>
+#include <svtools/printoptions.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
#include <vcl/print.hxx>
diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx
index 0faf9f4..9ef89c8 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <slidesorterbaropt.hxx>
+#include <svtools/slidesorterbaropt.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx
index 3b08ef0..7c52735 100644
--- a/svtools/source/config/toolpanelopt.cxx
+++ b/svtools/source/config/toolpanelopt.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <toolpanelopt.hxx>
+#include <svtools/toolpanelopt.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
#include <tools/debug.hxx>
@@ -28,7 +28,7 @@
#include <rtl/instance.hxx>
#include "itemholder2.hxx"
-#include <imgdef.hxx>
+#include <svtools/imgdef.hxx>
#include <vcl/svapp.hxx>
#include <list>
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 96c6af4..2a54607 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -28,7 +28,7 @@
#include "rtl/ustring.hxx"
#include "svl/inettype.hxx"
#include "svtools/DocumentInfoPreview.hxx"
-#include "imagemgr.hxx"
+#include "svtools/imagemgr.hxx"
#include "vcl/txtattr.hxx"
#include "tools/datetime.hxx"
#include "tools/urlobj.hxx"
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 4372fb4..39e3373 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -18,8 +18,8 @@
*/
#include "contentenumeration.hxx"
-#include <inettbc.hxx>
-#include <imagemgr.hxx>
+#include <svtools/inettbc.hxx>
+#include <svtools/imagemgr.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 2f7ae82..f8104b6 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -19,17 +19,17 @@
#include "fileview.hxx"
#include "sal/config.h"
-#include "treelistentry.hxx"
+#include "svtools/treelistentry.hxx"
#include <svtools/fileview.hxx>
-#include <svtresid.hxx>
-#include <imagemgr.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/imagemgr.hxx>
#include <svtools/headbar.hxx>
-#include <svtabbx.hxx>
-#include <svtools.hrc>
-#include "viewdataentry.hxx"
+#include <svtools/svtabbx.hxx>
+#include <svtools/svtools.hrc>
+#include "svtools/viewdataentry.hxx"
#include "fileview.hrc"
#include "contentenumeration.hxx"
-#include <AccessibleBrowseBoxObjType.hxx>
+#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index a98fb54..d439998 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -29,7 +29,7 @@
#include <limits.h>
-#include <ivctrl.hxx>
+#include <svtools/ivctrl.hxx>
#include <boost/ptr_container/ptr_map.hpp>
class IcnCursor_Impl;
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 0624049..f1e5084 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -30,9 +30,9 @@
#include <vcl/mnemonic.hxx>
#include <vcl/controllayout.hxx>
-#include <ivctrl.hxx>
+#include <svtools/ivctrl.hxx>
#include "imivctl.hxx"
-#include <svmedit.hxx>
+#include <svtools/svmedit.hxx>
#include <algorithm>
#include <memory>
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index a48bb0d..36ecadc 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -18,7 +18,7 @@
*/
-#include <ivctrl.hxx>
+#include <svtools/ivctrl.hxx>
#include "imivctl.hxx"
#include <vcl/bitmapex.hxx>
#include <vcl/controllayout.hxx>
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index e251f33..8070d9c 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -18,9 +18,9 @@
*/
#include <comphelper/processfactory.hxx>
-#include <simptabl.hxx>
-#include <svlbitm.hxx>
-#include <treelistentry.hxx>
+#include <svtools/simptabl.hxx>
+#include <svtools/svlbitm.hxx>
+#include <svtools/treelistentry.hxx>
#include <unotools/intlwrapper.hxx>
#include <vcl/builder.hxx>
#include <vcl/svapp.hxx>
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 275706f..f950f0e 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -23,18 +23,18 @@
#include <stack>
-#include <treelistbox.hxx>
-#include <svlbitm.hxx>
+#include <svtools/treelistbox.hxx>
+#include <svtools/svlbitm.hxx>
#include <svimpbox.hxx>
#include <rtl/instance.hxx>
-#include <svtresid.hxx>
+#include <svtools/svtresid.hxx>
#include <tools/wintypes.hxx>
-#include <svtools.hrc>
+#include <svtools/svtools.hrc>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
-#include "treelistentry.hxx"
-#include "viewdataentry.hxx"
+#include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
#define NODE_BMP_TABDIST_NOTVALID -2000000
#define FIRST_ENTRY_TAB 1
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 702d110..ca3b342 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <treelistbox.hxx>
-#include <svlbitm.hxx>
-#include "treelistentry.hxx"
-#include "viewdataentry.hxx"
+#include <svtools/treelistbox.hxx>
+#include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
#include <vcl/svapp.hxx>
#include <vcl/button.hxx>
#include <vcl/decoview.hxx>
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 30ecd6d..0a0de29 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svtabbx.hxx>
-#include <headbar.hxx>
-#include <svtresid.hxx>
-#include <svlbitm.hxx>
-#include <svtools.hrc>
-#include <treelistentry.hxx>
+#include <svtools/svtabbx.hxx>
+#include <svtools/headbar.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/svlbitm.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/treelistentry.hxx>
#include <vcl/builder.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index aa32615..ec99e64 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -18,22 +18,22 @@
*/
#include "templwin.hxx"
-#include <templdlg.hxx>
-#include <svtresid.hxx>
-#include <langhelp.hxx>
+#include <svtools/templdlg.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/langhelp.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/dynamicmenuoptions.hxx>
#include <unotools/extendedsecurityoptions.hxx>
#include <vcl/xtextedt.hxx>
#include <svl/inettype.hxx>
-#include <imagemgr.hxx>
-#include <miscopt.hxx>
-#include <templatefoldercache.hxx>
-#include <imgdef.hxx>
+#include <svtools/imagemgr.hxx>
+#include <svtools/miscopt.hxx>
+#include <svtools/templatefoldercache.hxx>
+#include <svtools/imgdef.hxx>
#include <vcl/txtattr.hxx>
-#include <svtools.hrc>
+#include <svtools/svtools.hrc>
#include "templwin.hrc"
-#include <helpid.hrc>
+#include <svtools/helpid.hrc>
#include <unotools/viewoptions.hxx>
#include <unotools/ucbhelper.hxx>
#include "unotools/configmgr.hxx"
@@ -74,7 +74,7 @@
#include <vcl/svapp.hxx>
#include <vcl/split.hxx>
#include <vcl/msgbox.hxx>
-#include <DocumentInfoPreview.hxx>
+#include <svtools/DocumentInfoPreview.hxx>
#include <vcl/mnemonic.hxx>
#include <ucbhelper/content.hxx>
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index 71c906a..19cdfc1 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -25,8 +25,8 @@
#include <vcl/window.hxx>
#include <svtools/headbar.hxx>
#include <svtools/fileview.hxx>
-#include <ivctrl.hxx>
-#include <svmedit2.hxx>
+#include <svtools/ivctrl.hxx>
+#include <svtools/svmedit2.hxx>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index fdd779d..55beae9 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "treelist.hxx"
-#include "treelistentry.hxx"
-#include "viewdataentry.hxx"
+#include "svtools/treelist.hxx"
+#include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
#include "osl/diagnose.h"
#include <stdio.h>
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index ef0625e..45e8317 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -23,7 +23,7 @@
- SelectAll( sal_False ) => only repaint the delselected entries
*/
-#include <treelistbox.hxx>
+#include <svtools/treelistbox.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <vcl/svapp.hxx>
#include <vcl/accel.hxx>
@@ -34,10 +34,10 @@
#include <rtl/instance.hxx>
#include <comphelper/string.hxx>
-#include <svmedit.hxx>
-#include <svlbitm.hxx>
-#include "treelistentry.hxx"
-#include "viewdataentry.hxx"
+#include <svtools/svmedit.hxx>
+#include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
#include "svimpbox.hxx"
#include <set>
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index 5680bda..5a97b09 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "treelistentry.hxx"
-#include "treelist.hxx"
+#include "svtools/treelistentry.hxx"
+#include "svtools/treelist.hxx"
#include <limits>
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 44b321b..06ba463 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "viewdataentry.hxx"
+#include "svtools/viewdataentry.hxx"
#include "tools/debug.hxx"
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 582c2f0..a222fb4 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -18,7 +18,7 @@
*/
-#include <asynclink.hxx>
+#include <svtools/asynclink.hxx>
#include <osl/mutex.hxx>
#include <tools/debug.hxx>
#include <vcl/timer.hxx>
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 0dea0c5..0955133 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -33,9 +33,9 @@
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
-#include <svtools.hrc>
-#include <svtresid.hxx>
-#include <calendar.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtresid.hxx>
+#include <svtools/calendar.hxx>
// =======================================================================
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index 4255bff..cc2d730 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -18,9 +18,9 @@
*/
-#include <svtresid.hxx>
-#include <svtools.hrc>
-#include <collatorres.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/collatorres.hxx>
// -------------------------------------------------------------------------
//
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 39049e2..7de9b71 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -27,12 +27,12 @@
#include <comphelper/string.hxx>
#include <unotools/charclass.hxx>
-#include <sampletext.hxx>
-#include <svtresid.hxx>
-#include <svtools.hrc>
-#include <ctrlbox.hxx>
-#include <ctrltool.hxx>
-#include <borderhelper.hxx>
+#include <svtools/sampletext.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/ctrlbox.hxx>
+#include <svtools/ctrltool.hxx>
+#include <svtools/borderhelper.hxx>
#include <vcl/i18nhelp.hxx>
#include <vcl/fontcapabilities.hxx>
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 026dc94..877e390 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -26,9 +26,9 @@
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <sal/macros.h>
-#include <svtools.hrc>
-#include <svtresid.hxx>
-#include <ctrltool.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtresid.hxx>
+#include <svtools/ctrltool.hxx>
// =======================================================================
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 6d82f3e..f605f8a 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svtresid.hxx>
-#include <filectrl.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/filectrl.hxx>
#include <filectrl.hrc>
// =======================================================================
More information about the Libreoffice-commits
mailing list