[Libreoffice-commits] .: 5 commits - basctl/source

[Caolán McNamara]

 basctl/source/accessibility/accessibledialogwindow.cxx |    5 ---
 basctl/source/basicide/basdoc.cxx                      |   17 +++----------
 basctl/source/basicide/basdoc.hxx                      |    4 +--
 basctl/source/basicide/iderdll2.hxx                    |    1 
 basctl/source/dlged/managelang.cxx                     |   22 ++++++-----------
 basctl/source/inc/localizationmgr.hxx                  |    3 --
 6 files changed, 16 insertions(+), 36 deletions(-)

New commits:
commit 9fbc73f45f7e001357d1143d5fa06ff35248ad5e
Author: August Sodora <augsod at gmail.com>
Date:   Sun Nov 6 21:38:44 2011 -0500

    Remove unnecessary includes

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;
commit c1e6cf2df86248c5dbeee5109f6c2efabcc26aca
Author: August Sodora <augsod at gmail.com>
Date:   Sun Nov 6 22:13:59 2011 -0500

    Remove unnecessary includes

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;
commit c448b832660201b00412fb9d9f5a7727d98c74c9
Author: August Sodora <augsod at gmail.com>
Date:   Sun Nov 6 21:43:22 2011 -0500

    Remove unnecessary includes

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;
 
commit 0d71a9c7d02973f20701bd7e4eca3231ace2b655
Author: August Sodora <augsod at gmail.com>
Date:   Sun Nov 6 21:42:12 2011 -0500

    Remove unnecessary includes

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);
commit 3d7bc23e23f42b1940fe8c0d27c97af836b15842
Author: August Sodora <augsod at gmail.com>
Date:   Sun Nov 6 21:34:35 2011 -0500

    Remove last include of tools/string.hxx in basctl

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;