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 ++--
41 files changed, 111 insertions(+), 111 deletions(-)
New commits:
commit 1cbdcc31b8a921c508f2fdf09847f64d004a7faa
Author: Radu Ioan <ioan.rad...@gmail.com>
Date: Mon Aug 5 00:18:29 2013 +0300
fdo#63926 - remove extra include paths in svtools/ and sfx2/
- removed some paths from include
- more of this kind wil follow
Change-Id: I0255d8dd338d82dfd4ac3027c34cddea493f105d
Reviewed-on: https://gerrit.libreoffice.org/5281
Reviewed-by: Miklos Vajna <vmik...@suse.cz>
Tested-by: Miklos Vajna <vmik...@suse.cz>
diff --git a/svtools/source/brwbox/brwbox2.cxx
b/svtools/source/brwbox/brwbox2.cxx
index a93d65b..53e6bd9 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -18,9 +18,9 @@
*/
#include <tools/debug.hxx>
-#include <svtools/brwbox.hxx>
+#include <brwbox.hxx>
#include "datwin.hxx"
-#include <svtools/colorcfg.hxx>
+#include <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 7b511c0..7c93f14 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 <svtools/brwbox.hxx>
-#include <svtools/AccessibleBrowseBoxObjType.hxx>
+#include <brwbox.hxx>
+#include <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 d3b7a7e..76c7acd 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -18,8 +18,8 @@
*/
-#include <svtools/brwhead.hxx>
-#include <svtools/brwbox.hxx>
+#include <brwhead.hxx>
+#include <brwbox.hxx>
//===================================================================
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index b668227..b18627a 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -20,11 +20,11 @@
#ifndef _SFXDATWIN_HXX
#define _SFXDATWIN_HXX
-#include <svtools/brwbox.hxx>
-#include <svtools/brwhead.hxx>
+#include <brwbox.hxx>
+#include <brwhead.hxx>
#include <vcl/timer.hxx>
#include <vcl/image.hxx>
-#include <svtools/transfer.hxx>
+#include <transfer.hxx>
#include <vector>
//===================================================================
diff --git a/svtools/source/brwbox/ebbcontrols.cxx
b/svtools/source/brwbox/ebbcontrols.cxx
index 7e68ebf..b826732 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 <svtools/editbrowsebox.hxx>
+#include <editbrowsebox.hxx>
#include <vcl/decoview.hxx>
-#include <svtools/fmtfield.hxx>
+#include <fmtfield.hxx>
#include <vcl/xtextedt.hxx>
#include <algorithm>
diff --git a/svtools/source/brwbox/editbrowsebox.cxx
b/svtools/source/brwbox/editbrowsebox.cxx
index 9e0ab71..26d3127 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 <svtools/editbrowsebox.hxx>
+#include <editbrowsebox.hxx>
#include "editbrowsebox.hrc"
@@ -28,9 +28,9 @@
#include <vcl/edit.hxx>
#include <tools/resid.hxx>
#include <vcl/spinfld.hxx>
-#include <svtools/svtresid.hxx>
+#include <svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools.hrc>
#include <algorithm>
#include <tools/multisel.hxx>
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx
b/svtools/source/brwbox/editbrowsebox2.cxx
index b5e9b80..7b318a8e 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 <svtools/editbrowsebox.hxx>
+#include <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 6ba0a24..daecf54 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -18,7 +18,7 @@
*/
-#include <svtools/accessibilityoptions.hxx>
+#include <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 f2dbec0..7a6c44a 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -18,7 +18,7 @@
*/
-#include <svtools/colorcfg.hxx>
+#include <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 eb189e4..7390e21 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 <svtools/fontsubstconfig.hxx>
+#include <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 aa1a874..9c8ec2b 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -18,7 +18,7 @@
*/
-#include <svtools/helpopt.hxx>
+#include <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 f3f2e7d..37e8501 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -18,8 +18,8 @@
*/
-#include <svtools/htmlcfg.hxx>
-#include <svtools/parhtml.hxx>
+#include <htmlcfg.hxx>
+#include <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 856125f..ae06e59 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 <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 <accessibilityoptions.hxx>
+#include <apearcfg.hxx>
+#include <menuoptions.hxx>
+#include <colorcfg.hxx>
+#include <fontsubstconfig.hxx>
+#include <helpopt.hxx>
+#include <printoptions.hxx>
#include <unotools/options.hxx>
-#include <svtools/miscopt.hxx>
+#include <miscopt.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/config/menuoptions.cxx
b/svtools/source/config/menuoptions.cxx
index 1a320b1..813d852 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -18,7 +18,7 @@
*/
-#include <svtools/menuoptions.hxx>
+#include <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 fc5aac8..2a4cb2a 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 <svtools/miscopt.hxx>
+#include <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 <svtools/imgdef.hxx>
+#include <imgdef.hxx>
#include <vcl/svapp.hxx>
#include <list>
diff --git a/svtools/source/config/optionsdrawinglayer.cxx
b/svtools/source/config/optionsdrawinglayer.cxx
index 31a84c2..150e2bd 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -21,7 +21,7 @@
#pragma hdrstop
#endif
-#include <svtools/optionsdrawinglayer.hxx>
+#include <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 f75866f..87a6e49 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 <svtools/printoptions.hxx>
+#include <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 9ef89c8..0faf9f4 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 <svtools/slidesorterbaropt.hxx>
+#include <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 7c52735..3b08ef0 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 <svtools/toolpanelopt.hxx>
+#include <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 <svtools/imgdef.hxx>
+#include <imgdef.hxx>
#include <vcl/svapp.hxx>
#include <list>
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx
b/svtools/source/contnr/DocumentInfoPreview.cxx
index 2a54607..96c6af4 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 "svtools/imagemgr.hxx"
+#include "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 39e3373..4372fb4 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -18,8 +18,8 @@
*/
#include "contentenumeration.hxx"
-#include <svtools/inettbc.hxx>
-#include <svtools/imagemgr.hxx>
+#include <inettbc.hxx>
+#include <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 f8104b6..2f7ae82 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 "svtools/treelistentry.hxx"
+#include "treelistentry.hxx"
#include <svtools/fileview.hxx>
-#include <svtools/svtresid.hxx>
-#include <svtools/imagemgr.hxx>
+#include <svtresid.hxx>
+#include <imagemgr.hxx>
#include <svtools/headbar.hxx>
-#include <svtools/svtabbx.hxx>
-#include <svtools/svtools.hrc>
-#include "svtools/viewdataentry.hxx"
+#include <svtabbx.hxx>
+#include <svtools.hrc>
+#include "viewdataentry.hxx"
#include "fileview.hrc"
#include "contentenumeration.hxx"
-#include <svtools/AccessibleBrowseBoxObjType.hxx>
+#include <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 d439998..a98fb54 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -29,7 +29,7 @@
#include <limits.h>
-#include <svtools/ivctrl.hxx>
+#include <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 f1e5084..0624049 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 <svtools/ivctrl.hxx>
+#include <ivctrl.hxx>
#include "imivctl.hxx"
-#include <svtools/svmedit.hxx>
+#include <svmedit.hxx>
#include <algorithm>
#include <memory>
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 8629229..6ce1846 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -18,7 +18,7 @@
*/
-#include <svtools/ivctrl.hxx>
+#include <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 0ed3872..6da7c47 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -18,9 +18,9 @@
*/
#include <comphelper/processfactory.hxx>
-#include <svtools/simptabl.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
+#include <simptabl.hxx>
+#include <svlbitm.hxx>
+#include <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 0099dd2..7203117 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -23,18 +23,18 @@
#include <stack>
-#include <svtools/treelistbox.hxx>
-#include <svtools/svlbitm.hxx>
+#include <treelistbox.hxx>
+#include <svlbitm.hxx>
#include <svimpbox.hxx>
#include <rtl/instance.hxx>
-#include <svtools/svtresid.hxx>
+#include <svtresid.hxx>
#include <tools/wintypes.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools.hrc>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include "treelistentry.hxx"
+#include "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 ca3b342..702d110 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 <svtools/treelistbox.hxx>
-#include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <treelistbox.hxx>
+#include <svlbitm.hxx>
+#include "treelistentry.hxx"
+#include "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 e165bea..9120444 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 <svtools/svtabbx.hxx>
-#include <svtools/headbar.hxx>
-#include <svtools/svtresid.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/svtools.hrc>
-#include <svtools/treelistentry.hxx>
+#include <svtabbx.hxx>
+#include <headbar.hxx>
+#include <svtresid.hxx>
+#include <svlbitm.hxx>
+#include <svtools.hrc>
+#include <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 ec99e64..aa32615 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -18,22 +18,22 @@
*/
#include "templwin.hxx"
-#include <svtools/templdlg.hxx>
-#include <svtools/svtresid.hxx>
-#include <svtools/langhelp.hxx>
+#include <templdlg.hxx>
+#include <svtresid.hxx>
+#include <langhelp.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/dynamicmenuoptions.hxx>
#include <unotools/extendedsecurityoptions.hxx>
#include <vcl/xtextedt.hxx>
#include <svl/inettype.hxx>
-#include <svtools/imagemgr.hxx>
-#include <svtools/miscopt.hxx>
-#include <svtools/templatefoldercache.hxx>
-#include <svtools/imgdef.hxx>
+#include <imagemgr.hxx>
+#include <miscopt.hxx>
+#include <templatefoldercache.hxx>
+#include <imgdef.hxx>
#include <vcl/txtattr.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools.hrc>
#include "templwin.hrc"
-#include <svtools/helpid.hrc>
+#include <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 <svtools/DocumentInfoPreview.hxx>
+#include <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 19cdfc1..71c906a 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 <svtools/ivctrl.hxx>
-#include <svtools/svmedit2.hxx>
+#include <ivctrl.hxx>
+#include <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 55beae9..fdd779d 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 "svtools/treelist.hxx"
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include "treelist.hxx"
+#include "treelistentry.hxx"
+#include "viewdataentry.hxx"
#include "osl/diagnose.h"
#include <stdio.h>
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index f761e9a..3991cc9 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 <svtools/treelistbox.hxx>
+#include <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 <svtools/svmedit.hxx>
-#include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svmedit.hxx>
+#include <svlbitm.hxx>
+#include "treelistentry.hxx"
+#include "viewdataentry.hxx"
#include "svimpbox.hxx"
#include <set>
diff --git a/svtools/source/contnr/treelistentry.cxx
b/svtools/source/contnr/treelistentry.cxx
index 5a97b09..5680bda 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 "svtools/treelistentry.hxx"
-#include "svtools/treelist.hxx"
+#include "treelistentry.hxx"
+#include "treelist.hxx"
#include <limits>
diff --git a/svtools/source/contnr/viewdataentry.cxx
b/svtools/source/contnr/viewdataentry.cxx
index 06ba463..44b321b 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 "svtools/viewdataentry.hxx"
+#include "viewdataentry.hxx"
#include "tools/debug.hxx"
diff --git a/svtools/source/control/asynclink.cxx
b/svtools/source/control/asynclink.cxx
index a222fb4..582c2f0 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -18,7 +18,7 @@
*/
-#include <svtools/asynclink.hxx>
+#include <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 a37cda3..6d4a100 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/svtools.hrc>
-#include <svtools/svtresid.hxx>
-#include <svtools/calendar.hxx>
+#include <svtools.hrc>
+#include <svtresid.hxx>
+#include <calendar.hxx>
// =======================================================================
diff --git a/svtools/source/control/collatorres.cxx
b/svtools/source/control/collatorres.cxx
index cc2d730..4255bff 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -18,9 +18,9 @@
*/
-#include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
-#include <svtools/collatorres.hxx>
+#include <svtresid.hxx>
+#include <svtools.hrc>
+#include <collatorres.hxx>
// -------------------------------------------------------------------------
//
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index ea04ac8..5cfd358 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 <svtools/sampletext.hxx>
-#include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
-#include <svtools/ctrlbox.hxx>
-#include <svtools/ctrltool.hxx>
-#include <svtools/borderhelper.hxx>
+#include <sampletext.hxx>
+#include <svtresid.hxx>
+#include <svtools.hrc>
+#include <ctrlbox.hxx>
+#include <ctrltool.hxx>
+#include <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 a4f2dcf..a6f0298 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/svtools.hrc>
-#include <svtools/svtresid.hxx>
-#include <svtools/ctrltool.hxx>
+#include <svtools.hrc>
+#include <svtresid.hxx>
+#include <ctrltool.hxx>
// =======================================================================
diff --git a/svtools/source/control/filectrl.cxx
b/svtools/source/control/filectrl.cxx
index f605f8a..6d82f3e 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 <svtools/svtresid.hxx>
-#include <svtools/filectrl.hxx>
+#include <svtresid.hxx>
+#include <filectrl.hxx>
#include <filectrl.hrc>
// =======================================================================
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
