Merge branch 'master' into feature/gnumake4

Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx

1 files changed, 17 insertions, 16 deletions

diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 315279b17950..cc58b29a24b3 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.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.
@@ -32,15 +33,14 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <osl/endian.h>
-#include <errhdl.hxx>       // for ASSERT
 #include <tools/string.hxx>
 #include <swddllapi.h>
 
-#define FILTER_RTF      "RTF"       // RTF-Filter
+#define FILTER_RTF      "RTF"       // RTF filter
 #define sRtfWH          "WH_RTF"
-#define FILTER_TEXT     "TEXT"      // Text-Filter mit Default-CodeSet
-#define FILTER_BAS      "BAS"       // StarBasic (identisch mit ANSI)
-#define FILTER_WW8      "CWW8"      // WinWord 97-Filter
+#define FILTER_TEXT     "TEXT"      // text filter with default codeset
+#define FILTER_BAS      "BAS"       // StarBasic (identical to ANSI)
+#define FILTER_WW8      "CWW8"      // WinWord 97 filter
 #define FILTER_TEXT_DLG "TEXT_DLG"  // text filter with encoding dialog
 #define FILTER_XML      "CXML"      // XML filter
 #define FILTER_XMLV     "CXMLV"     // XML filter
@@ -88,29 +88,29 @@ enum ReaderWriterEnum {
 
 extern SWD_DLLPUBLIC SwIoDetect aFilterDetect[];
 
-// Die folgende Klasse ist ein Wrappe fuer die Basic-I/O-Funktionen
-// des Writer 3.0. Alles ist statisch. Alle u.a. Filternamen sind die
-// Writer-internen Namen, d.h. die namen, die in INSTALL.INI vor dem
-// Gleichheitszeichen stehen, z.b. SWG oder ASCII.
+// The following class is a wrapper for basic i/o functions of Writer 3.0.
+// Everything is static. All filter names mentioned are Writer-internal
+// names, i.e. the names in front of the equality sign in INSTALL.INI, like SWG
+// or ASCII.
 
 class SwIoSystem
 {
 public:
-    // suche ueber den internen FormatNamen den Filtereintrag
+    // find for an internal format name the corresponding filter entry
     SWD_DLLPUBLIC static const SfxFilter*
         GetFilterOfFormat( const String& rFormat,
             const SfxFilterContainer* pCnt = 0 );
 
-    // Feststellen des zu verwendenden Filters fuer die uebergebene
-    // Datei. Der Filtername wird zurueckgeliefert. Konnte kein Filter
-    // zurueckgeliefert werden, wird der Name des ASCII-Filters geliefert!
+    // Detect for the given file which filter should be used. The filter name
+    // is returned. If no filter could be found, the name of the ASCII filter
+    // is returned!
     SWD_DLLPUBLIC static const SfxFilter*
         GetFileFilter( const String& rFileName,
             const String& rPrefFltName,
             SfxMedium* pMedium = 0 );
 
-    // Feststellen ob das File in dem vorgegebenen Format vorliegt.
-    // Z.z werden nur unsere eigene Filter unterstuetzt!!
+    // Detect whether the given file is in the given format.
+    // For now, only our own filters are supported!
     static sal_Bool IsFileFilter( SfxMedium& rMedium, const String& rFmtName,
             const SfxFilter** ppFlt = 0 );
 
@@ -120,7 +120,6 @@ public:
     SWD_DLLPUBLIC static bool
         IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
             CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false );
-    //    static bool IsDetectableW4W(const String& rFileName, const String& rUserData);
 
     static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen );
 
@@ -129,3 +128,5 @@ public:
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */