10 files changed, 14 insertions, 144 deletions
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 2f25a8f2f9b2..3ccf83a224f8 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -28,12 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include "svtools/genericunodialog.hxx"
-#ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_
-#include "addresstemplate.hxx"
-#endif
-#ifndef _CPPUHELPER_EXTRACT_HXX_
+#include <svtools/addresstemplate.hxx>
 #include <cppuhelper/extract.hxx>
-#endif
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/property.hxx>
 #include <com/sun/star/sdbc/XDataSource.hpp>
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index 9eb36cf18a45..5b7d7c709509 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "contextmenuhelper.hxx"
+#include <svtools/contextmenuhelper.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/miscopt.hxx>
 
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 20176160b396..f7a0540f6eb4 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include <framestatuslistener.hxx>
+#include <svtools/framestatuslistener.hxx>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <vos/mutex.hxx>
diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
deleted file mode 100644
index 7c1c44006047..000000000000
--- a/svtools/source/uno/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=unoiface
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/addrtempuno.obj \
-            $(SLO)$/contextmenuhelper.obj \
-            $(SLO)$/framestatuslistener.obj \
-            $(SLO)$/generictoolboxcontroller.obj \
-            $(SLO)$/genericunodialog.obj \
-            $(SLO)$/miscservices.obj\
-            $(SLO)$/statusbarcontroller.obj \
-            $(SLO)$/toolboxcontroller.obj \
-            $(SLO)$/treecontrolpeer.obj \
-            $(SLO)$/unocontroltablemodel.obj \
-            $(SLO)$/unoevent.obj \
-            $(SLO)$/unoiface.obj \
-            $(SLO)$/unoimap.obj \
-            $(SLO)$/svtxgridcontrol.obj \
-            $(SLO)$/popupwindowcontroller.obj \
-            $(SLO)$/popupmenucontrollerbase.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 14b802a1bf90..8dde75dc7fc3 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include <statusbarcontroller.hxx>
+#include <svtools/statusbarcontroller.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -37,11 +37,9 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
-#include <imgdef.hxx>
+#include <svtools/imgdef.hxx>
 #include <svtools/miscopt.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 
 using namespace ::cppu;
 using namespace ::com::sun::star::awt;
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index bdb2256a07e8..9e4c522dc8c4 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -35,12 +35,9 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <imgdef.hxx>
+#include <svtools/imgdef.hxx>
 #include <svtools/miscopt.hxx>
-
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <vcl/toolbox.hxx>
 //shizhobo
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 526cdbb5d03a..0f8bc91d9927 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -28,15 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
 #include <rtl/ustrbuf.hxx>
-
-
 #include <tools/rtti.hxx>
 #include <tools/solar.h>
-#include "unoevent.hxx"
+#include <svtools/unoevent.hxx>
 #include <svl/macitem.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 2d22d9cedb33..9ff37fbc2af4 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -31,12 +31,11 @@
 #define _SVT_UNOIFACE_CXX
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
-
 #include <svtools/svmedit.hxx>
 #include <unoiface.hxx>
-#include "filedlg.hxx"
-#include "filectrl.hxx"
-#include "roadmap.hxx"
+#include <svtools/filedlg.hxx>
+#include <svtools/filectrl.hxx>
+#include <svtools/roadmap.hxx>
 #include <svtools/fixedhyper.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -46,9 +45,8 @@
 #include <toolkit/helper/property.hxx>
 #include <svtools/fmtfield.hxx>
 #include <svl/numuno.hxx>
-#include <calendar.hxx>
-#include <prgsbar.hxx>
-
+#include <svtools/calendar.hxx>
+#include <svtools/prgsbar.hxx>
 #include <svtools/svtreebx.hxx>
 #include "treecontrolpeer.hxx"
 #include "svtxgridcontrol.hxx"
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 88f22f0c8402..97482ed9d540 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -36,23 +36,17 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
-
-#ifndef _COMPHELPER_SERVICEHELPER_HXX_
 #include <comphelper/servicehelper.hxx>
-#endif
 #include <comphelper/propertysethelper.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <cppuhelper/weakagg.hxx>
-
 #include <cppuhelper/implbase3.hxx>
-
 #include <list>
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-
-#include "unoevent.hxx"
-#include "unoimap.hxx"
+#include <svtools/unoevent.hxx>
+#include <svtools/unoimap.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imaprect.hxx>
diff --git a/svtools/source/uno/wizard/makefile.mk b/svtools/source/uno/wizard/makefile.mk
deleted file mode 100644
index 521496fc5d48..000000000000
--- a/svtools/source/uno/wizard/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../../..
-
-PRJNAME=svtools
-TARGET=unowiz
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/unowizard.obj \
-    $(SLO)$/wizardshell.obj \
-    $(SLO)$/wizardpagecontroller.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk