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, 10 deletions

diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index b5087fb46294..023031334fd3 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.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.
@@ -27,8 +28,6 @@
 #ifndef _SFX_OBJSHIMP_HXX
 #define _SFX_OBJSHIMP_HXX
 
-//#include <hash_map>
-
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
@@ -79,18 +78,18 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
     sal_uInt16          nVisualDocumentNumber;
     sal_Int16           nDocumentSignatureState;
     sal_Int16           nScriptingSignatureState;
-    sal_Bool            bInList:1,          // ob per First/Next erreichbar
-                        bClosing:1,         // sal_True w"aehrend Close(), um Benachrichtigungs-Rekursionen zu verhindern
+    sal_Bool            bInList:1,          // if reachable by First/Next
+                        bClosing:1,         // sal_True while Close(), to prevent recurrences Notification
                         bIsSaving:1,
                         bPasswd:1,
                         bIsTmp:1,
                         bIsNamedVisible:1,
                         bIsTemplate:1,
-                        bIsAbortingImport:1,  // Importvorgang soll abgebrochen werden.
-                        bImportDone : 1, //Import schon fertig? Fuer AutoReload von Docs.
+                        bIsAbortingImport:1,  // Import operation should be canceled.
+                        bImportDone : 1, // Import finished already? For auto reload of Docs.
                         bInPrepareClose : 1,
                         bPreparedForClose : 1,
-                        bWaitingForPicklist : 1,// Muss noch in die Pickliste
+                        bWaitingForPicklist : 1, // Must go into pick list
                         bForbidReload : 1,
                         bBasicInitialized :1,
                         bIsPrintJobCancelable :1, // Stampit disable/enable cancel button for print jobs ... default = true = enable!
@@ -108,12 +107,13 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
                         bUseUserData:1,
                         bSaveVersionOnClose:1,
                         m_bSharedXMLFlag:1, // whether the flag should be stored in xml file
-                        m_bAllowShareControlFileClean:1; // whether the flag should be stored in xml file
+                        m_bAllowShareControlFileClean:1, // whether the flag should be stored in xml file
+                        m_bConfigOptionsChecked:1; // whether or not the user options are checked after the Options dialog is closed.
 
     IndexBitSet         aBitSet;
     sal_uInt32               lErr;
-    sal_uInt16              nEventId;           // falls vor Activate noch ein
-                                            // Open/Create gesendet werden mu/s
+    sal_uInt16          nEventId;           // If Open/Create as to be sent
+                                            // before Activate
     AutoReloadTimer_Impl *pReloadTimer;
     MarkData_Impl*      pMarkData;
     sal_uInt16              nLoadedFlags;
@@ -174,3 +174,4 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */