I keep forgetting to add [PATCH] to the subject line
August Sodora
aug...@gmail.com
(201) 280-8138
On Mon, Nov 7, 2011 at 11:26 AM, August Sodora <aug...@gmail.com> wrote:
> I've attached some patches that do more cleanup of unused headers and
> remove the last explicit include of tools/string in basctl.
>
> August Sodora
> aug...@gmail.com
> (201) 280-8138
>
From 0d3f6a34a9bec3e8d18d060451e49eb0926b104e Mon Sep 17 00:00:00 2001
From: August Sodora <aug...@gmail.com>
Date: Sun, 6 Nov 2011 21:34:35 -0500
Subject: [PATCH] Remove last include of tools/string.hxx in basctl
---
basctl/source/basicide/iderdll2.hxx | 1 -
basctl/source/inc/localizationmgr.hxx | 3 +--
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index 00456cb..facacc4 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -33,7 +33,6 @@ class StarBASIC;
class SvxSearchItem;
class Accelerator;
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
diff --git a/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx
index 382cab7..6942b8e 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -32,7 +32,6 @@
#include "scriptdocument.hxx"
#include <com/sun/star/resource/XStringResourceManager.hpp>
-#include <tools/string.hxx>
class BasicIDEShell;
class DlgEditor;
@@ -45,7 +44,7 @@ class LocalizationMgr
BasicIDEShell* m_pIDEShell;
ScriptDocument m_aDocument;
- String m_aLibName;
+ ::rtl::OUString m_aLibName;
::com::sun::star::lang::Locale m_aLocaleBeforeBasicStart;
--
1.7.4.4
From bf3c0dc366797f47a0fa3c0cc6c5b8015d5a61f8 Mon Sep 17 00:00:00 2001
From: August Sodora <aug...@gmail.com>
Date: Sun, 6 Nov 2011 21:38:44 -0500
Subject: [PATCH 1/4] Remove unnecessary includes
---
.../accessibility/accessibledialogwindow.cxx | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 70677e4..8b4228f 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -28,6 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
+
#include <accessibledialogwindow.hxx>
#include <accessibledialogcontrolshape.hxx>
#include <baside3.hxx>
@@ -46,10 +47,6 @@
#include <toolkit/helper/convert.hxx>
#include <vcl/svapp.hxx>
-#include <vector>
-#include <algorithm>
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
--
1.7.4.4
From 6e38c71441f234fb4c6aafa642b6e56f062625cf Mon Sep 17 00:00:00 2001
From: August Sodora <aug...@gmail.com>
Date: Sun, 6 Nov 2011 21:42:12 -0500
Subject: [PATCH 2/4] Remove unnecessary includes
---
basctl/source/basicide/basdoc.cxx | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 033e258..80536e9 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -28,24 +28,15 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-
-
#include <ide_pch.hxx>
-#include <svx/svxids.hrc>
-#include <sfx2/docfac.hxx>
-#include <sfx2/sfxmodelfactory.hxx>
-#include <vcl/status.hxx>
-
-#include <svx/xmlsecctrl.hxx>
+#include "unomodel.hxx"
#include <basdoc.hxx>
-
-#define BasicDocShell
+#define BasicDocShell // This CANNOT come before basdoc apparently
#include <basslots.hxx>
-
-#include "basicmod.hxx"
-#include "unomodel.hxx"
+#include <sfx2/sfxmodelfactory.hxx>
+#include <svx/svxids.hrc>
TYPEINIT1(BasicDocShell, SfxObjectShell);
DBG_NAME(BasicDocShell);
--
1.7.4.4
From 8e773f9761618db16b76167911604839092539d2 Mon Sep 17 00:00:00 2001
From: August Sodora <aug...@gmail.com>
Date: Sun, 6 Nov 2011 21:43:22 -0500
Subject: [PATCH 3/4] Remove unnecessary includes
---
basctl/source/basicide/basdoc.hxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 848a7f9..b666cab 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -29,9 +29,9 @@
#ifndef _BASDOC_HXX
#define _BASDOC_HXX
-#include <svx/ifaceids.hxx>
#include <iderid.hxx>
-#include <sfx2/objsh.hxx>
+
+#include <svx/ifaceids.hxx>
class SfxPrinter;
--
1.7.4.4
From 0348cf819aeb2752982f9ff62ab24035b823ad33 Mon Sep 17 00:00:00 2001
From: August Sodora <aug...@gmail.com>
Date: Sun, 6 Nov 2011 22:13:59 -0500
Subject: [PATCH 4/4] Remove unnecessary includes
---
basctl/source/dlged/managelang.cxx | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index caec079..f95bbb5 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -29,31 +29,25 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-#include "managelang.hxx"
-#include "iderid.hxx"
-#include "localizationmgr.hxx"
-#include "iderdll.hxx"
#include "basidesh.hxx"
#include "basobj.hxx"
+#include "dlgresid.hrc"
+#include "iderdll.hxx"
+#include "iderid.hxx"
+#include "localizationmgr.hxx"
+#include "managelang.hxx"
#include "managelang.hrc"
-#include "dlgresid.hrc"
#include "helpid.hrc"
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/resource/XStringResourceManager.hpp>
-#include <comphelper/processfactory.hxx>
+#include <editeng/unolingu.hxx>
+#include <sfx2/bindings.hxx>
+#include <svtools/langtab.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <editeng/unolingu.hxx>
-
-#include <svtools/langtab.hxx>
-
-#include <sfx2/bindings.hxx>
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
--
1.7.4.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
