Merge branch 'master' into feature/gnumake4

Conflicts:
	connectivity/source/cpool/Zregistration.cxx
	connectivity/source/drivers/evoab/LCatalog.cxx
	connectivity/source/drivers/evoab/LColumnAlias.cxx
	connectivity/source/drivers/evoab/LColumnAlias.hxx
	connectivity/source/drivers/evoab/LColumns.cxx
	connectivity/source/drivers/evoab/LColumns.hxx
	connectivity/source/drivers/evoab/LConfigAccess.cxx
	connectivity/source/drivers/evoab/LConfigAccess.hxx
	connectivity/source/drivers/evoab/LConnection.cxx
	connectivity/source/drivers/evoab/LConnection.hxx
	connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
	connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
	connectivity/source/drivers/evoab/LDriver.cxx
	connectivity/source/drivers/evoab/LDriver.hxx
	connectivity/source/drivers/evoab/LFolderList.cxx
	connectivity/source/drivers/evoab/LFolderList.hxx
	connectivity/source/drivers/evoab/LNoException.cxx
	connectivity/source/drivers/evoab/LPreparedStatement.cxx
	connectivity/source/drivers/evoab/LPreparedStatement.hxx
	connectivity/source/drivers/evoab/LResultSet.cxx
	connectivity/source/drivers/evoab/LResultSet.hxx
	connectivity/source/drivers/evoab/LServices.cxx
	connectivity/source/drivers/evoab/LStatement.cxx
	connectivity/source/drivers/evoab/LStatement.hxx
	connectivity/source/drivers/evoab/LTable.cxx
	connectivity/source/drivers/evoab/LTable.hxx
	connectivity/source/drivers/evoab/LTables.cxx
	connectivity/source/drivers/evoab/LTables.hxx
	connectivity/source/drivers/evoab/evoab.xml
	connectivity/source/drivers/evoab/makefile.mk
	editeng/Library_editeng.mk
	framework/Library_fwe.mk
	framework/test/test.cxx
	idl/prj/d.lst
	idl/util/idlpch.cxx
	linguistic/Makefile
	linguistic/Module_linguistic.mk
	linguistic/inc/linguistic/lngdllapi.h
	linguistic/inc/linguistic/lngprophelp.hxx
	linguistic/inc/linguistic/misc.hxx
	linguistic/prj/build.lst
	linguistic/prj/d.lst
	linguistic/qa/unoapi/Test.java
	linguistic/source/grammarchecker.cxx
	linguistic/source/grammarchecker.hxx
	linguistic/source/hyphdta.cxx
	linguistic/source/lngprophelp.cxx
	linguistic/source/makefile.mk
	linguistic/source/spelldta.cxx
	sfx2/Library_qstart.mk
	sfx2/Library_sfx.mk
	sfx2/inc/sfx2/qswin32.h
	sfx2/prj/build.lst
	sfx2/qa/cppunit/makefile.mk
	xmlscript/inc/xmlscript/xcrdllapi.h
	xmlscript/prj/d.lst
	xmlscript/util/makefile.mk

1 files changed, 11 insertions, 15 deletions

diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index 47dd5056fb58..3ef46edc2cb1 100644
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,23 +30,17 @@
 #define _BASICAPP_HXX
 
 #include <vcl/svapp.hxx>
-#ifndef _HELP_HXX //autogen
 #include <vcl/help.hxx>
-#endif
-#ifndef _MENU_HXX //autogen
 #include <vcl/menu.hxx>
-#endif
-#ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
-#endif
 #include <vcl/timer.hxx>
 #include <svl/brdcst.hxx>
 #include <svl/lstner.hxx>
 
 class BasicFrame;
 #include <basic/mybasic.hxx>
+#include <vector>
 
-class EditList;
 class AppWin;
 class AppEdit;
 class AppBasEd;
@@ -55,15 +50,15 @@ class StatusLine;
 class BasicPrinter;
 struct TTLogMsg;
 
+typedef ::std::vector< AppWin* > EditList;
+
 class BasicApp : public Application {
     short       nWait;              // Wait-Zaehler
 public:
-//  Help*       pHelp;              // Hilfesystem
     BasicFrame* pFrame;             // Frame Window
-//  MenuBar*    pMainMenu;          // Hauptmenue
     Accelerator*    pMainAccel;     // Acceleratoren
 
-    void  Main( );
+    int Main( );
 
     void  LoadIniFile();
     void  SetFocus();
@@ -95,19 +90,18 @@ class BasicFrame : public WorkWindow, public SfxBroadcaster, public SfxListener
 using SystemWindow::Notify;
 using Window::Command;
 
-virtual sal_Bool Close();
+    virtual sal_Bool Close();
     sal_Bool CloseAll();          // Close all windows
     sal_Bool CompileAll();        // Compile all texts
     AutoTimer aLineNum;       // Show the line numbers
-virtual void Resize();
-virtual void Move();
-virtual void GetFocus();
+    virtual void Resize();
+    virtual void Move();
+    virtual void GetFocus();
     void LoadLibrary();
     void SaveLibrary();
     sal_Bool bIsAutoRun;
     DisplayHidDlg* pDisplayHidDlg;
 
-//  BreakPoint *pRunToCursorBP;
 
     SbxVariable *pEditVar;
 
@@ -195,3 +189,5 @@ public:
 extern BasicApp aBasicApp;
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */