[PATCH 2/2] Translated comments from German to English

[Christina Rossmanith]

---
 sc/inc/arealink.hxx |    4 ----
 sc/inc/chgtrack.hxx |   21 ---------------------
 sc/inc/docoptio.hxx |    2 +-
 sc/inc/document.hxx |    8 ++++----
 4 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 32905aa..0e7b073 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -51,11 +51,7 @@ private:
     ScRange         aDestArea;
     BOOL            bAddUndo;
     BOOL            bInCreate;
-<<<<<<< HEAD
     BOOL            bDoInsert;      // is set to FALSE for first update
-=======
-    BOOL            bDoInsert;      // is set to FALSE for first update (Is that comment correct? Can't find statement containing "bDoInsert" and "FALSE" using grok)
->>>>>>> Translated comments from German to English.
     BOOL		FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName );
 
 public:
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 5feed9a..86df024 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -1264,15 +1264,9 @@ public:
 
     SC_DLLPUBLIC		void				Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge = false );
 
-<<<<<<< HEAD
                                 // adjust references for MergeDocument
                                 //! may only be used in a temporary opened document.
                                 //! the Track (?) is unclean afterwards
-=======
-                                // for MergeDocument, adjust references,
-                                //! may only be used in a temporary opened document
-                                //! der Track ist danach verhunzt
->>>>>>> Translated comments from German to English.
             void				MergePrepare( ScChangeAction* pFirstMerge, bool bShared = false );
             void				MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bShared = false );
     static	BOOL				MergeIgnore( const ScChangeAction&, ULONG nFirstMerge );
@@ -1298,21 +1292,6 @@ public:
                                 // With bAllFlat (==TRUE ?) all dependents of dependents
                                 // will be inserted flatly.
 
-=======
-                                // Insert dependents into table.
-                                // Bei Insert sind es echte Abhaengige,
-                                // bei Move abhaengige Contents im FromRange
-                                // und geloeschte im ToRange bzw. Inserts in
-                                // FromRange oder ToRange,
-                                // bei Delete eine Liste der geloeschten,
-                                // bei Content andere Contents an gleicher
-                                // Position oder MatrixReferences zu MatrixOrigin.
-                                // Mit bListMasterDelete werden unter einem
-                                // MasterDelete alle zu diesem Delete gehoerenden
-                                // Deletes einer Reihe gelistet.
-                                // Mit bAllFlat werden auch alle Abhaengigen
-                                // der Abhaengigen flach eingefuegt.
->>>>>>> Translated comments from German to English.
     SC_DLLPUBLIC		void				GetDependents( ScChangeAction*,
                                     ScChangeActionTable&,
                                     BOOL bListMasterDelete = FALSE,
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index e3d55ae..4cccec8 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -51,7 +51,7 @@ class SC_DLLPUBLIC ScDocOptions
     BOOL   bIsIgnoreCase;			// ignore case for comparisons?
     BOOL   bIsIter;					// iterations for circular refs
     BOOL   bCalcAsShown;			// calculate as shown (wrt precision)
-    BOOL   bMatchWholeCell;			// search criteria must match the whole cell 
+    BOOL   bMatchWholeCell;			// search criteria must match the whole cell
     BOOL   bDoAutoSpell;			// auto-spelling
     BOOL   bLookUpColRowNames;		// determine column-/row titles automagically
     BOOL   bFormulaRegexEnabled;    // regular expressions in formulas enabled
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c7f4fea..5658c01 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -365,7 +365,7 @@ private:
     // no SetDirty for ScFormulaCell::CompileTokenArray but at the end of
     // ScDocument::CompileAll[WithFormats], CopyScenario, CopyBlockFromClip
     BOOL				bNoSetDirty;
-    // no broadcast, construct no listener during insert from a different 
+    // no broadcast, construct no listener during insert from a different
     // Doc (per filter or the like ), not until CompileAll / CalcAfterLoad
     BOOL				bInsertingFromOtherDoc;
     bool                bLoadingMedium;
@@ -381,8 +381,8 @@ private:
     BOOL				bHasForcedFormulas;
     // is the Doc being destroyed? (no Notify-Tracking etc. needed anymore)
     BOOL				bInDtorClear;
-    // expand reference if insert column/row takes place at the border 
-    // of a reference
+    // expand reference if insert column/row takes place at the border
+    // of a reference?
     // is fetched in each UpdateReference from InputOptions,
     // assigned, and restored at the end of UpdateReference
     BOOL				bExpandRefs;
@@ -887,7 +887,7 @@ public:
                     // calculate automatically in/from/for ScDocShell disabled
     void			SetAutoCalcShellDisabled( BOOL bNew ) { bAutoCalcShellDisabled = bNew; }
     BOOL			IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; }
-                    // ForcedFormulas are to be calculated 
+                    // ForcedFormulas are to be calculated
     void			SetForcedFormulaPending( BOOL bNew ) { bForcedFormulaPending = bNew; }
     BOOL			IsForcedFormulaPending() const { return bForcedFormulaPending; }
                     // if CalcFormulaTree() is currently running
-- 
1.7.0.4


--------------040005070304010303030901--