[Libreoffice-commits] core.git: desktop/inc desktop/qa desktop/source desktop/test desktop/unx desktop/win32
Thomas Arnhold
thomas at arnhold.org
Wed Jun 4 01:59:59 PDT 2014
desktop/inc/liblibreoffice.hxx | 2
desktop/qa/deployment_misc/test_dp_version.cxx | 4
desktop/source/app/app.cxx | 4
desktop/source/app/check_ext_deps.cxx | 22 -
desktop/source/app/cmdlineargs.cxx | 6
desktop/source/app/cmdlineargs.hxx | 6
desktop/source/app/configinit.hxx | 2
desktop/source/app/dispatchwatcher.cxx | 4
desktop/source/app/langselect.cxx | 34 +-
desktop/source/app/langselect.hxx | 4
desktop/source/app/lockfile2.cxx | 4
desktop/source/app/main.c | 2
desktop/source/app/officeipcthread.cxx | 2
desktop/source/app/officeipcthread.hxx | 4
desktop/source/app/sofficemain.cxx | 2
desktop/source/app/userinstall.cxx | 18 -
desktop/source/app/userinstall.hxx | 2
desktop/source/deployment/dp_log.cxx | 22 -
desktop/source/deployment/dp_persmap.cxx | 2
desktop/source/deployment/dp_services.cxx | 2
desktop/source/deployment/dp_xml.cxx | 6
desktop/source/deployment/gui/dp_gui.h | 26 -
desktop/source/deployment/gui/dp_gui_dependencydialog.cxx | 8
desktop/source/deployment/gui/dp_gui_dependencydialog.hxx | 12
desktop/source/deployment/gui/dp_gui_dependencydialog.src | 2
desktop/source/deployment/gui/dp_gui_dialog.src | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 54 +--
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 34 +-
desktop/source/deployment/gui/dp_gui_dialog2.src | 2
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 86 ++---
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx | 6
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 12
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 26 -
desktop/source/deployment/gui/dp_gui_service.cxx | 22 -
desktop/source/deployment/gui/dp_gui_shared.hxx | 4
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 12
desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 18 -
desktop/source/deployment/gui/dp_gui_updatedata.hxx | 6
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 146 +++++-----
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 16 -
desktop/source/deployment/gui/dp_gui_updatedialog.src | 2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 76 ++---
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 14
desktop/source/deployment/gui/license_dialog.cxx | 30 +-
desktop/source/deployment/gui/license_dialog.hxx | 8
desktop/source/deployment/inc/dp_dependencies.hxx | 6
desktop/source/deployment/inc/dp_descriptioninfoset.hxx | 10
desktop/source/deployment/inc/dp_identifier.hxx | 6
desktop/source/deployment/inc/dp_interact.h | 10
desktop/source/deployment/inc/dp_misc.h | 20 -
desktop/source/deployment/inc/dp_misc_api.hxx | 4
desktop/source/deployment/inc/dp_platform.hxx | 4
desktop/source/deployment/inc/dp_resource.h | 2
desktop/source/deployment/inc/dp_ucb.h | 10
desktop/source/deployment/inc/dp_update.hxx | 12
desktop/source/deployment/inc/dp_version.hxx | 4
desktop/source/deployment/inc/dp_xml.h | 12
desktop/source/deployment/inc/lockfile.hxx | 6
desktop/source/deployment/manager/dp_activepackages.cxx | 16 -
desktop/source/deployment/manager/dp_activepackages.hxx | 2
desktop/source/deployment/manager/dp_commandenvironments.cxx | 20 -
desktop/source/deployment/manager/dp_commandenvironments.hxx | 6
desktop/source/deployment/manager/dp_extensionmanager.cxx | 48 +--
desktop/source/deployment/manager/dp_extensionmanager.hxx | 12
desktop/source/deployment/manager/dp_informationprovider.cxx | 36 +-
desktop/source/deployment/manager/dp_manager.cxx | 60 ++--
desktop/source/deployment/manager/dp_manager.h | 12
desktop/source/deployment/manager/dp_managerfac.cxx | 6
desktop/source/deployment/manager/dp_properties.cxx | 10
desktop/source/deployment/manager/dp_properties.hxx | 6
desktop/source/deployment/misc/dp_dependencies.cxx | 26 -
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 68 ++--
desktop/source/deployment/misc/dp_identifier.cxx | 20 -
desktop/source/deployment/misc/dp_interact.cxx | 6
desktop/source/deployment/misc/dp_misc.cxx | 38 +-
desktop/source/deployment/misc/dp_platform.cxx | 8
desktop/source/deployment/misc/dp_resource.cxx | 10
desktop/source/deployment/misc/dp_ucb.cxx | 18 -
desktop/source/deployment/misc/dp_update.cxx | 2
desktop/source/deployment/misc/dp_version.cxx | 6
desktop/source/deployment/registry/component/dp_compbackenddb.cxx | 12
desktop/source/deployment/registry/component/dp_compbackenddb.hxx | 4
desktop/source/deployment/registry/component/dp_component.cxx | 40 +-
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 32 +-
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx | 12
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx | 6
desktop/source/deployment/registry/dp_backend.cxx | 36 +-
desktop/source/deployment/registry/dp_backenddb.cxx | 24 -
desktop/source/deployment/registry/dp_registry.cxx | 32 +-
desktop/source/deployment/registry/executable/dp_executable.cxx | 12
desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx | 4
desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx | 2
desktop/source/deployment/registry/help/dp_help.cxx | 18 -
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx | 12
desktop/source/deployment/registry/help/dp_helpbackenddb.hxx | 4
desktop/source/deployment/registry/inc/dp_backend.h | 20 -
desktop/source/deployment/registry/inc/dp_backenddb.hxx | 2
desktop/source/deployment/registry/package/dp_extbackenddb.cxx | 10
desktop/source/deployment/registry/package/dp_extbackenddb.hxx | 2
desktop/source/deployment/registry/package/dp_package.cxx | 72 ++--
desktop/source/deployment/registry/script/dp_lib_container.cxx | 10
desktop/source/deployment/registry/script/dp_script.cxx | 16 -
desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx | 10
desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx | 4
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 10
desktop/source/migration/migration.cxx | 2
desktop/source/migration/services/cexports.cxx | 2
desktop/source/migration/services/cexportsoo3.cxx | 2
desktop/source/migration/services/jvmfwk.cxx | 42 +-
desktop/source/migration/services/jvmfwk.hxx | 20 -
desktop/source/offacc/acceptor.cxx | 2
desktop/source/offacc/acceptor.hxx | 2
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 38 +-
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 32 +-
desktop/source/pkgchk/unopkg/unopkg_main.c | 2
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 30 +-
desktop/source/pkgchk/unopkg/unopkg_shared.h | 14
desktop/source/splash/services_spl.cxx | 8
desktop/source/splash/splash.hxx | 8
desktop/test/deployment/active/active_native.cxx | 70 ++--
desktop/test/deployment/passive/passive_native.cxx | 64 ++--
desktop/unx/source/splashx.c | 2
desktop/win32/source/extendloaderenvironment.cxx | 4
desktop/win32/source/extendloaderenvironment.hxx | 2
desktop/win32/source/guiloader/genericloader.cxx | 2
desktop/win32/source/officeloader/officeloader.cxx | 2
desktop/win32/source/unoinfo.cxx | 2
127 files changed, 1039 insertions(+), 1039 deletions(-)
New commits:
commit b3843321e9cc1436cd0039f9431b4d6c5261db20
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jun 4 10:55:43 2014 +0200
desktop: fix includes
Change-Id: Ia51cd6fcdb84c049907b0aeda20774558198b575
diff --git a/desktop/inc/liblibreoffice.hxx b/desktop/inc/liblibreoffice.hxx
index 3afdc4b..182e88f 100644
--- a/desktop/inc/liblibreoffice.hxx
+++ b/desktop/inc/liblibreoffice.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_HXX
#define INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_HXX
-#include <liblibreoffice.h>
+#include "liblibreoffice.h"
/*
* The reasons this C++ code is not as pretty as it could be are:
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index 124e831..5cc24e7 100644
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -24,8 +24,8 @@
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
#include "../../source/deployment/inc/dp_version.hxx"
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 065fb40..dccdecc 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -20,7 +20,7 @@
#include <config_features.h>
#include <config_folders.h>
-#include "sal/config.h"
+#include <sal/config.h>
#include <iostream>
@@ -54,7 +54,7 @@
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/view/XPrintable.hpp>
#include <com/sun/star/awt/XTopWindow.hpp>
-#include "com/sun/star/util/URLTransformer.hpp"
+#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 4bdde01..e32bb13 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -19,18 +19,18 @@
#include <config_folders.h>
-#include "osl/file.hxx"
-#include "osl/mutex.hxx"
+#include <osl/file.hxx>
+#include <osl/mutex.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/ustring.hxx>
-#include "cppuhelper/compbase3.hxx"
+#include <cppuhelper/compbase3.hxx>
-#include "vcl/wrkwin.hxx"
-#include "vcl/timer.hxx"
+#include <vcl/wrkwin.hxx>
+#include <vcl/timer.hxx>
#include <unotools/configmgr.hxx>
-#include "toolkit/helper/vclunohelper.hxx"
+#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
@@ -39,16 +39,16 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/deployment/ExtensionManager.hpp"
-#include "com/sun/star/deployment/LicenseException.hpp"
-#include "com/sun/star/deployment/ui/LicenseDialog.hpp"
+#include <com/sun/star/deployment/XPackage.hpp>
+#include <com/sun/star/deployment/ExtensionManager.hpp>
+#include <com/sun/star/deployment/LicenseException.hpp>
+#include <com/sun/star/deployment/ui/LicenseDialog.hpp>
#include <com/sun/star/task/OfficeRestartManager.hpp>
#include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/task/XInteractionApprove.hpp>
#include <com/sun/star/task/XInteractionAbort.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
+#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
#include "app.hxx"
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index ed8d995..7b8726a4 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -25,14 +25,14 @@
#include <postmac.h>
#endif
-#include <cmdlineargs.hxx>
+#include "cmdlineargs.hxx"
#include <vcl/svapp.hxx>
#include <rtl/uri.hxx>
#include <rtl/ustring.hxx>
-#include "rtl/process.h"
+#include <rtl/process.h>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
-#include "tools/getprocessworkingdir.hxx"
+#include <tools/getprocessworkingdir.hxx>
#include <svl/documentlockfile.hxx>
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index d2a503e..f7d13fe 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -20,13 +20,13 @@
#ifndef INCLUDED_DESKTOP_SOURCE_APP_CMDLINEARGS_HXX
#define INCLUDED_DESKTOP_SOURCE_APP_CMDLINEARGS_HXX
-#include "sal/config.h"
+#include <sal/config.h>
#include <vector>
#include <rtl/ustring.hxx>
-#include "boost/noncopyable.hpp"
-#include "boost/optional.hpp"
+#include <boost/noncopyable.hpp>
+#include <boost/optional.hpp>
namespace desktop
{
diff --git a/desktop/source/app/configinit.hxx b/desktop/source/app/configinit.hxx
index eaaa6d1..c026c49 100644
--- a/desktop/source/app/configinit.hxx
+++ b/desktop/source/app/configinit.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DESKTOP_SOURCE_APP_CONFIGINIT_HXX
#define INCLUDED_DESKTOP_SOURCE_APP_CONFIGINIT_HXX
-#include "sal/config.h"
+#include <sal/config.h>
#include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index abdbe38..0a6145e 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -21,8 +21,8 @@
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
-#include "osl/file.hxx"
-#include "sfx2/app.hxx"
+#include <osl/file.hxx>
+#include <sfx2/app.hxx>
#include <svl/fstathelper.hxx>
#include "app.hxx"
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 21228f8..c853c60 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -17,27 +17,27 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "sal/config.h"
+#include <sal/config.h>
-#include "boost/shared_ptr.hpp"
-#include "com/sun/star/configuration/theDefaultProvider.hpp"
-#include "com/sun/star/container/XNameAccess.hpp"
-#include "com/sun/star/lang/XLocalizable.hpp"
-#include "com/sun/star/uno/Exception.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "comphelper/configuration.hxx"
-#include "comphelper/processfactory.hxx"
-#include "i18nlangtag/lang.h"
-#include "i18nlangtag/languagetag.hxx"
-#include "i18nlangtag/mslangid.hxx"
+#include <boost/shared_ptr.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/lang/XLocalizable.hpp>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <comphelper/configuration.hxx>
+#include <comphelper/processfactory.hxx>
+#include <i18nlangtag/lang.h>
+#include <i18nlangtag/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
#include "officecfg/Office/Linguistic.hxx"
#include "officecfg/Setup.hxx"
#include "officecfg/System.hxx"
-#include "rtl/ustring.hxx"
-#include "sal/log.hxx"
-#include "sal/types.h"
-#include "svl/languageoptions.hxx"
+#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
+#include <sal/types.h>
+#include <svl/languageoptions.hxx>
#include "app.hxx"
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 517e49f..84e701e 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_DESKTOP_SOURCE_APP_LANGSELECT_HXX
#define INCLUDED_DESKTOP_SOURCE_APP_LANGSELECT_HXX
-#include "sal/config.h"
+#include <sal/config.h>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
namespace desktop { namespace langselect {
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index ac0ef23..39cdce0 100644
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
@@ -18,10 +18,10 @@
*/
-#include "vcl/msgbox.hxx"
+#include <vcl/msgbox.hxx>
#include "desktopresid.hxx"
#include "desktop.hrc"
-#include "tools/config.hxx"
+#include <tools/config.hxx>
#include "lockfile.hxx"
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
index e358a38..643c42a 100644
--- a/desktop/source/app/main.c
+++ b/desktop/source/app/main.c
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "sal/main.h"
+#include <sal/main.h>
#include "sofficemain.h"
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 4702f85..aed17b9 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -42,7 +42,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <osl/file.hxx>
#include <rtl/process.h>
-#include "tools/getprocessworkingdir.hxx"
+#include <tools/getprocessworkingdir.hxx>
#include <boost/scoped_array.hpp>
using namespace desktop;
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 1015366..4628eca 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DESKTOP_SOURCE_APP_OFFICEIPCTHREAD_HXX
#define INCLUDED_DESKTOP_SOURCE_APP_OFFICEIPCTHREAD_HXX
-#include "sal/config.h"
+#include <sal/config.h>
#include <vector>
@@ -34,7 +34,7 @@
#include <cppuhelper/implbase2.hxx>
#include <osl/conditn.hxx>
#include <salhelper/thread.hxx>
-#include "boost/optional.hpp"
+#include <boost/optional.hpp>
namespace desktop
{
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 7678e5b..f94de28 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "sal/config.h"
+#include <sal/config.h>
#include "desktopdllapi.h"
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 7780064..ef0b0a1 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -17,20 +17,20 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "sal/config.h"
+#include <sal/config.h>
#include <cassert>
-#include "boost/shared_ptr.hpp"
-#include "com/sun/star/uno/Exception.hpp"
-#include "comphelper/configuration.hxx"
+#include <boost/shared_ptr.hpp>
+#include <com/sun/star/uno/Exception.hpp>
+#include <comphelper/configuration.hxx>
#include "config_folders.h"
#include "officecfg/Setup.hxx"
-#include "osl/file.h"
-#include "osl/file.hxx"
-#include "rtl/ustring.hxx"
-#include "sal/log.hxx"
-#include "unotools/bootstrap.hxx"
+#include <osl/file.h>
+#include <osl/file.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
+#include <unotools/bootstrap.hxx>
#include "userinstall.hxx"
diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx
index 38e8021..dd3876c 100644
--- a/desktop/source/app/userinstall.hxx
+++ b/desktop/source/app/userinstall.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DESKTOP_SOURCE_APP_USERINSTALL_HXX
#define INCLUDED_DESKTOP_SOURCE_APP_USERINSTALL_HXX
-#include "sal/config.h"
+#include <sal/config.h>
namespace desktop { namespace userinstall {
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 3c14c16..babba4b 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -19,17 +19,17 @@
#include "dp_misc.h"
-#include "rtl/strbuf.hxx"
-#include "osl/time.h"
-#include "osl/thread.h"
-#include "cppuhelper/compbase1.hxx"
-#include "comphelper/anytostring.hxx"
-#include "comphelper/servicedecl.hxx"
-#include "comphelper/unwrapargs.hxx"
-#include "com/sun/star/deployment/DeploymentException.hpp"
-#include "com/sun/star/ucb/XProgressHandler.hpp"
-#include "com/sun/star/ucb/SimpleFileAccess.hpp"
-#include "com/sun/star/io/XSeekable.hpp"
+#include <rtl/strbuf.hxx>
+#include <osl/time.h>
+#include <osl/thread.h>
+#include <cppuhelper/compbase1.hxx>
+#include <comphelper/anytostring.hxx>
+#include <comphelper/servicedecl.hxx>
+#include <comphelper/unwrapargs.hxx>
+#include <com/sun/star/deployment/DeploymentException.hpp>
+#include <com/sun/star/ucb/XProgressHandler.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
#include <stdio.h>
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 850bdb3..d9b7b64 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -19,7 +19,7 @@
#include "dp_misc.h"
#include "dp_persmap.h"
-#include "rtl/strbuf.hxx"
+#include <rtl/strbuf.hxx>
#ifndef DISABLE_BDB2PMAP
# include <vector>
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index 3a5c514..9850e41 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -19,7 +19,7 @@
#define COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS 12
-#include "comphelper/servicedecl.hxx"
+#include <comphelper/servicedecl.hxx>
using namespace com::sun::star;
namespace sdecl = comphelper::service_decl;
diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index 8b4e13d..72a5a8e 100644
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
@@ -20,9 +20,9 @@
#include "dp_misc.h"
#include "dp_xml.h"
-#include "rtl/ustrbuf.hxx"
-#include "ucbhelper/content.hxx"
-#include "com/sun/star/xml/sax/Parser.hpp"
+#include <rtl/ustrbuf.hxx>
+#include <ucbhelper/content.hxx>
+#include <com/sun/star/xml/sax/Parser.hpp>
using namespace ::com::sun::star;
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 18b9ea0..d93dd10 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -23,19 +23,19 @@
#include "dp_gui_updatedata.hxx"
#include "dp_misc.h"
#include "dp_gui.hrc"
-#include "rtl/ref.hxx"
-#include "rtl/instance.hxx"
-#include "osl/thread.hxx"
-#include "cppuhelper/implbase2.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/button.hxx"
-#include "vcl/fixed.hxx"
-#include "salhelper/simplereferenceobject.hxx"
-#include "svtools/svtabbx.hxx"
-#include "svtools/headbar.hxx"
-#include "com/sun/star/ucb/XContentEventListener.hpp"
-#include "osl/mutex.hxx"
+#include <rtl/ref.hxx>
+#include <rtl/instance.hxx>
+#include <osl/thread.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <salhelper/simplereferenceobject.hxx>
+#include <svtools/svtabbx.hxx>
+#include <svtools/headbar.hxx>
+#include <com/sun/star/ucb/XContentEventListener.hpp>
+#include <osl/mutex.hxx>
namespace com { namespace sun { namespace star {
namespace container {
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 531940c..63e72c3 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -18,14 +18,14 @@
*/
-#include "sal/config.h"
+#include <sal/config.h>
#include <algorithm>
#include <vector>
-#include "rtl/ustring.hxx"
-#include "tools/resid.hxx"
-#include "vcl/dialog.hxx"
+#include <rtl/ustring.hxx>
+#include <tools/resid.hxx>
+#include <vcl/dialog.hxx>
#include "dp_gui.hrc"
#include "dp_gui_dependencydialog.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index 5fbf6bf..cab93b7 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -20,14 +20,14 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DEPENDENCYDIALOG_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DEPENDENCYDIALOG_HXX
-#include "sal/config.h"
+#include <sal/config.h>
#include <vector>
-#include "tools/gen.hxx"
-#include "vcl/button.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/lstbox.hxx"
+#include <tools/gen.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/lstbox.hxx>
class Window;
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
index aeba0c9..1239388 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "svtools/controldims.hrc"
+#include <svtools/controldims.hrc>
#include "dp_gui.hrc"
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index 9e5a028..3dc90cd 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "svtools/controldims.hrc"
+#include <svtools/controldims.hrc>
#include "dp_gui.hrc"
String RID_STR_ADD_PACKAGES
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 4b26288..5b9cb7b 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -18,8 +18,8 @@
*/
#include "dp_gui.hrc"
-#include "svtools/controldims.hrc"
-#include "svtools/svtools.hrc"
+#include <svtools/controldims.hrc>
+#include <svtools/svtools.hrc>
#include "dp_gui.h"
#include "dp_gui_dialog2.hxx"
@@ -33,41 +33,41 @@
#include "dp_identifier.hxx"
#include "dp_descriptioninfoset.hxx"
-#include "vcl/ctrl.hxx"
-#include "vcl/menu.hxx"
-#include "vcl/msgbox.hxx"
-#include "vcl/scrbar.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/ctrl.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/scrbar.hxx>
+#include <vcl/svapp.hxx>
-#include "osl/mutex.hxx"
+#include <osl/mutex.hxx>
-#include "svtools/extensionlistbox.hxx"
+#include <svtools/extensionlistbox.hxx>
-#include "sfx2/sfxdlg.hxx"
+#include <sfx2/sfxdlg.hxx>
-#include "comphelper/anytostring.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "cppuhelper/bootstrap.hxx"
+#include <comphelper/anytostring.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/bootstrap.hxx>
-#include "comphelper/processfactory.hxx"
-#include "ucbhelper/content.hxx"
-#include "unotools/collatorwrapper.hxx"
-#include "unotools/configmgr.hxx"
+#include <comphelper/processfactory.hxx>
+#include <ucbhelper/content.hxx>
+#include <unotools/collatorwrapper.hxx>
+#include <unotools/configmgr.hxx>
-#include "com/sun/star/beans/StringPair.hpp"
+#include <com/sun/star/beans/StringPair.hpp>
-#include "com/sun/star/i18n/CollatorOptions.hpp"
+#include <com/sun/star/i18n/CollatorOptions.hpp>
-#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/SystemShellExecute.hpp"
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
-#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#include "com/sun/star/ui/dialogs/FilePicker.hpp"
-#include "com/sun/star/ui/dialogs/XFilterManager.hpp"
+#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/ui/dialogs/FilePicker.hpp>
+#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <map>
#include <vector>
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 99dd0db..35af003 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -20,28 +20,28 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX
-#include "vcl/dialog.hxx"
-#include "vcl/button.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/fixedhyper.hxx"
-#include "vcl/prgsbar.hxx"
-#include "vcl/timer.hxx"
+#include <vcl/dialog.hxx>
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/fixedhyper.hxx>
+#include <vcl/prgsbar.hxx>
+#include <vcl/timer.hxx>
-#include "svtools/svmedit.hxx"
+#include <svtools/svmedit.hxx>
-#include "osl/conditn.hxx"
-#include "osl/mutex.hxx"
+#include <osl/conditn.hxx>
+#include <osl/mutex.hxx>
-#include "rtl/ref.hxx"
-#include "rtl/ustring.hxx"
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase1.hxx>
-#include "com/sun/star/awt/XWindow.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
-#include "com/sun/star/util/XModifyListener.hpp"
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/deployment/XPackage.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
namespace dp_gui {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index 06366b1..b4978ef 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "svtools/controldims.hrc"
+#include <svtools/controldims.hrc>
#include "dp_gui.hrc"
ModalDialog RID_DLG_UPDATE_REQUIRED
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 6808f99..147b5b6 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -17,52 +17,52 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "sal/config.h"
+#include <sal/config.h>
#include <cstddef>
-#include "com/sun/star/beans/NamedValue.hpp"
-
-#include "com/sun/star/deployment/DependencyException.hpp"
-#include "com/sun/star/deployment/LicenseException.hpp"
-#include "com/sun/star/deployment/VersionException.hpp"
-#include "com/sun/star/deployment/InstallException.hpp"
-#include "com/sun/star/deployment/PlatformException.hpp"
-
-#include "com/sun/star/deployment/ui/LicenseDialog.hpp"
-#include "com/sun/star/deployment/DeploymentException.hpp"
-#include "com/sun/star/deployment/UpdateInformationProvider.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
-
-#include "com/sun/star/task/InteractionHandler.hpp"
-#include "com/sun/star/task/XAbortChannel.hpp"
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-
-#include "com/sun/star/ucb/CommandAbortedException.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-
-#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
-
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "com/sun/star/uno/TypeClass.hpp"
-#include "osl/diagnose.h"
-#include "osl/mutex.hxx"
-#include "rtl/ref.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "salhelper/thread.hxx"
-#include "ucbhelper/content.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "cppuhelper/implbase3.hxx"
-#include "comphelper/anytostring.hxx"
-#include "vcl/msgbox.hxx"
-#include "toolkit/helper/vclunohelper.hxx"
+#include <com/sun/star/beans/NamedValue.hpp>
+
+#include <com/sun/star/deployment/DependencyException.hpp>
+#include <com/sun/star/deployment/LicenseException.hpp>
+#include <com/sun/star/deployment/VersionException.hpp>
+#include <com/sun/star/deployment/InstallException.hpp>
+#include <com/sun/star/deployment/PlatformException.hpp>
+
+#include <com/sun/star/deployment/ui/LicenseDialog.hpp>
+#include <com/sun/star/deployment/DeploymentException.hpp>
+#include <com/sun/star/deployment/UpdateInformationProvider.hpp>
+#include <com/sun/star/deployment/XPackage.hpp>
+
+#include <com/sun/star/task/InteractionHandler.hpp>
+#include <com/sun/star/task/XAbortChannel.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+
+#include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <com/sun/star/ucb/CommandFailedException.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+
+#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/TypeClass.hpp>
+#include <osl/diagnose.h>
+#include <osl/mutex.hxx>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <salhelper/thread.hxx>
+#include <ucbhelper/content.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <comphelper/anytostring.hxx>
+#include <vcl/msgbox.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include "dp_gui.h"
#include "dp_gui_extensioncmdqueue.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index a069f92..66c2d4d 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTENSIONCMDQUEUE_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTENSIONCMDQUEUE_HXX
-#include "sal/config.h"
+#include <sal/config.h>
-#include "com/sun/star/uno/Reference.hxx"
-#include "rtl/ref.hxx"
+#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ref.hxx>
#include <vector>
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 42ecca1..a67eb95 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "svtools/controldims.hrc"
+#include <svtools/controldims.hrc>
#include "dp_gui.h"
#include "dp_gui_extlistbox.hxx"
@@ -25,11 +25,11 @@
#include "dp_gui_dialog2.hxx"
#include "dp_dependencies.hxx"
-#include "comphelper/processfactory.hxx"
-#include "com/sun/star/i18n/CollatorOptions.hpp"
-#include "com/sun/star/deployment/DependencyException.hpp"
-#include "com/sun/star/deployment/DeploymentException.hpp"
-#include "cppuhelper/weakref.hxx"
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/i18n/CollatorOptions.hpp>
+#include <com/sun/star/deployment/DependencyException.hpp>
+#include <com/sun/star/deployment/DeploymentException.hpp>
+#include <cppuhelper/weakref.hxx>
#include <vcl/settings.hxx>
#define USER_PACKAGE_MANAGER "user"
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index de4fb06..509c08a 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -20,19 +20,19 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTLISTBOX_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTLISTBOX_HXX
-#include "rtl/ustring.hxx"
-#include "vcl/scrbar.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/fixedhyper.hxx"
-#include "vcl/dialog.hxx"
-
-#include "svtools/extensionlistbox.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "unotools/collatorwrapper.hxx"
-
-#include "com/sun/star/lang/Locale.hpp"
-#include "com/sun/star/lang/XEventListener.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
+#include <rtl/ustring.hxx>
+#include <vcl/scrbar.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/fixedhyper.hxx>
+#include <vcl/dialog.hxx>
+
+#include <svtools/extensionlistbox.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <unotools/collatorwrapper.hxx>
+
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/deployment/XPackage.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index c3c9b15..b60a4bf 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -21,19 +21,19 @@
#include "dp_gui_shared.hxx"
#include "dp_gui.h"
#include "dp_gui_theextmgr.hxx"
-#include "cppuhelper/implbase2.hxx"
-#include "cppuhelper/implementationentry.hxx"
-#include "unotools/configmgr.hxx"
-#include "comphelper/processfactory.hxx"
-#include "comphelper/servicedecl.hxx"
-#include "comphelper/unwrapargs.hxx"
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implementationentry.hxx>
+#include <unotools/configmgr.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/servicedecl.hxx>
+#include <comphelper/unwrapargs.hxx>
#include <i18nlangtag/languagetag.hxx>
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include "vcl/msgbox.hxx"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/task/XJobExecutor.hpp"
-#include "com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp"
+#include <vcl/msgbox.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/task/XJobExecutor.hpp>
+#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <boost/optional.hpp>
#include <boost/utility.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index 94aa5db..8d926c8 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX
-#include "rtl/instance.hxx"
-#include "tools/resmgr.hxx"
+#include <rtl/instance.hxx>
+#include <tools/resmgr.hxx>
namespace dp_gui {
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index bea8c67..218a997 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -17,16 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "vcl/svapp.hxx"
-#include "vcl/msgbox.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/msgbox.hxx>
-#include "osl/mutex.hxx"
+#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/configuration/theDefaultProvider.hpp"
-#include "com/sun/star/frame/Desktop.hpp"
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
#include "dp_gui_dialog2.hxx"
#include "dp_gui_extensioncmdqueue.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index c5c3d42..0d1352e 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -20,17 +20,17 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX
-#include "comphelper/sequence.hxx"
+#include <comphelper/sequence.hxx>
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase2.hxx>
-#include "com/sun/star/container/XNameAccess.hpp"
-#include "com/sun/star/deployment/XExtensionManager.hpp"
-#include "com/sun/star/deployment/ExtensionManager.hpp"
-#include "com/sun/star/frame/XDesktop2.hpp"
-#include "com/sun/star/frame/XTerminateListener.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/util/XModifyListener.hpp"
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/deployment/XExtensionManager.hpp>
+#include <com/sun/star/deployment/ExtensionManager.hpp>
+#include <com/sun/star/frame/XDesktop2.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
#include "dp_gui.h"
#include "dp_gui_dialog2.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 1e45094..c8ae7ab 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -19,9 +19,9 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDATA_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDATA_HXX
-#include "sal/config.h"
-#include "rtl/ustring.hxx"
-#include "com/sun/star/uno/Reference.hxx"
+#include <sal/config.h>
+#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <boost/shared_ptr.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 1586152..adcc165 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -18,7 +18,7 @@
*/
-#include "sal/config.h"
+#include <sal/config.h>
#include <cstddef>
#include <limits>
@@ -27,79 +27,79 @@
#include <vector>
-#include "boost/optional.hpp"
-#include "com/sun/star/awt/Rectangle.hpp"
-#include "com/sun/star/awt/WindowAttribute.hpp"
-#include "com/sun/star/awt/WindowClass.hpp"
-#include "com/sun/star/awt/WindowDescriptor.hpp"
-#include "com/sun/star/awt/Toolkit.hpp"
-#include "com/sun/star/awt/XWindow.hpp"
-#include "com/sun/star/awt/XWindowPeer.hpp"
-#include "com/sun/star/beans/NamedValue.hpp"
-#include "com/sun/star/beans/Optional.hpp"
-#include "com/sun/star/beans/PropertyValue.hpp"
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/configuration/theDefaultProvider.hpp"
-#include "com/sun/star/container/XNameAccess.hpp"
-#include "com/sun/star/container/XNameContainer.hpp"
-#include "com/sun/star/deployment/DeploymentException.hpp"
-#include "com/sun/star/deployment/UpdateInformationProvider.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/deployment/XExtensionManager.hpp"
-#include "com/sun/star/deployment/ExtensionManager.hpp"
-#include "com/sun/star/deployment/XUpdateInformationProvider.hpp"
-#include "com/sun/star/frame/Desktop.hpp"
-#include "com/sun/star/frame/XDispatch.hpp"
-#include "com/sun/star/frame/XDispatchProvider.hpp"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#include "com/sun/star/lang/XMultiComponentFactory.hpp"
-#include "com/sun/star/lang/XSingleServiceFactory.hpp"
-#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/SystemShellExecute.hpp"
-#include "com/sun/star/task/InteractionHandler.hpp"
-#include "com/sun/star/task/XAbortChannel.hpp"
-#include "com/sun/star/task/XJob.hpp"
-#include "com/sun/star/ucb/CommandAbortedException.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Exception.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "com/sun/star/util/URL.hpp"
-#include "com/sun/star/util/XChangesBatch.hpp"
-#include "com/sun/star/util/URLTransformer.hpp"
-#include "com/sun/star/util/XURLTransformer.hpp"
-#include "com/sun/star/xml/dom/XElement.hpp"
-#include "com/sun/star/xml/dom/XNode.hpp"
-#include "osl/diagnose.h"
-#include "rtl/ref.hxx"
-#include "rtl/string.h"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "salhelper/thread.hxx"
-#include "svtools/svlbitm.hxx"
-#include "svtools/treelistbox.hxx"
+#include <boost/optional.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/WindowAttribute.hpp>
+#include <com/sun/star/awt/WindowClass.hpp>
+#include <com/sun/star/awt/WindowDescriptor.hpp>
+#include <com/sun/star/awt/Toolkit.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/Optional.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/deployment/DeploymentException.hpp>
+#include <com/sun/star/deployment/UpdateInformationProvider.hpp>
+#include <com/sun/star/deployment/XPackage.hpp>
+#include <com/sun/star/deployment/XExtensionManager.hpp>
+#include <com/sun/star/deployment/ExtensionManager.hpp>
+#include <com/sun/star/deployment/XUpdateInformationProvider.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
+#include <com/sun/star/task/InteractionHandler.hpp>
+#include <com/sun/star/task/XAbortChannel.hpp>
+#include <com/sun/star/task/XJob.hpp>
+#include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <com/sun/star/ucb/CommandFailedException.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/XChangesBatch.hpp>
+#include <com/sun/star/util/URLTransformer.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/xml/dom/XElement.hpp>
+#include <com/sun/star/xml/dom/XNode.hpp>
+#include <osl/diagnose.h>
+#include <rtl/ref.hxx>
+#include <rtl/string.h>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <salhelper/thread.hxx>
+#include <svtools/svlbitm.hxx>
+#include <svtools/treelistbox.hxx>
#include <svtools/controldims.hrc>
-#include "svx/checklbx.hxx"
-#include "tools/gen.hxx"
-#include "tools/link.hxx"
-#include "tools/resid.hxx"
-#include "tools/solar.h"
-#include "unotools/configmgr.hxx"
-#include "vcl/button.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/image.hxx"
-#include "vcl/msgbox.hxx"
-#include "vcl/svapp.hxx"
-#include "osl/mutex.hxx"
-
-#include "comphelper/processfactory.hxx"
+#include <svx/checklbx.hxx>
+#include <tools/gen.hxx>
+#include <tools/link.hxx>
+#include <tools/resid.hxx>
+#include <tools/solar.h>
+#include <unotools/configmgr.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/image.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+#include <osl/mutex.hxx>
+
+#include <comphelper/processfactory.hxx>
#include "dp_dependencies.hxx"
#include "dp_descriptioninfoset.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 18a4f9a..adcc1895 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -20,16 +20,16 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDIALOG_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDIALOG_HXX
-#include "sal/config.h"
+#include <sal/config.h>
#include <vector>
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "rtl/ref.hxx"
-#include "rtl/ustring.hxx"
-#include "svtools/svlbitm.hxx"
-#include "svx/checklbx.hxx"
-#include "tools/link.hxx"
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <svtools/svlbitm.hxx>
+#include <svx/checklbx.hxx>
+#include <tools/link.hxx>
#include <vcl/layout.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index ff76550..aac2f88 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "svtools/controldims.hrc"
+#include <svtools/controldims.hrc>
#include "dp_gui.hrc"
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index a7bb5b1..1a2cef3 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -20,38 +20,38 @@
#include "dp_gui_updatedata.hxx"
-#include "sal/config.h"
-#include "osl/file.hxx"
-#include "osl/conditn.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "tools/resid.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/msgbox.hxx"
-#include "vcl/svapp.hxx"
-#include "osl/mutex.hxx"
-#include "cppuhelper/implbase3.hxx"
-
-#include "com/sun/star/beans/PropertyValue.hpp"
-#include "com/sun/star/beans/NamedValue.hpp"
-#include "com/sun/star/xml/dom/XElement.hpp"
-#include "com/sun/star/xml/dom/XNode.hpp"
-#include "com/sun/star/xml/dom/XNodeList.hpp"
-#include "com/sun/star/ucb/NameClash.hpp"
-#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/ucb/XProgressHandler.hpp"
-#include "com/sun/star/deployment/XExtensionManager.hpp"
-#include "com/sun/star/deployment/ExtensionManager.hpp"
-#include "com/sun/star/deployment/XUpdateInformationProvider.hpp"
-#include "com/sun/star/deployment/DependencyException.hpp"
-#include "com/sun/star/deployment/LicenseException.hpp"
-#include "com/sun/star/deployment/VersionException.hpp"
-#include "com/sun/star/deployment/ui/LicenseDialog.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
-#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
+#include <sal/config.h>
+#include <osl/file.hxx>
+#include <osl/conditn.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <tools/resid.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+#include <osl/mutex.hxx>
+#include <cppuhelper/implbase3.hxx>
+
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/xml/dom/XElement.hpp>
+#include <com/sun/star/xml/dom/XNode.hpp>
+#include <com/sun/star/xml/dom/XNodeList.hpp>
+#include <com/sun/star/ucb/NameClash.hpp>
+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/ucb/XProgressHandler.hpp>
+#include <com/sun/star/deployment/XExtensionManager.hpp>
+#include <com/sun/star/deployment/ExtensionManager.hpp>
+#include <com/sun/star/deployment/XUpdateInformationProvider.hpp>
+#include <com/sun/star/deployment/DependencyException.hpp>
+#include <com/sun/star/deployment/LicenseException.hpp>
+#include <com/sun/star/deployment/VersionException.hpp>
+#include <com/sun/star/deployment/ui/LicenseDialog.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
#include "dp_descriptioninfoset.hxx"
#include "dp_gui.hrc"
@@ -61,12 +61,12 @@
#include "dp_misc.h"
#include "dp_version.hxx"
#include "dp_gui_extensioncmdqueue.hxx"
-#include "ucbhelper/content.hxx"
-#include "rtl/ref.hxx"
-#include "salhelper/thread.hxx"
-#include "com/sun/star/uno/Sequence.h"
-#include "comphelper/anytostring.hxx"
-#include "toolkit/helper/vclunohelper.hxx"
+#include <ucbhelper/content.hxx>
+#include <rtl/ref.hxx>
+#include <salhelper/thread.hxx>
+#include <com/sun/star/uno/Sequence.h>
+#include <comphelper/anytostring.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <vector>
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index fb594cd..434b1a1 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -20,13 +20,13 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEINSTALLDIALOG_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEINSTALLDIALOG_HXX
-#include "sal/config.h"
-#include "vcl/button.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/prgsbar.hxx"
-#include "vcl/vclmedit.hxx"
-#include "rtl/ref.hxx"
+#include <sal/config.h>
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/prgsbar.hxx>
+#include <vcl/vclmedit.hxx>
+#include <rtl/ref.hxx>
#include <vector>
/// @HTML
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index b758daa..16a7dfb 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -18,25 +18,25 @@
*/
-#include "cppuhelper/implbase2.hxx"
-#include "cppuhelper/implementationentry.hxx"
-#include "unotools/configmgr.hxx"
-#include "comphelper/servicedecl.hxx"
-#include "comphelper/unwrapargs.hxx"
-#include "i18nlangtag/mslangid.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/msgbox.hxx"
-#include "toolkit/helper/vclunohelper.hxx"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "svtools/svmedit.hxx"
-#include "svl/lstner.hxx"
-#include "vcl/xtextedt.hxx"
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implementationentry.hxx>
+#include <unotools/configmgr.hxx>
+#include <comphelper/servicedecl.hxx>
+#include <comphelper/unwrapargs.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/msgbox.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <svtools/svmedit.hxx>
+#include <svl/lstner.hxx>
+#include <vcl/xtextedt.hxx>
#include <vcl/scrbar.hxx>
-#include "vcl/threadex.hxx"
+#include <vcl/threadex.hxx>
-#include "boost/bind.hpp"
+#include <boost/bind.hpp>
#include "dp_gui_shared.hxx"
#include "license_dialog.hxx"
#include "dp_gui.hrc"
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 68b50c6..bb67afea1 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -20,11 +20,11 @@
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_LICENSE_DIALOG_HXX
#include "dp_gui.h"
-#include "cppuhelper/implbase1.hxx"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include "boost/bind.hpp"
+#include <boost/bind.hpp>
namespace dp_gui {
diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx
index 06043ff..1d64f3b 100644
--- a/desktop/source/deployment/inc/dp_dependencies.hxx
+++ b/desktop/source/deployment/inc/dp_dependencies.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DEPENDENCIES_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DEPENDENCIES_HXX
-#include "sal/config.h"
+#include <sal/config.h>
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
#include "dp_misc_api.hxx"
/// @HTML
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index 8a25df8..a6a61df 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -20,12 +20,12 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DESCRIPTIONINFOSET_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DESCRIPTIONINFOSET_HXX
-#include "sal/config.h"
+#include <sal/config.h>
-#include "boost/optional.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "sal/types.h"
+#include <boost/optional.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <sal/types.h>
#include "dp_misc_api.hxx"
/// @HTML
diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx
index da76b1a..1da6bd2 100644
--- a/desktop/source/deployment/inc/dp_identifier.hxx
+++ b/desktop/source/deployment/inc/dp_identifier.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_IDENTIFIER_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_IDENTIFIER_HXX
-#include "sal/config.h"
+#include <sal/config.h>
-#include "boost/optional.hpp"
-#include "com/sun/star/uno/Reference.hxx"
+#include <boost/optional.hpp>
+#include <com/sun/star/uno/Reference.hxx>
#include "dp_misc_api.hxx"
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index e9aa7fa..bfe26d8 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -20,11 +20,11 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_INTERACT_H
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_INTERACT_H
-#include "rtl/ref.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/task/XAbortChannel.hpp"
+#include <rtl/ref.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/task/XAbortChannel.hpp>
#include "dp_misc_api.hxx"
namespace dp_misc
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index fc7aa8b..5a548af 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -20,16 +20,16 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_H
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_H
-#include "rtl/ustrbuf.hxx"
-#include "rtl/instance.hxx"
-#include "osl/mutex.hxx"
-#include "osl/process.h"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/lang/XComponent.hpp"
-#include "com/sun/star/lang/DisposedException.hpp"
-#include "com/sun/star/deployment/XPackageRegistry.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/awt/XWindow.hpp"
+#include <rtl/ustrbuf.hxx>
+#include <rtl/instance.hxx>
+#include <osl/mutex.hxx>
+#include <osl/process.h>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/deployment/XPackageRegistry.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
#include "dp_misc_api.hxx"
#define ARLEN(x) (sizeof (x) / sizeof *(x))
diff --git a/desktop/source/deployment/inc/dp_misc_api.hxx b/desktop/source/deployment/inc/dp_misc_api.hxx
index 9a21e1c..0f4d1b4 100644
--- a/desktop/source/deployment/inc/dp_misc_api.hxx
+++ b/desktop/source/deployment/inc/dp_misc_api.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_API_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_API_HXX
-#include "sal/config.h"
-#include "sal/types.h"
+#include <sal/config.h>
+#include <sal/types.h>
#if defined DESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION
#define DESKTOP_DEPLOYMENTMISC_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 8018e2f..0331d17 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -23,8 +23,8 @@
#include "dp_misc_api.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "rtl/ustring.hxx"
+#include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ustring.hxx>
namespace dp_misc
{
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index 622ba17..c6ecfcd 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H
-#include "tools/resid.hxx"
+#include <tools/resid.hxx>
#include <i18nlangtag/languagetag.hxx>
#include "dp_misc.h"
#include "dp_misc_api.hxx"
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index 3ef3eb6..2b26705 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -21,12 +21,12 @@
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UCB_H
#include <list>
-#include "rtl/byteseq.hxx"
-#include "rtl/instance.hxx"
-#include "com/sun/star/sdbc/XResultSet.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include <rtl/byteseq.hxx>
+#include <rtl/instance.hxx>
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include "dp_misc_api.hxx"
-#include "ucbhelper/content.hxx"
+#include <ucbhelper/content.hxx>
namespace ucbhelper
{
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx
index 726e087..e7ceef3 100644
--- a/desktop/source/deployment/inc/dp_update.hxx
+++ b/desktop/source/deployment/inc/dp_update.hxx
@@ -21,13 +21,13 @@
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UPDATE_HXX
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/deployment/XExtensionManager.hpp"
-#include "com/sun/star/deployment/XUpdateInformationProvider.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/xml/dom/XNode.hpp"
+#include <com/sun/star/deployment/XPackage.hpp>
+#include <com/sun/star/deployment/XExtensionManager.hpp>
+#include <com/sun/star/deployment/XUpdateInformationProvider.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/xml/dom/XNode.hpp>
-#include "rtl/ustrbuf.hxx"
+#include <rtl/ustrbuf.hxx>
#include "dp_misc_api.hxx"
#include <map>
diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx
index 9ca8651..50916b3 100644
--- a/desktop/source/deployment/inc/dp_version.hxx
+++ b/desktop/source/deployment/inc/dp_version.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_VERSION_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_VERSION_HXX
-#include "sal/config.h"
-#include "com/sun/star/uno/Reference.hxx"
+#include <sal/config.h>
+#include <com/sun/star/uno/Reference.hxx>
#include "dp_misc_api.hxx"
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index a5c96ec..5a78a8d 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -20,12 +20,12 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H
-#include "rtl/ref.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/xml/input/XRoot.hpp"
-#include "com/sun/star/xml/sax/XDocumentHandler.hpp"
+#include <rtl/ref.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/xml/input/XRoot.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
namespace ucbhelper
diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx
index 54950ed..e9e7cb5 100644
--- a/desktop/source/deployment/inc/lockfile.hxx
+++ b/desktop/source/deployment/inc/lockfile.hxx
@@ -35,9 +35,9 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_LOCKFILE_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_LOCKFILE_HXX
-#include "sal/types.h"
-#include "rtl/string.hxx"
-#include "rtl/ustring.hxx"
+#include <sal/types.h>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
#include "dp_misc_api.hxx"
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 99e3769..42f6b41 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -19,19 +19,19 @@
#include <config_features.h>
-#include "sal/config.h"
+#include <sal/config.h>
#include <cstddef>
#include <utility>
#include <vector>
-#include "osl/diagnose.h"
-#include "rtl/strbuf.hxx"
-#include "rtl/string.hxx"
-#include "rtl/textenc.h"
-#include "rtl/uri.h"
-#include "rtl/uri.hxx"
-#include "rtl/ustring.hxx"
+#include <osl/diagnose.h>
+#include <rtl/strbuf.hxx>
+#include <rtl/string.hxx>
+#include <rtl/textenc.h>
+#include <rtl/uri.h>
+#include <rtl/uri.hxx>
+#include <rtl/ustring.hxx>
#include <boost/unordered_map.hpp>
#include "dp_identifier.hxx"
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index d64a541..97dd57e 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -22,7 +22,7 @@
#include <config_features.h>
-#include "sal/config.h"
+#include <sal/config.h>
#include <utility>
#include <vector>
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 99e2522..8393890 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -18,16 +18,16 @@
*/
-#include "com/sun/star/deployment/VersionException.hpp"
-#include "com/sun/star/deployment/LicenseException.hpp"
-#include "com/sun/star/deployment/InstallException.hpp"
-#include "com/sun/star/deployment/DependencyException.hpp"
-#include "com/sun/star/deployment/PlatformException.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
+#include <com/sun/star/deployment/VersionException.hpp>
+#include <com/sun/star/deployment/LicenseException.hpp>
+#include <com/sun/star/deployment/InstallException.hpp>
+#include <com/sun/star/deployment/DependencyException.hpp>
+#include <com/sun/star/deployment/PlatformException.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include "dp_commandenvironments.hxx"
namespace deployment = com::sun::star::deployment;
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index ca75982..d51d161 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX
-#include "cppuhelper/compbase3.hxx"
-#include "ucbhelper/content.hxx"
-#include "com/sun/star/uno/Type.hxx"
+#include <cppuhelper/compbase3.hxx>
+#include <ucbhelper/content.hxx>
+#include <com/sun/star/uno/Type.hxx>
namespace dp_manager {
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 11120f2..8adba12 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -20,29 +20,29 @@
#include <cppuhelper/implbase1.hxx>
-#include "comphelper/servicedecl.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "rtl/bootstrap.hxx"
-#include "com/sun/star/deployment/ExtensionManager.hpp"
-#include "com/sun/star/deployment/XExtensionManager.hpp"
-#include "com/sun/star/deployment/thePackageManagerFactory.hpp"
-#include "com/sun/star/deployment/XPackageManager.hpp"
-#include "com/sun/star/deployment/XPackageManagerFactory.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/deployment/InstallException.hpp"
-#include "com/sun/star/deployment/VersionException.hpp"
-#include "com/sun/star/deployment/LicenseException.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/registry/XRegistryKey.hpp"
-#include "com/sun/star/beans/Optional.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-#include "com/sun/star/beans/Ambiguous.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/io/XInputStream.hpp"
-#include "com/sun/star/util/XModifyBroadcaster.hpp"
-#include "comphelper/sequence.hxx"
-#include "xmlscript/xml_helper.hxx"
-#include "osl/diagnose.h"
+#include <comphelper/servicedecl.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <rtl/bootstrap.hxx>
+#include <com/sun/star/deployment/ExtensionManager.hpp>
+#include <com/sun/star/deployment/XExtensionManager.hpp>
+#include <com/sun/star/deployment/thePackageManagerFactory.hpp>
+#include <com/sun/star/deployment/XPackageManager.hpp>
+#include <com/sun/star/deployment/XPackageManagerFactory.hpp>
+#include <com/sun/star/deployment/XPackage.hpp>
+#include <com/sun/star/deployment/InstallException.hpp>
+#include <com/sun/star/deployment/VersionException.hpp>
+#include <com/sun/star/deployment/LicenseException.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/beans/Optional.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/beans/Ambiguous.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <comphelper/sequence.hxx>
+#include <xmlscript/xml_helper.hxx>
+#include <osl/diagnose.h>
#include "dp_interact.h"
#include "dp_resource.h"
#include "dp_ucb.h"
@@ -51,7 +51,7 @@
#include "dp_extensionmanager.hxx"
#include "dp_commandenvironments.hxx"
#include "dp_properties.hxx"
-#include "boost/bind.hpp"
+#include <boost/bind.hpp>
#include <list>
#include <boost/unordered_map.hpp>
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 149c494..f905c25 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -24,12 +24,12 @@
#include "dp_misc.h"
#include "dp_interact.h"
#include "dp_activepackages.hxx"
-#include "rtl/ref.hxx"
-#include "cppuhelper/compbase1.hxx"
-#include "ucbhelper/content.hxx"
-#include "com/sun/star/deployment/XPackageRegistry.hpp"
-#include "com/sun/star/deployment/XPackageManager.hpp"
-#include "osl/mutex.hxx"
+#include <rtl/ref.hxx>
+#include <cppuhelper/compbase1.hxx>
+#include <ucbhelper/content.hxx>
+#include <com/sun/star/deployment/XPackageRegistry.hpp>
+#include <com/sun/star/deployment/XPackageManager.hpp>
+#include <osl/mutex.hxx>
#include <list>
#include <boost/unordered_map.hpp>
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 2a3b7cf..be1e782 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -18,24 +18,24 @@
*/
#include <cppuhelper/implbase3.hxx>
-#include "comphelper/servicedecl.hxx"
-
-#include "com/sun/star/deployment/UpdateInformationProvider.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/deployment/XPackageInformationProvider.hpp"
-#include "com/sun/star/deployment/ExtensionManager.hpp"
-#include "com/sun/star/deployment/XUpdateInformationProvider.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/registry/XRegistryKey.hpp"
-#include "com/sun/star/task/XAbortChannel.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/xml/dom/XElement.hpp"
-#include "com/sun/star/xml/dom/XNode.hpp"
-
-#include "com/sun/star/uno/Reference.hxx"
-#include "rtl/ustring.hxx"
-#include "ucbhelper/content.hxx"
+#include <comphelper/servicedecl.hxx>
+
+#include <com/sun/star/deployment/UpdateInformationProvider.hpp>
+#include <com/sun/star/deployment/XPackage.hpp>
+#include <com/sun/star/deployment/XPackageInformationProvider.hpp>
+#include <com/sun/star/deployment/ExtensionManager.hpp>
+#include <com/sun/star/deployment/XUpdateInformationProvider.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/task/XAbortChannel.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/xml/dom/XElement.hpp>
+#include <com/sun/star/xml/dom/XNode.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
+#include <ucbhelper/content.hxx>
#include "dp_dependencies.hxx"
#include "dp_descriptioninfoset.hxx"
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 04c07b2..ebd3693 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -25,36 +25,36 @@
#include "dp_platform.hxx"
#include "dp_manager.h"
#include "dp_identifier.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/string.hxx"
-#include "rtl/uri.hxx"
-#include "rtl/bootstrap.hxx"
-#include "osl/diagnose.h"
-#include "osl/file.hxx"
-#include "osl/security.hxx"
-#include "cppuhelper/weakref.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "cppuhelper/interfacecontainer.hxx"
-#include "comphelper/servicedecl.hxx"
-#include "comphelper/sequence.hxx"
-#include "xmlscript/xml_helper.hxx"
-#include "svl/inettype.hxx"
-#include "com/sun/star/lang/DisposedException.hpp"
-#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
-#include "com/sun/star/beans/UnknownPropertyException.hpp"
-#include "com/sun/star/util/XUpdatable.hpp"
-#include "com/sun/star/sdbc/XResultSet.hpp"
-#include "com/sun/star/sdbc/XRow.hpp"
-#include "com/sun/star/ucb/XContentAccess.hpp"
-#include "com/sun/star/ucb/NameClash.hpp"
-#include "com/sun/star/deployment/VersionException.hpp"
-#include "com/sun/star/deployment/InstallException.hpp"
-#include "com/sun/star/deployment/Prerequisites.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-#include "com/sun/star/ucb/UnsupportedCommandException.hpp"
-#include "boost/bind.hpp"
-#include "unotools/tempfile.hxx"
+#include <rtl/ustrbuf.hxx>
+#include <rtl/string.hxx>
+#include <rtl/uri.hxx>
+#include <rtl/bootstrap.hxx>
+#include <osl/diagnose.h>
+#include <osl/file.hxx>
+#include <osl/security.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/servicedecl.hxx>
+#include <comphelper/sequence.hxx>
+#include <xmlscript/xml_helper.hxx>
+#include <svl/inettype.hxx>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/beans/UnknownPropertyException.hpp>
+#include <com/sun/star/util/XUpdatable.hpp>
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/ucb/XContentAccess.hpp>
+#include <com/sun/star/ucb/NameClash.hpp>
+#include <com/sun/star/deployment/VersionException.hpp>
+#include <com/sun/star/deployment/InstallException.hpp>
+#include <com/sun/star/deployment/Prerequisites.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/ucb/UnsupportedCommandException.hpp>
+#include <boost/bind.hpp>
+#include <unotools/tempfile.hxx>
#include <vector>
#include <list>
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 256b035..91e7257 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -24,12 +24,12 @@
#include "dp_misc.h"
#include "dp_interact.h"
#include "dp_activepackages.hxx"
-#include "rtl/ref.hxx"
-#include "cppuhelper/compbase1.hxx"
-#include "cppuhelper/implbase2.hxx"
-#include "ucbhelper/content.hxx"
-#include "com/sun/star/deployment/XPackageRegistry.hpp"
-#include "com/sun/star/deployment/XPackageManager.hpp"
+#include <rtl/ref.hxx>
+#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <ucbhelper/content.hxx>
+#include <com/sun/star/deployment/XPackageRegistry.hpp>
+#include <com/sun/star/deployment/XPackageManager.hpp>
#include <memory>
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index dd2246b..91c3975 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -20,9 +20,9 @@
#include "dp_manager.h"
#include "dp_resource.h"
-#include "cppuhelper/compbase1.hxx"
-#include "comphelper/servicedecl.hxx"
-#include "com/sun/star/deployment/thePackageManagerFactory.hpp"
+#include <cppuhelper/compbase1.hxx>
+#include <comphelper/servicedecl.hxx>
+#include <com/sun/star/deployment/thePackageManagerFactory.hpp>
#include <boost/unordered_map.hpp>
diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx
index f45f42f..a126246 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -18,14 +18,14 @@
*/
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#include "xmlscript/xml_helper.hxx"
-#include "ucbhelper/content.hxx"
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <xmlscript/xml_helper.hxx>
+#include <ucbhelper/content.hxx>
#include <list>
#include "dp_ucb.h"
-#include "rtl/ustrbuf.hxx"
+#include <rtl/ustrbuf.hxx>
#include "dp_properties.hxx"
namespace lang = com::sun::star::lang;
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index da72e8e..c342859 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -22,9 +22,9 @@
-#include "com/sun/star/beans/NamedValue.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "boost/optional.hpp"
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <boost/optional.hpp>
namespace dp_manager {
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 696d3a7..10d10f2 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -19,19 +19,19 @@
#include <config_folders.h>
-#include "sal/config.h"
-
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/xml/dom/XElement.hpp"
-#include "com/sun/star/xml/dom/XNodeList.hpp"
-#include "rtl/bootstrap.hxx"
-#include "rtl/string.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "tools/resid.hxx"
-#include "unotools/configmgr.hxx"
+#include <sal/config.h>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/xml/dom/XElement.hpp>
+#include <com/sun/star/xml/dom/XNodeList.hpp>
+#include <rtl/bootstrap.hxx>
+#include <rtl/string.h>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <tools/resid.hxx>
+#include <unotools/configmgr.hxx>
#include "deployment.hrc"
#include "dp_resource.h"
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 1564337..6fcfc3c 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -20,40 +20,40 @@
#include "dp_descriptioninfoset.hxx"
#include "dp_resource.h"
-#include "sal/config.h"
-
-#include "comphelper/sequence.hxx"
-#include "comphelper/seqstream.hxx"
-#include "comphelper/makesequence.hxx"
-#include "comphelper/processfactory.hxx"
-#include "boost/noncopyable.hpp"
-#include "boost/optional.hpp"
-#include "com/sun/star/configuration/theDefaultProvider.hpp"
-#include "com/sun/star/container/XNameAccess.hpp"
-#include "com/sun/star/beans/Optional.hpp"
-#include "com/sun/star/beans/PropertyValue.hpp"
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/io/SequenceInputStream.hpp"
-#include "com/sun/star/lang/XMultiComponentFactory.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "com/sun/star/xml/dom/DOMException.hpp"
-#include "com/sun/star/xml/dom/XNode.hpp"
-#include "com/sun/star/xml/dom/XNodeList.hpp"
-#include "com/sun/star/xml/dom/DocumentBuilder.hpp"
-#include "com/sun/star/xml/xpath/XPathAPI.hpp"
-#include "com/sun/star/ucb/InteractiveIOException.hpp"
-#include "cppuhelper/implbase1.hxx"
-#include "cppuhelper/implbase2.hxx"
-#include "cppuhelper/weak.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "ucbhelper/content.hxx"
+#include <sal/config.h>
+
+#include <comphelper/sequence.hxx>
+#include <comphelper/seqstream.hxx>
+#include <comphelper/makesequence.hxx>
+#include <comphelper/processfactory.hxx>
+#include <boost/noncopyable.hpp>
+#include <boost/optional.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/beans/Optional.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/io/SequenceInputStream.hpp>
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/xml/dom/DOMException.hpp>
+#include <com/sun/star/xml/dom/XNode.hpp>
+#include <com/sun/star/xml/dom/XNodeList.hpp>
+#include <com/sun/star/xml/dom/DocumentBuilder.hpp>
+#include <com/sun/star/xml/xpath/XPathAPI.hpp>
+#include <com/sun/star/ucb/InteractiveIOException.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <ucbhelper/content.hxx>
namespace {
diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx
index a8fb964..7096764 100644
--- a/desktop/source/deployment/misc/dp_identifier.cxx
+++ b/desktop/source/deployment/misc/dp_identifier.cxx
@@ -18,16 +18,16 @@
*/
-#include "sal/config.h"
-
-#include "boost/optional.hpp"
-#include "com/sun/star/beans/Optional.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "osl/diagnose.h"
-#include "rtl/string.h"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/ustring.hxx"
+#include <sal/config.h>
+
+#include <boost/optional.hpp>
+#include <com/sun/star/beans/Optional.hpp>
+#include <com/sun/star/deployment/XPackage.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <osl/diagnose.h>
+#include <rtl/string.h>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
#include "dp_identifier.hxx"
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index f615368..2c35355 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -19,9 +19,9 @@
#include "dp_interact.h"
-#include "cppuhelper/exc_hlp.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "com/sun/star/task/XInteractionAbort.hpp"
+#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/task/XInteractionAbort.hpp>
using namespace ::com::sun::star;
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 9973b77..a021e23 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -22,25 +22,25 @@
#include "dp_misc.h"
#include "dp_version.hxx"
#include "dp_interact.h"
-#include "rtl/uri.hxx"
-#include "rtl/digest.h"
-#include "rtl/random.h"
-#include "rtl/bootstrap.hxx"
-#include "unotools/bootstrap.hxx"
-#include "osl/file.hxx"
-#include "osl/pipe.hxx"
-#include "osl/security.hxx"
-#include "osl/thread.hxx"
-#include "osl/mutex.hxx"
-#include "com/sun/star/ucb/CommandAbortedException.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/bridge/BridgeFactory.hpp"
-#include "com/sun/star/bridge/UnoUrlResolver.hpp"
-#include "com/sun/star/bridge/XUnoUrlResolver.hpp"
-#include "com/sun/star/deployment/ExtensionManager.hpp"
-#include "com/sun/star/task/OfficeRestartManager.hpp"
-#include "boost/scoped_array.hpp"
-#include "boost/shared_ptr.hpp"
+#include <rtl/uri.hxx>
+#include <rtl/digest.h>
+#include <rtl/random.h>
+#include <rtl/bootstrap.hxx>
+#include <unotools/bootstrap.hxx>
+#include <osl/file.hxx>
+#include <osl/pipe.hxx>
+#include <osl/security.hxx>
+#include <osl/thread.hxx>
+#include <osl/mutex.hxx>
+#include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/bridge/BridgeFactory.hpp>
+#include <com/sun/star/bridge/UnoUrlResolver.hpp>
+#include <com/sun/star/bridge/XUnoUrlResolver.hpp>
+#include <com/sun/star/deployment/ExtensionManager.hpp>
+#include <com/sun/star/task/OfficeRestartManager.hpp>
+#include <boost/scoped_array.hpp>
+#include <boost/shared_ptr.hpp>
#include <comphelper/processfactory.hxx>
#include <salhelper/linkhelper.hxx>
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 09b3fcd..6b5215a 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -20,10 +20,10 @@
#include "dp_misc.h"
#include "dp_platform.hxx"
-#include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/instance.hxx"
-#include "rtl/bootstrap.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/instance.hxx>
+#include <rtl/bootstrap.hxx>
#define PLATFORM_ALL "all"
#define PLATFORM_WIN_X86 "windows_x86"
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index 4f4a300..eb64115 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -20,12 +20,12 @@
#include "dp_misc.h"
#include "dp_resource.h"
-#include "osl/module.hxx"
-#include "osl/mutex.hxx"
+#include <osl/module.hxx>
+#include <osl/mutex.hxx>
#include <tools/resmgr.hxx>
-#include "rtl/ustring.h"
-#include "cppuhelper/implbase1.hxx"
-#include "unotools/configmgr.hxx"
+#include <rtl/ustring.h>
+#include <cppuhelper/implbase1.hxx>
+#include <unotools/configmgr.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index f53cba2..f765835 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -21,15 +21,15 @@
#include "deployment.hrc"
#include "dp_misc.h"
#include "dp_ucb.h"
-#include "rtl/uri.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "ucbhelper/content.hxx"
-#include "xmlscript/xml_helper.hxx"
-#include "com/sun/star/io/XInputStream.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/ContentInfo.hpp"
-#include "com/sun/star/ucb/ContentInfoAttribute.hpp"
-#include "comphelper/processfactory.hxx"
+#include <rtl/uri.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <ucbhelper/content.hxx>
+#include <xmlscript/xml_helper.hxx>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/ucb/CommandFailedException.hpp>
+#include <com/sun/star/ucb/ContentInfo.hpp>
+#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
+#include <comphelper/processfactory.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 970544f..f8bde2e 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -24,7 +24,7 @@
#include "dp_identifier.hxx"
#include "dp_descriptioninfoset.hxx"
-#include "rtl/bootstrap.hxx"
+#include <rtl/bootstrap.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx
index 51add94..edf8b51 100644
--- a/desktop/source/deployment/misc/dp_version.cxx
+++ b/desktop/source/deployment/misc/dp_version.cxx
@@ -18,10 +18,10 @@
*/
-#include "sal/config.h"
+#include <sal/config.h>
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "rtl/ustring.hxx"
+#include <com/sun/star/deployment/XPackage.hpp>
+#include <rtl/ustring.hxx>
#include "dp_version.hxx"
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index 565efb4..05ba8b7 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -18,12 +18,12 @@
*/
-#include "rtl/string.h"
-#include "rtl/bootstrap.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/xml/dom/XDocumentBuilder.hpp"
-#include "com/sun/star/xml/xpath/XXPathAPI.hpp"
+#include <rtl/string.h>
+#include <rtl/bootstrap.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
+#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
#include "dp_misc.h"
#include "dp_compbackenddb.hxx"
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index ed34443..ec2aff2 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_COMPONENT_DP_COMPBACKENDDB_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_COMPONENT_DP_COMPBACKENDDB_HXX
-#include "rtl/ustring.hxx"
-#include "rtl/string.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/string.hxx>
#include <vector>
#include <list>
#include "dp_backenddb.hxx"
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 13c89c9..ed54773 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -22,26 +22,26 @@
#include "dp_backend.h"
#include "dp_platform.hxx"
#include "dp_ucb.h"
-#include "rtl/string.hxx"
-#include "rtl/strbuf.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/uri.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "ucbhelper/content.hxx"
-#include "comphelper/anytostring.hxx"
-#include "comphelper/servicedecl.hxx"
-#include "comphelper/sequence.hxx"
-#include "xmlscript/xml_helper.hxx"
-#include "svl/inettype.hxx"
-#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
-#include "com/sun/star/container/XNameContainer.hpp"
-#include "com/sun/star/container/XSet.hpp"
-#include "com/sun/star/registry/XSimpleRegistry.hpp"
-#include "com/sun/star/registry/XImplementationRegistration.hpp"
-#include "com/sun/star/loader/XImplementationLoader.hpp"
-#include "com/sun/star/io/XInputStream.hpp"
-#include "com/sun/star/ucb/NameClash.hpp"
-#include "com/sun/star/util/theMacroExpander.hpp"
+#include <rtl/string.hxx>
+#include <rtl/strbuf.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/uri.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <ucbhelper/content.hxx>
+#include <comphelper/anytostring.hxx>
+#include <comphelper/servicedecl.hxx>
+#include <comphelper/sequence.hxx>
+#include <xmlscript/xml_helper.hxx>
+#include <svl/inettype.hxx>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XSet.hpp>
+#include <com/sun/star/registry/XSimpleRegistry.hpp>
+#include <com/sun/star/registry/XImplementationRegistration.hpp>
+#include <com/sun/star/loader/XImplementationLoader.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/ucb/NameClash.hpp>
+#include <com/sun/star/util/theMacroExpander.hpp>
#include <list>
#include <boost/unordered_map.hpp>
#include <vector>
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 1039c72..1f1b084 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -28,22 +28,22 @@
#include "dp_persmap.h"
#endif
#include "dp_ucb.h"
-#include "rtl/string.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/uri.hxx"
-#include "osl/file.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "ucbhelper/content.hxx"
-#include "unotools/ucbhelper.hxx"
-#include "comphelper/anytostring.hxx"
-#include "comphelper/servicedecl.hxx"
-#include "xmlscript/xml_helper.hxx"
-#include "svl/inettype.hxx"
-#include "com/sun/star/configuration/Update.hpp"
-#include "com/sun/star/ucb/NameClash.hpp"
-#include "com/sun/star/io/XActiveDataSink.hpp"
-#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
-#include "com/sun/star/util/XRefreshable.hpp"
+#include <rtl/string.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/uri.hxx>
+#include <osl/file.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <ucbhelper/content.hxx>
+#include <unotools/ucbhelper.hxx>
+#include <comphelper/anytostring.hxx>
+#include <comphelper/servicedecl.hxx>
+#include <xmlscript/xml_helper.hxx>
+#include <svl/inettype.hxx>
+#include <com/sun/star/configuration/Update.hpp>
+#include <com/sun/star/ucb/NameClash.hpp>
+#include <com/sun/star/io/XActiveDataSink.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/util/XRefreshable.hpp>
#include <list>
#include <memory>
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index 47e364e..c51f127 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -18,12 +18,12 @@
*/
-#include "rtl/string.h"
-#include "rtl/bootstrap.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/xml/dom/XDocumentBuilder.hpp"
-#include "com/sun/star/xml/xpath/XXPathAPI.hpp"
+#include <rtl/string.h>
+#include <rtl/bootstrap.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
+#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
#include "dp_misc.h"
#include "dp_configurationbackenddb.hxx"
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index c68e07a..b1de325 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_CONFIGURATION_DP_CONFIGURATIONBACKENDDB_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_CONFIGURATION_DP_CONFIGURATIONBACKENDDB_HXX
-#include "rtl/ustring.hxx"
-#include "rtl/string.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/string.hxx>
#include <list>
-#include "boost/optional.hpp"
+#include <boost/optional.hpp>
#include "dp_backenddb.hxx"
namespace com { namespace sun { namespace star {
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 69b918b..1b3cd1e 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -17,29 +17,29 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "sal/config.h"
+#include <sal/config.h>
#include <cassert>
#include "dp_backend.h"
#include "dp_ucb.h"
-#include "rtl/ustring.hxx"
-#include "rtl/uri.hxx"
-#include "rtl/bootstrap.hxx"
-#include "osl/file.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "comphelper/servicedecl.hxx"
-#include "comphelper/unwrapargs.hxx"
-#include "ucbhelper/content.hxx"
-#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
-#include "com/sun/star/deployment/InvalidRemovedParameterException.hpp"
-#include "com/sun/star/deployment/thePackageManagerFactory.hpp"
-#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
-#include "com/sun/star/ucb/IOErrorCode.hpp"
-#include "com/sun/star/beans/StringPair.hpp"
-#include "com/sun/star/sdbc/XResultSet.hpp"
-#include "com/sun/star/sdbc/XRow.hpp"
-#include "unotools/tempfile.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/uri.hxx>
+#include <rtl/bootstrap.hxx>
+#include <osl/file.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <comphelper/servicedecl.hxx>
+#include <comphelper/unwrapargs.hxx>
+#include <ucbhelper/content.hxx>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/deployment/InvalidRemovedParameterException.hpp>
+#include <com/sun/star/deployment/thePackageManagerFactory.hpp>
+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
+#include <com/sun/star/ucb/IOErrorCode.hpp>
+#include <com/sun/star/beans/StringPair.hpp>
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/sdbc/XRow.hpp>
+#include <unotools/tempfile.hxx>
using namespace ::dp_misc;
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 378a1ad..1c2b254 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -18,20 +18,20 @@
*/
-#include "rtl/string.h"
-#include "rtl/strbuf.hxx"
-#include "rtl/bootstrap.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "osl/file.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/xml/dom/DocumentBuilder.hpp"
-#include "com/sun/star/xml/xpath/XPathAPI.hpp"
-#include "com/sun/star/io/XActiveDataSource.hpp"
-#include "com/sun/star/io/XActiveDataControl.hpp"
+#include <rtl/string.h>
+#include <rtl/strbuf.hxx>
+#include <rtl/bootstrap.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <osl/file.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/xml/dom/DocumentBuilder.hpp>
+#include <com/sun/star/xml/xpath/XPathAPI.hpp>
+#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XActiveDataControl.hpp>
#include "dp_ucb.h"
#include "dp_misc.h"
-#include "ucbhelper/content.hxx"
-#include "xmlscript/xml_helper.hxx"
+#include <ucbhelper/content.hxx>
+#include <xmlscript/xml_helper.hxx>
#include "dp_backenddb.hxx"
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 0c98858..dc1a689 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -26,22 +26,22 @@
#include "dp_resource.h"
#include "dp_interact.h"
#include "dp_ucb.h"
-#include "osl/diagnose.h"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/uri.hxx"
-#include "cppuhelper/compbase2.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "comphelper/sequence.hxx"
-#include "ucbhelper/content.hxx"
-#include "com/sun/star/uno/DeploymentException.hpp"
-#include "com/sun/star/lang/DisposedException.hpp"
-#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "com/sun/star/lang/XSingleServiceFactory.hpp"
-#include "com/sun/star/util/XUpdatable.hpp"
-#include "com/sun/star/container/XContentEnumerationAccess.hpp"
-#include "com/sun/star/deployment/PackageRegistryBackend.hpp"
+#include <osl/diagnose.h>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/uri.hxx>
+#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <comphelper/sequence.hxx>
+#include <ucbhelper/content.hxx>
+#include <com/sun/star/uno/DeploymentException.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/util/XUpdatable.hpp>
+#include <com/sun/star/container/XContentEnumerationAccess.hpp>
+#include <com/sun/star/deployment/PackageRegistryBackend.hpp>
#include <boost/unordered_map.hpp>
#include <set>
#include <boost/unordered_set.hpp>
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 5886eab..723a49f 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -22,12 +22,12 @@
#include "dp_backend.h"
#include "dp_ucb.h"
#include "dp_interact.h"
-#include "rtl/string.hxx"
-#include "osl/file.hxx"
-#include "ucbhelper/content.hxx"
-#include "comphelper/servicedecl.hxx"
-#include "svl/inettype.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <rtl/string.hxx>
+#include <osl/file.hxx>
+#include <ucbhelper/content.hxx>
+#include <comphelper/servicedecl.hxx>
+#include <svl/inettype.hxx>
+#include <cppuhelper/implbase1.hxx>
#include "dp_executablebackenddb.hxx"
using namespace ::com::sun::star;
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
index fcafcfc..8178856 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
@@ -18,8 +18,8 @@
*/
-#include "rtl/string.h"
-#include "com/sun/star/uno/XComponentContext.hpp"
+#include <rtl/string.h>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include "dp_misc.h"
#include "dp_executablebackenddb.hxx"
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index c45e766..dcf3135 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_EXECUTABLE_DP_EXECUTABLEBACKENDDB_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_EXECUTABLE_DP_EXECUTABLEBACKENDDB_HXX
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
#include "dp_backenddb.hxx"
namespace com { namespace sun { namespace star {
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 74259ae..ab1f317 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -23,14 +23,14 @@
#include "dp_backend.h"
#include "dp_helpbackenddb.hxx"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list