Merge branch 'master' into feature/gnumake4

Conflicts:
	xmlreader/prj/d.lst

5 files changed, 13 insertions, 15 deletions

diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index ca65d9236..15d6a60a5 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -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.
@@ -50,8 +51,8 @@ namespace {
 typedef std::vector<rtl::OString, rtl::Allocator<rtl::OString> > OStringVec;
 
 struct StaticDebugBaseAddressFilter
-    : rtl::StaticWithInit<OStringVec const, StaticDebugBaseAddressFilter> {
-    OStringVec const operator()() const {
+    : rtl::StaticWithInit<OStringVec, StaticDebugBaseAddressFilter> {
+    OStringVec operator()() const {
         OStringVec vec;
         rtl_uString * pStr = 0;
         rtl::OUString const name(
@@ -159,3 +160,4 @@ void SAL_CALL osl_detail_ObjectRegistry_revokeObject(
 
 } // extern "C"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/filepath.c b/sal/osl/all/filepath.c
index 951728cbd..7489b1538 100644
--- a/sal/osl/all/filepath.c
+++ b/sal/osl/all/filepath.c
@@ -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.
@@ -121,3 +122,4 @@ oslFileError SAL_CALL osl_abbreviateSystemPath( rtl_uString *ustrSystemPath, rtl
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index cb4b3ef83..b510a032c 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -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.
@@ -56,7 +57,7 @@ oslModule SAL_CALL osl_loadModuleRelative(
     ::rtl::OUString abs;
     try {
         abs = ::rtl::Uri::convertRelToAbs(base, relativePath);
-    } catch (::rtl::MalformedUriException & e) {
+    } catch (const ::rtl::MalformedUriException & e) {
         (void) e; // avoid warnings
         OSL_TRACE(
             "rtl::MalformedUriException <%s>",
@@ -69,3 +70,5 @@ oslModule SAL_CALL osl_loadModuleRelative(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/makefile.mk b/sal/osl/all/makefile.mk
index 5da61e8b2..fa928412f 100644
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@ -38,10 +38,6 @@ PROJECTPCHSOURCE=cont_pch
 
 MULTITHREAD_OBJ=TRUE
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -58,9 +54,6 @@ SLOFILES=	\
             $(SLO)$/loadmodulerelative.obj \
             $(SLO)/printtrace.obj
 
-#			$(SLO)$/readline.obj\
-
-#.IF "$(UPDATER)"=="YES"
 OBJFILES=	\
             $(OBJ)$/utility.obj\
             $(OBJ)$/filepath.obj\
@@ -68,11 +61,6 @@ OBJFILES=	\
             $(OBJ)$/loadmodulerelative.obj \
             $(OBJ)/printtrace.obj
 
-#			$(OBJ)$/readline.obj\
-#.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index a7e1654a4..b183653e1 100755..100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
@@ -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.
@@ -101,3 +102,5 @@ void debug_oustring(rtl::OUString& ustr)
 
     return;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */