Merge branch 'master' into feature/gnumake4

Conflicts: basebmp/prj/d.lst basebmp/test/basictest.cxx basebmp/test/makefile.mk basegfx/inc/basegfx/basegfxdllapi.h basegfx/inc/basegfx/tools/debugplotter.hxx basegfx/inc/basegfx/tuple/b2ituple.hxx basegfx/prj/d.lst basegfx/source/numeric/makefile.mk basegfx/source/polygon/makefile.mk basegfx/source/range/makefile.mk basegfx/source/raster/makefile.mk basegfx/source/tuple/makefile.mk basegfx/source/vector/makefile.mk basegfx/test/basegfx1d.cxx basegfx/test/makefile.mk basegfx/util/makefile.mk canvas/Library_canvasfactory.mk canvas/Module_canvas.mk canvas/prj/build.lst canvas/prj/d.lst canvas/source/cairo/cairo_canvashelper_texturefill.cxx canvas/source/cairo/makefile.mk canvas/source/tools/makefile.mk comphelper/qa/string/makefile.mk cppcanvas/Module_cppcanvas.mk cppcanvas/inc/cppcanvas/cppcanvasdllapi.h cppcanvas/prj/build.lst cppcanvas/prj/d.lst cppcanvas/source/mtfrenderer/makefile.mk cppcanvas/util/makefile.mk i18npool/source/search/makefile.mk regexp/Library_regexp.mk regexp/prj/d.lst sax/CppunitTest_sax.mk sax/Library_sax.mk sax/prj/d.lst sax/qa/cppunit/test_converter.cxx sax/source/expatwrap/attrlistimpl.hxx sax/util/makefile.mk svtools/Library_svt.mk tools/Executable_sspretty.mk ucbhelper/prj/d.lst ucbhelper/source/provider/configureucb.cxx ucbhelper/source/provider/provconf.cxx ucbhelper/util/makefile.mk unotools/Library_utl.mk unotools/Module_unotools.mk unotools/Package_inc.mk unotools/prj/build.lst vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gtk.mk vcl/aqua/source/gdi/salprn.cxx vcl/inc/aqua/saldata.hxx vcl/unx/generic/gdi/salgdi3.cxx
author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> 2011-06-19 12:47:44 +0200
committer: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> 2011-06-19 12:47:44 +0200
commit: 941020379b1ea1ec7c564c21e68ea1674cda7683 (patch)
tree: 40fcaf109d6d585bcdc0faf7ea6c0812b3cc9a39 /ucbhelper
parent: 0692507dcc62e94c7af88388961db1d7d12d6dbd (diff)
parent: 0d2916e03ea51529e15995830a1a8c36bd72e442 (diff)
70 files changed, 386 insertions, 329 deletions
diff --git a/ucbhelper/inc/pch/precompiled_ucbhelper.cxx b/ucbhelper/inc/pch/precompiled_ucbhelper.cxx
index 2c78a928b111..9c38231bc246 100644
--- a/ucbhelper/inc/pch/precompiled_ucbhelper.cxx
+++ b/ucbhelper/inc/pch/precompiled_ucbhelper.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.
@@ -27,3 +28,4 @@
 
 #include "precompiled_ucbhelper.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/pch/precompiled_ucbhelper.hxx b/ucbhelper/inc/pch/precompiled_ucbhelper.hxx
index 6ce32849d6ff..9a4ed394a76b 100644
--- a/ucbhelper/inc/pch/precompiled_ucbhelper.hxx
+++ b/ucbhelper/inc/pch/precompiled_ucbhelper.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.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/activedatasink.hxx b/ucbhelper/inc/ucbhelper/activedatasink.hxx
index f7cb0582fa56..6a0b47fdba70 100644
--- a/ucbhelper/inc/ucbhelper/activedatasink.hxx
+++ b/ucbhelper/inc/ucbhelper/activedatasink.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.
@@ -73,3 +74,5 @@ public:
 } /* namespace ucbhelper */
 
 #endif /* !_UCBHELPER_ACTIVEDATASINK_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/activedatastreamer.hxx b/ucbhelper/inc/ucbhelper/activedatastreamer.hxx
index 996f52c3884e..200a2e2ad60a 100644
--- a/ucbhelper/inc/ucbhelper/activedatastreamer.hxx
+++ b/ucbhelper/inc/ucbhelper/activedatastreamer.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.
@@ -68,3 +69,5 @@ public:
 } /* namespace ucbhelper */
 
 #endif /* !_UCBHELPER_ACTIVEDATASTREAMER_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
index a23c6fc6b0fe..0facae0f02b7 100644
--- a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
+++ b/ucbhelper/inc/ucbhelper/cancelcommandexecution.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.
@@ -108,3 +109,5 @@ UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::ucb::IOEr
 }
 
 #endif // _UCBHELPER_CANCELCOMMANDEXECUTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/commandenvironment.hxx b/ucbhelper/inc/ucbhelper/commandenvironment.hxx
index ddcdd5712901..0ad13bf76ad4 100644
--- a/ucbhelper/inc/ucbhelper/commandenvironment.hxx
+++ b/ucbhelper/inc/ucbhelper/commandenvironment.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,9 +30,7 @@
 #define _UCBHELPER_COMMANDENVIRONMENT_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDENVIRONMENT_HPP_
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#endif
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/macros.hxx>
 #include "ucbhelper/ucbhelperdllapi.h"
@@ -100,3 +99,5 @@ public:
 } /* namespace ucbhelper */
 
 #endif /* !_UCBHELPER_COMMANDENVIRONMENT_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
index 00724ceb4b46..90c05d17d19e 100644
--- a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
+++ b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.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,9 +30,7 @@
 #define _UCBHELPER_COMMANDENVIRONMENTPROXY_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDENVIRONMENT_HPP_
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#endif
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/macros.hxx>
 
@@ -97,3 +96,5 @@ public:
 } /* namespace ucbhelper */
 
 #endif /* !_UCBHELPER_COMMANDENVIRONMENTPROXY_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/configurationkeys.hxx b/ucbhelper/inc/ucbhelper/configurationkeys.hxx
index ca928b8b52bf..d99f5788c1d3 100644
--- a/ucbhelper/inc/ucbhelper/configurationkeys.hxx
+++ b/ucbhelper/inc/ucbhelper/configurationkeys.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.
@@ -41,3 +42,5 @@
 #define UCB_CONFIGURATION_KEY2_CLIENT_ACCESS "ClientAccess"
 
 #endif // _UCBHELPER_CONFIGURATIONKEYS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx
index 0a20592fe82a..f290134dfae1 100644
--- a/ucbhelper/inc/ucbhelper/content.hxx
+++ b/ucbhelper/inc/ucbhelper/content.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.
@@ -1038,3 +1039,5 @@ public:
 } /* namespace ucbhelper */
 
 #endif /* !_UCBHELPER_CONTENT_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/contentbroker.hxx b/ucbhelper/inc/ucbhelper/contentbroker.hxx
index 54139d3ffdea..f21597cccc84 100644
--- a/ucbhelper/inc/ucbhelper/contentbroker.hxx
+++ b/ucbhelper/inc/ucbhelper/contentbroker.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.
@@ -203,3 +204,5 @@ public:
 } /* namespace ucbhelper */
 
 #endif /* !_UCBHELPER_CONTENTBROKER_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/contenthelper.hxx b/ucbhelper/inc/ucbhelper/contenthelper.hxx
index 7950f9b84053..fdeb3a307979 100644
--- a/ucbhelper/inc/ucbhelper/contenthelper.hxx
+++ b/ucbhelper/inc/ucbhelper/contenthelper.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.
@@ -522,3 +523,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_CONTENTHELPER_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/contentidentifier.hxx b/ucbhelper/inc/ucbhelper/contentidentifier.hxx
index 2bd1cca50e36..daf43ed6512f 100644
--- a/ucbhelper/inc/ucbhelper/contentidentifier.hxx
+++ b/ucbhelper/inc/ucbhelper/contentidentifier.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.
@@ -98,3 +99,5 @@ private:
 } /* namespace ucbhelper */
 
 #endif /* !_UCBHELPER_CONTENTIDENTIFIER_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/contentinfo.hxx b/ucbhelper/inc/ucbhelper/contentinfo.hxx
index 1584645771c7..507ca271668d 100644
--- a/ucbhelper/inc/ucbhelper/contentinfo.hxx
+++ b/ucbhelper/inc/ucbhelper/contentinfo.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.
@@ -175,3 +176,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_CONTENTINFO_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
index 15db85760619..14bfb177545f 100644
--- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
+++ b/ucbhelper/inc/ucbhelper/fileidentifierconverter.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.
@@ -125,3 +126,5 @@ getSystemPathFromFileURL(
 }
 
 #endif // _UCBHELPER_FILEIDENTIFIERCONVERTER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx
index 9ce8122efc3f..ab0d445e76a9 100644
--- a/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/handleinteractionrequest.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.
@@ -212,3 +213,5 @@ handleInteractionRequest(
 
 }
 #endif // INCLUDED_UCBHELPER_HANDLEINTERACTIONREQUEST_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
index 197abb36ea34..5bd3a008ace2 100644
--- a/ucbhelper/inc/ucbhelper/interactionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/interactionrequest.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.
@@ -725,3 +726,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_INTERATIONREQUEST_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
index 23ed0fb4d60b..f4ad20251415 100644
--- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
+++ b/ucbhelper/inc/ucbhelper/interceptedinteraction.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.
@@ -33,13 +34,9 @@
 
 #include <vector>
 
-#ifndef __COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP__
 #include <com/sun/star/task/XInteractionHandler.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_TASK_XINTERACTIONREQUEST_HPP__
 #include <com/sun/star/task/XInteractionRequest.hpp>
-#endif
 #include <cppuhelper/implbase1.hxx>
 #include "ucbhelper/ucbhelperdllapi.h"
 
@@ -349,3 +346,5 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
 } // namespace ucbhelper
 
 #endif // _UCBHELPER_INTERCEPTEDINTERACTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx
index f32f1130c216..302be2132f05 100644
--- a/ucbhelper/inc/ucbhelper/macros.hxx
+++ b/ucbhelper/inc/ucbhelper/macros.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.
@@ -745,3 +746,5 @@ Class::getSupportedServiceNames_Static()                                    \
 }
 
 #endif /* !_UCBHELPER_MACROS_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
index 82d440df0c02..50aa9b91c77e 100644
--- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
+++ b/ucbhelper/inc/ucbhelper/propertyvalueset.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.
@@ -432,3 +433,5 @@ public:
 }
 
 #endif /* !_UCBHELPER_PROPERTYVALUESET_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/providerhelper.hxx b/ucbhelper/inc/ucbhelper/providerhelper.hxx
index 2c9c89294fc8..3219a79fab73 100644
--- a/ucbhelper/inc/ucbhelper/providerhelper.hxx
+++ b/ucbhelper/inc/ucbhelper/providerhelper.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.
@@ -283,3 +284,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_PROVIDERHELPER_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/proxydecider.hxx b/ucbhelper/inc/ucbhelper/proxydecider.hxx
index 861a33bbf5e4..98ebbff7941a 100644
--- a/ucbhelper/inc/ucbhelper/proxydecider.hxx
+++ b/ucbhelper/inc/ucbhelper/proxydecider.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.
@@ -141,3 +142,5 @@ private:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_PROXYDECIDER_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/registerucb.hxx b/ucbhelper/inc/ucbhelper/registerucb.hxx
index e2427248dce2..bec56cb90195 100644
--- a/ucbhelper/inc/ucbhelper/registerucb.hxx
+++ b/ucbhelper/inc/ucbhelper/registerucb.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.
@@ -127,3 +128,5 @@ UCBHELPER_DLLPUBLIC bool registerAtUcb(
 
 }
 #endif // _UCBHELPER_REGISTERUCB_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/resultset.hxx b/ucbhelper/inc/ucbhelper/resultset.hxx
index 4835ea9f1eb0..c3c33587bce5 100644
--- a/ucbhelper/inc/ucbhelper/resultset.hxx
+++ b/ucbhelper/inc/ucbhelper/resultset.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.
@@ -556,7 +557,7 @@ public:
 
     /**
      * This method will be called by the resultset implementation in order
-     * check, whether an error has occured while collecting data. The
+     * check, whether an error has occurred while collecting data. The
      * implementation of this method must throw an exception in that case.
      *
      * Note: An exception thrown to indicate an error must always be thrown
@@ -568,7 +569,7 @@ public:
      * In case data are obtained synchronously, the ResultSetException can
      * be thrown directly.
      *
-     * @exception ResultSetException thrown, if an error has occured
+     * @exception ResultSetException thrown, if an error has occurred
      */
     virtual void validate()
         throw( com::sun::star::ucb::ResultSetException ) = 0;
@@ -577,3 +578,5 @@ public:
 }
 
 #endif /* !_UCBHELPER_RESULTSET_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/resultsethelper.hxx b/ucbhelper/inc/ucbhelper/resultsethelper.hxx
index b0c54a2779c2..e670a76b34b5 100644
--- a/ucbhelper/inc/ucbhelper/resultsethelper.hxx
+++ b/ucbhelper/inc/ucbhelper/resultsethelper.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.
@@ -218,3 +219,5 @@ public:
 }
 
 #endif /* !_UCBHELPER_RESULTSETHELPER_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
index cc1e4b550e19..ceb01b4cf6a1 100644
--- a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
+++ b/ucbhelper/inc/ucbhelper/resultsetmetadata.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.
@@ -474,3 +475,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_RESULTSETMETADATA_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
index 87fcb1b55dd7..026cd7f7e991 100644
--- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.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.
@@ -210,3 +211,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
index 213f504c7f61..c770c8e7c21a 100755..100644
--- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.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.
@@ -76,3 +77,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
index 9bb1d0bff119..6797818ca8e8 100644
--- a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.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.
@@ -94,3 +95,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
index 44987fadd0aa..e96f36431298 100644
--- a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.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.
@@ -73,3 +74,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_SIMPLEIOERRORREQUEST_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
index 8ab8ead7cffb..ca6a01e6b9fc 100644
--- a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.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.
@@ -81,3 +82,5 @@ public:
 } // namespace ucbhelper
 
 #endif /* !_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h b/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h
index edb8c0ee350e..28712c5543c5 100644
--- a/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h
+++ b/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h
@@ -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.
@@ -39,3 +40,4 @@
 
 #endif /* INCLUDED_UCBHELPERDLLAPI_H */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/prj/d.lst b/ucbhelper/prj/d.lst
index e69de29bb2d1..2a89bcdb117b 100644
--- a/ucbhelper/prj/d.lst
+++ b/ucbhelper/prj/d.lst
@@ -0,0 +1 @@
+..\%__SRC%\misc\*.sym %_DEST%\bin\*.sym
diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx
index 029fb60e616f..5cdfa4f3df59 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.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.
@@ -91,3 +92,5 @@ uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream()
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx
index 5f26334ab376..aa90802a16e7 100644
--- a/ucbhelper/source/client/activedatastreamer.cxx
+++ b/ucbhelper/source/client/activedatastreamer.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.
@@ -90,3 +91,5 @@ uno::Reference< io::XStream > SAL_CALL ActiveDataStreamer::getStream()
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx
index 75a137faeb5b..7824e2b378fb 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.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.
@@ -44,7 +45,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::task;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::uno;
-using namespace rtl;
 
 namespace ucbhelper
 {
@@ -137,3 +137,4 @@ CommandEnvironment::getProgressHandler()
 
 } /* namespace ucbhelper */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 4debb1728bfe..7f73b6492d55 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.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.
@@ -226,9 +227,9 @@ static void ensureContentProviderForURL( const ContentBroker & rBroker,
     if ( !xMgr.is() )
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "UCB does not implement mandatory interface "
-                "XContentProviderManager!" ),
+                "XContentProviderManager!" )),
             Reference< XInterface >() );
     }
     else
@@ -238,8 +239,8 @@ static void ensureContentProviderForURL( const ContentBroker & rBroker,
         if ( !xProv.is() )
         {
             throw ContentCreationException(
-                rtl::OUString::createFromAscii(
-                    "No Content Provider available for given URL!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "No Content Provider available for given URL!" )),
                 Reference< XInterface >(),
                 ContentCreationError_NO_CONTENT_PROVIDER );
         }
@@ -256,7 +257,7 @@ static ContentBroker* getContentBroker( bool bThrow )
     {
         if ( bThrow )
             throw RuntimeException(
-                    rtl::OUString::createFromAscii( "No Content Broker!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No Content Broker!")),
                     Reference< XInterface >() );
     }
     else
@@ -268,9 +269,9 @@ static ContentBroker* getContentBroker( bool bThrow )
         {
             if ( bThrow )
                 throw RuntimeException(
-                        rtl::OUString::createFromAscii(
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                             "UCB does not implement mandatory interface "
-                            "XContentProviderManager!" ),
+                            "XContentProviderManager!" )),
                         Reference< XInterface >() );
         }
         else
@@ -306,8 +307,8 @@ static Reference< XContentIdentifier > getContentIdentifier(
             ensureContentProviderForURL( rBroker, rURL );
 
             throw ContentCreationException(
-                rtl::OUString::createFromAscii(
-                    "Unable to create Content Identifier!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Unable to create Content Identifier!" )),
                 Reference< XInterface >(),
                 ContentCreationError_IDENTIFIER_CREATION_FAILED );
         }
@@ -316,9 +317,9 @@ static Reference< XContentIdentifier > getContentIdentifier(
     {
         if ( bThrow )
             throw RuntimeException(
-                    rtl::OUString::createFromAscii(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                         "UCB does not implement mandatory interface "
-                        "XContentIdentifierFactory!" ),
+                        "XContentIdentifierFactory!" )),
                     Reference< XInterface >() );
     }
 
@@ -356,8 +357,8 @@ static Reference< XContent > getContent(
             ensureContentProviderForURL( rBroker, xId->getContentIdentifier() );
 
             throw ContentCreationException(
-                    rtl::OUString::createFromAscii(
-                        "Unable to create Content! " ) + msg,
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Unable to create Content! " )) + msg,
                     Reference< XInterface >(),
                     ContentCreationError_CONTENT_CREATION_FAILED );
         }
@@ -366,9 +367,9 @@ static Reference< XContent > getContent(
     {
         if ( bThrow )
             throw RuntimeException(
-                    rtl::OUString::createFromAscii(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                         "UCB does not implement mandatory interface "
-                        "XContentProvider!" ),
+                        "XContentProvider!" )),
                     Reference< XInterface >() );
     }
 
@@ -534,7 +535,7 @@ Reference< XCommandInfo > Content::getCommands()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "getCommandInfo" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument = Any();
 
@@ -550,7 +551,7 @@ Reference< XPropertySetInfo > Content::getProperties()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "getPropertySetInfo" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument = Any();
 
@@ -677,7 +678,7 @@ Reference< XRow > Content::getPropertyValuesInterface(
     }
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "getPropertyValues" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aProps;
 
@@ -710,7 +711,7 @@ Reference< XRow > Content::getPropertyValuesInterface(
     }
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "getPropertyValues" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aProps;
 
@@ -731,9 +732,9 @@ Sequence< Any > Content::setPropertyValues(
     {
         ucbhelper::cancelCommandExecution(
             makeAny( IllegalArgumentException(
-                        rtl::OUString::createFromAscii(
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                             "Length of property names sequence and value "
-                            "sequence are unequal!" ),
+                            "sequence are unequal!" )),
                         get(),
                         -1 ) ),
             m_xImpl->getEnvironment() );
@@ -758,7 +759,7 @@ Sequence< Any > Content::setPropertyValues(
     }
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "setPropertyValues" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aProps;
 
@@ -779,9 +780,9 @@ Sequence< Any > Content::setPropertyValues(
     {
         ucbhelper::cancelCommandExecution(
             makeAny( IllegalArgumentException(
-                        rtl::OUString::createFromAscii(
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                             "Length of property handles sequence and value "
-                            "sequence are unequal!" ),
+                            "sequence are unequal!" )),
                         get(),
                         -1 ) ),
             m_xImpl->getEnvironment() );
@@ -806,7 +807,7 @@ Sequence< Any > Content::setPropertyValues(
     }
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "setPropertyValues" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aProps;
 
@@ -875,7 +876,7 @@ Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames,
     aArg.Properties = aProps;
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "open" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -908,7 +909,7 @@ Any Content::createCursorAny( const Sequence< sal_Int32 >& rPropertyHandles,
     aArg.Properties = aProps;
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "open" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -1021,7 +1022,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
         if( aServiceManager.is() )
         {
             Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
-                                rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
                                 UNO_QUERY );
 
             aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor,
@@ -1056,7 +1057,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
         if( aServiceManager.is() )
         {
             Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
-                                rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
                                 UNO_QUERY );
 
             aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor,
@@ -1096,7 +1097,7 @@ Reference< XResultSet > Content::createSortedCursor(
         if( aServiceManager.is() )
         {
             Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
-                                rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
                                 UNO_QUERY );
 
             aDynResult = aSortFactory->createSortedDynamicResultSet( aDynSet,
@@ -1150,7 +1151,7 @@ Reference< XResultSet > Content::createSortedCursor(
         if( aServiceManager.is() )
         {
             Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
-                                rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
                                 UNO_QUERY );
 
             aDynResult = aSortFactory->createSortedDynamicResultSet( aDynSet,
@@ -1197,7 +1198,7 @@ Reference< XInputStream > Content::openStream()
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "open" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -1222,7 +1223,7 @@ Reference< XInputStream > Content::openStreamNoLock()
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "open" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -1247,7 +1248,7 @@ Reference< XStream > Content::openWriteableStream()
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "open" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -1272,7 +1273,7 @@ Reference< XStream > Content::openWriteableStreamNoLock()
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "open" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -1295,7 +1296,7 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "open" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -1318,7 +1319,7 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "open" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -1337,7 +1338,7 @@ void Content::writeStream( const Reference< XInputStream >& rStream,
     aArg.ReplaceExisting = bReplaceExisting;
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "insert" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -1353,7 +1354,7 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo()
     // First, try it using "CreatableContentsInfo" property -> the "new" way.
     Sequence< ContentInfo > aInfo;
     if ( getPropertyValue(
-             rtl::OUString::createFromAscii( "CreatableContentsInfo" ) )
+             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")) )
          >>= aInfo )
         return aInfo;
 
@@ -1414,7 +1415,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
     aInfo.Attributes = 0;
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "createNewContent" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aInfo;
 
@@ -1448,7 +1449,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 
     Content aNewContent( xNew, m_xImpl->getEnvironment() );
     aNewContent.setPropertyValues( rPropertyNames, rPropertyValues );
-    aNewContent.executeCommand( rtl::OUString::createFromAscii( "insert" ),
+    aNewContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")),
                                 makeAny(
                                     InsertCommandArgument(
                                         rData.is() ? rData : new EmptyInputStream,
@@ -1477,7 +1478,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
     aInfo.Attributes = 0;
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "createNewContent" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aInfo;
 
@@ -1511,7 +1512,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 
     Content aNewContent( xNew, m_xImpl->getEnvironment() );
     aNewContent.setPropertyValues( nPropertyHandles, rPropertyValues );
-    aNewContent.executeCommand( rtl::OUString::createFromAscii( "insert" ),
+    aNewContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")),
                                 makeAny(
                                     InsertCommandArgument(
                                         rData.is() ? rData : new EmptyInputStream,
@@ -1532,8 +1533,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
     ContentBroker* pBroker = ContentBroker::get();
     if ( !pBroker )
     {
-        OSL_ENSURE( sal_False,
-                    "Content::transferContent - No Content Broker!" );
+        OSL_FAIL( "Content::transferContent - No Content Broker!" );
         return sal_False;
     }
 
@@ -1541,8 +1541,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
                                     pBroker->getCommandProcessorInterface() );
     if ( !xCmdProc.is() )
     {
-        OSL_ENSURE( sal_False,
-                    "Content::transferContent - No XCommandProcessor!" );
+        OSL_FAIL( "Content::transferContent - No XCommandProcessor!" );
         return sal_False;
     }
 
@@ -1566,8 +1565,8 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
         default:
             ucbhelper::cancelCommandExecution(
                 makeAny( IllegalArgumentException(
-                            rtl::OUString::createFromAscii(
-                                "Unknown transfer operation!" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "Unknown transfer operation!" )),
                             get(),
                             -1 ) ),
                          m_xImpl->getEnvironment() );
@@ -1581,7 +1580,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
                                         rTitle,
                                         nNameClashAction );
     Command aCommand;
-    aCommand.Name     = rtl::OUString::createFromAscii( "globalTransfer" );
+    aCommand.Name     = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("globalTransfer"));
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aTransferArg;
 
@@ -1594,14 +1593,14 @@ sal_Bool Content::isFolder()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     sal_Bool bFolder = sal_False;
-    if ( getPropertyValue( rtl::OUString::createFromAscii( "IsFolder" ) )
+    if ( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) )
         >>= bFolder )
         return bFolder;
 
      ucbhelper::cancelCommandExecution(
          makeAny( UnknownPropertyException(
-                    rtl::OUString::createFromAscii(
-                        "Unable to retreive value of property 'IsFolder'!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Unable to retreive value of property 'IsFolder'!" )),
                     get() ) ),
          m_xImpl->getEnvironment() );
 
@@ -1615,14 +1614,14 @@ sal_Bool Content::isDocument()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     sal_Bool bDoc = sal_False;
-    if ( getPropertyValue( rtl::OUString::createFromAscii( "IsDocument" ) )
+    if ( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")) )
         >>= bDoc )
         return bDoc;
 
      ucbhelper::cancelCommandExecution(
          makeAny( UnknownPropertyException(
-                    rtl::OUString::createFromAscii(
-                        "Unable to retreive value of property 'IsDocument'!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Unable to retreive value of property 'IsDocument'!" )),
                     get() ) ),
          m_xImpl->getEnvironment() );
 
@@ -1970,3 +1969,4 @@ void SAL_CALL ContentEventListener_Impl::disposing( const EventObject& Source )
 
 } /* namespace ucbhelper */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index 408ff6af0dee..8eb455ca0aeb 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.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.
@@ -46,7 +47,8 @@
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::uno;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 namespace
 {
@@ -284,8 +286,8 @@ bool ContentBroker_Impl::initialize()
                 try
                 {
                     xIfc = m_xSMgr->createInstance(
-                            OUString::createFromAscii(
-                                "com.sun.star.ucb.UniversalContentBroker" ) );
+                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.ucb.UniversalContentBroker" )) );
                 }
                 catch ( Exception const & )
                 {
@@ -318,8 +320,8 @@ bool ContentBroker_Impl::initialize()
                 try
                 {
                     xIfc = m_xSMgr->createInstanceWithArguments(
-                            OUString::createFromAscii(
-                                "com.sun.star.ucb.UniversalContentBroker" ),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.ucb.UniversalContentBroker" )),
                             m_aArguments );
                 }
                 catch ( Exception const & )
@@ -378,3 +380,4 @@ bool ContentBroker_Impl::initialize()
 
 } /* namespace ucbhelper */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx
index 64bc428a9934..514772363ca9 100644
--- a/ucbhelper/source/client/fileidentifierconverter.cxx
+++ b/ucbhelper/source/client/fileidentifierconverter.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.
@@ -105,3 +106,5 @@ getSystemPathFromFileURL(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx
index a23206f615f3..0d774b29c793 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.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.
@@ -129,7 +130,7 @@ void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Ref
             // Runtime error! The defined continuation could not be located
             // inside the set of available containuations of the incoming request.
             // Whats wrong - the interception list or the request?
-            OSL_ENSURE(sal_False, "InterceptedInteraction::handle()\nCould intercept this interaction request - but cant locate the right continuation!");
+            OSL_FAIL("InterceptedInteraction::handle()\nCould intercept this interaction request - but cant locate the right continuation!");
         }
         break;
 
@@ -199,3 +200,5 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index d6fc260f558b..4f99baacbb2d 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.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.
@@ -114,7 +115,7 @@ public:
                 rValue = (*it).second;
                 return true;
             }
-            it++;
+            ++it;
         }
         return false;
     }
@@ -259,8 +260,7 @@ bool getConfigStringValue(
         if ( !( xNameAccess->getByName( rtl::OUString::createFromAscii( key ) )
                 >>= value ) )
         {
-            OSL_ENSURE( sal_False,
-                        "InternetProxyDecider - "
+            OSL_FAIL( "InternetProxyDecider - "
                         "Error getting config item value!" );
             return false;
         }
@@ -288,8 +288,7 @@ bool getConfigInt32Value(
             rtl::OUString::createFromAscii( key ) );
         if ( aValue.hasValue() && !( aValue >>= value ) )
         {
-            OSL_ENSURE( sal_False,
-                        "InternetProxyDecider - "
+            OSL_FAIL( "InternetProxyDecider - "
                         "Error getting config item value!" );
             return false;
         }
@@ -326,17 +325,17 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
 
         uno::Reference< lang::XMultiServiceFactory > xConfigProv(
                 rxSMgr->createInstance(
-                    rtl::OUString::createFromAscii(
-                        "com.sun.star.configuration.ConfigurationProvider" ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.configuration.ConfigurationProvider" )) ),
                 uno::UNO_QUERY );
 
         uno::Sequence< uno::Any > aArguments( 1 );
-        aArguments[ 0 ] <<= rtl::OUString::createFromAscii( CONFIG_ROOT_KEY );
+        aArguments[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONFIG_ROOT_KEY ));
 
         uno::Reference< uno::XInterface > xInterface(
                     xConfigProv->createInstanceWithArguments(
-                        rtl::OUString::createFromAscii(
-                            "com.sun.star.configuration.ConfigurationAccess" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.configuration.ConfigurationAccess" )),
                     aArguments ) );
 
         OSL_ENSURE( xInterface.is(),
@@ -405,7 +404,7 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
     catch ( uno::Exception const & )
     {
         // createInstance, createInstanceWithArguments
-        OSL_ENSURE( sal_False, "InternetProxyDecider - Exception!" );
+        OSL_FAIL( "InternetProxyDecider - Exception!" );
     }
 }
 
@@ -478,7 +477,7 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const rtl::OUString & rHost,
             if ( (*it).first.Matches( aHostAndPort ) )
                 return false;
         }
-        it++;
+        ++it;
     }
 
     return true;
@@ -602,8 +601,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                 {
                     if ( !( rElem.Element >>= m_nProxyType ) )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "InternetProxyDecider - changesOccurred - "
+                        OSL_FAIL( "InternetProxyDecider - changesOccurred - "
                                     "Error getting config item value!" );
                     }
                 }
@@ -613,8 +611,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                     rtl::OUString aNoProxyList;
                     if ( !( rElem.Element >>= aNoProxyList ) )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "InternetProxyDecider - changesOccurred - "
+                        OSL_FAIL( "InternetProxyDecider - changesOccurred - "
                                     "Error getting config item value!" );
                     }
 
@@ -625,8 +622,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                 {
                     if ( !( rElem.Element >>= m_aHttpProxy.aName ) )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "InternetProxyDecider - changesOccurred - "
+                        OSL_FAIL( "InternetProxyDecider - changesOccurred - "
                                     "Error getting config item value!" );
                     }
                 }
@@ -635,8 +631,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                 {
                     if ( !( rElem.Element >>= m_aHttpProxy.nPort ) )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "InternetProxyDecider - changesOccurred - "
+                        OSL_FAIL( "InternetProxyDecider - changesOccurred - "
                                     "Error getting config item value!" );
                     }
 
@@ -648,8 +643,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                 {
                     if ( !( rElem.Element >>= m_aHttpsProxy.aName ) )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "InternetProxyDecider - changesOccurred - "
+                        OSL_FAIL( "InternetProxyDecider - changesOccurred - "
                                     "Error getting config item value!" );
                     }
                 }
@@ -658,8 +652,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                 {
                     if ( !( rElem.Element >>= m_aHttpsProxy.nPort ) )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "InternetProxyDecider - changesOccurred - "
+                        OSL_FAIL( "InternetProxyDecider - changesOccurred - "
                                     "Error getting config item value!" );
                     }
 
@@ -671,8 +664,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                 {
                     if ( !( rElem.Element >>= m_aFtpProxy.aName ) )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "InternetProxyDecider - changesOccurred - "
+                        OSL_FAIL( "InternetProxyDecider - changesOccurred - "
                                     "Error getting config item value!" );
                     }
                 }
@@ -681,8 +673,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                 {
                     if ( !( rElem.Element >>= m_aFtpProxy.nPort ) )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "InternetProxyDecider - changesOccurred - "
+                        OSL_FAIL( "InternetProxyDecider - changesOccurred - "
                                     "Error getting config item value!" );
                     }
                 }
@@ -746,14 +737,14 @@ void InternetProxyDecider_Impl::setNoProxyList(
                 if ( nColonPos == -1 )
                 {
                     // No port given, server pattern equals current token
-                    aPort = rtl::OUString::createFromAscii( "*" );
+                    aPort = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
                     if ( aToken.indexOf( '*' ) == -1 )
                     {
                         // pattern describes exactly one server
                         aServer = aToken;
                     }
 
-                    aToken += rtl::OUString::createFromAscii( ":*" );
+                    aToken += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":*"));
                 }
                 else
                 {
@@ -864,3 +855,5 @@ const InternetProxyServer & InternetProxyDecider::getProxy(
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx
index 8be75ee8aabd..457c1b4e81e7 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.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.
@@ -37,9 +38,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/ucb/CommandFailedException.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX
 #include <ucbhelper/interactionrequest.hxx>
-#endif
 #include <ucbhelper/cancelcommandexecution.hxx>
 #include <ucbhelper/simpleioerrorrequest.hxx>
 
@@ -85,7 +84,7 @@ void cancelCommandExecution( const uno::Any & rException,
 
     cppu::throwException( rException );
 
-    OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" );
+    OSL_FAIL( "Return from cppu::throwException call!!!" );
     throw uno::RuntimeException();
 }
 
@@ -123,8 +122,10 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
 
     cppu::throwException( xRequest->getRequest() );
 
-    OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" );
+    OSL_FAIL( "Return from cppu::throwException call!!!" );
     throw uno::RuntimeException();
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/commandenvironmentproxy.cxx b/ucbhelper/source/provider/commandenvironmentproxy.cxx
index 33b8dd3fdfca..7e3f10047812 100644
--- a/ucbhelper/source/provider/commandenvironmentproxy.cxx
+++ b/ucbhelper/source/provider/commandenvironmentproxy.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.
@@ -45,7 +46,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::task;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::uno;
-using namespace rtl;
 
 namespace ucbhelper
 {
@@ -165,3 +165,4 @@ CommandEnvironmentProxy::getProgressHandler()
 
 } /* namespace ucbhelper */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index 17b494e00437..6a5073750b9a 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.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.
@@ -33,7 +34,7 @@
 
  *************************************************************************/
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <com/sun/star/ucb/ContentAction.hpp>
 #include <com/sun/star/ucb/CommandInfoChange.hpp>
 #include <com/sun/star/ucb/XPersistentPropertySet.hpp>
@@ -101,7 +102,7 @@ struct hashPtr
     }
 };
 
-typedef std::hash_map
+typedef boost::unordered_map
 <
     XPropertiesChangeListenerPtr,
     PropertyEventSequence*,
@@ -596,20 +597,17 @@ void SAL_CALL ContentImplHelper::addProperty(
             }
             catch ( beans::PropertyExistException const & )
             {
-                OSL_ENSURE( sal_False,
-                            "ContentImplHelper::addProperty - Exists!" );
+                OSL_FAIL( "ContentImplHelper::addProperty - Exists!" );
                 throw;
             }
             catch ( beans::IllegalTypeException const & )
             {
-                OSL_ENSURE( sal_False,
-                            "ContentImplHelper::addProperty - Wrong Type!" );
+                OSL_FAIL( "ContentImplHelper::addProperty - Wrong Type!" );
                 throw;
             }
             catch ( lang::IllegalArgumentException const & )
             {
-                OSL_ENSURE( sal_False,
-                            "ContentImplHelper::addProperty - Illegal Arg!" );
+                OSL_FAIL( "ContentImplHelper::addProperty - Illegal Arg!" );
                 throw;
             }
 
@@ -663,7 +661,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name )
     }
     catch ( beans::UnknownPropertyException const & )
     {
-        OSL_ENSURE( sal_False, "ContentImplHelper::removeProperty - Unknown!" );
+        OSL_FAIL( "ContentImplHelper::removeProperty - Unknown!" );
         throw;
     }
 
@@ -691,14 +689,12 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name )
             }
             catch ( beans::UnknownPropertyException const & )
             {
-                OSL_ENSURE( sal_False,
-                            "ContentImplHelper::removeProperty - Unknown!" );
+                OSL_FAIL( "ContentImplHelper::removeProperty - Unknown!" );
                 throw;
             }
             catch ( beans::NotRemoveableException const & )
             {
-                OSL_ENSURE(
-                    sal_False,
+                OSL_FAIL(
                     "ContentImplHelper::removeProperty - Unremoveable!" );
                 throw;
             }
@@ -1125,3 +1121,5 @@ ContentImplHelper::getPropertySetInfo(
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index 7324c2cd5835..71db204a30b8 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.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.
@@ -38,11 +39,12 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <osl/mutex.hxx>
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
 
+using ::rtl::OUString;
+
 namespace ucbhelper
 {
 
@@ -219,3 +221,4 @@ OUString SAL_CALL ContentIdentifier::getContentProviderScheme()
 
 } /* namespace ucbhelper */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index 72dc633bd274..d7d982364b14 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.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.
@@ -421,3 +422,5 @@ sal_Bool CommandProcessorInfo::queryCommand(
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/handleinteractionrequest.cxx b/ucbhelper/source/provider/handleinteractionrequest.cxx
index 395a81c36fed..84a010fde6d9 100644
--- a/ucbhelper/source/provider/handleinteractionrequest.cxx
+++ b/ucbhelper/source/provider/handleinteractionrequest.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.
@@ -38,9 +39,7 @@
 #include "cppuhelper/exc_hlp.hxx"
 #include "osl/diagnose.h"
 #include "rtl/ustring.hxx"
-#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX
 #include "ucbhelper/interactionrequest.hxx"
-#endif
 #include "ucbhelper/simpleauthenticationrequest.hxx"
 #include "ucbhelper/simpleinteractionrequest.hxx"
 #include "ucbhelper/simplecertificatevalidationrequest.hxx"
@@ -162,3 +161,4 @@ handleInteractionRequest(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 3704a0f1546c..18cd2435c7f2 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.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.
@@ -1149,3 +1150,4 @@ void SAL_CALL InteractionReplaceExistingData::select()
     recordSelection();
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 1c857ca467f0..c6ab550237c1 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.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.
@@ -55,7 +56,7 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::util;
-using namespace rtl;
+using ::rtl::OUString;
 
 namespace ucbhelper_impl
 {
@@ -163,7 +164,7 @@ class PropertyValues : public PropertyValuesVector {};
     if ( ( columnIndex < 1 )                                                  \
          || ( columnIndex > sal_Int32( m_pValues->size() ) ) )                \
     {                                                                         \
-        OSL_ENSURE( sal_False, "PropertyValueSet - index out of range!" );    \
+        OSL_FAIL( "PropertyValueSet - index out of range!" );    \
     }                                                                         \
     else                                                                      \
     {                                                                         \
@@ -479,7 +480,7 @@ Any SAL_CALL PropertyValueSet::getObject(
     if ( ( columnIndex < 1 )
          || ( columnIndex > sal_Int32( m_pValues->size() ) ) )
     {
-        OSL_ENSURE( sal_False, "PropertyValueSet - index out of range!" );
+        OSL_FAIL( "PropertyValueSet - index out of range!" );
     }
     else
     {
@@ -576,8 +577,7 @@ Any SAL_CALL PropertyValueSet::getObject(
                 case OBJECT_VALUE_SET:
                     // Fall-through is intended!
                 default:
-                    OSL_ENSURE( sal_False,
-                                "PropertyValueSet::getObject - "
+                    OSL_FAIL( "PropertyValueSet::getObject - "
                                 "Wrong original type" );
                     break;
             }
@@ -665,8 +665,8 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter()
         m_bTriedToGetTypeConverter = sal_True;
         m_xTypeConverter = Reference< XTypeConverter >(
                                 m_xSMgr->createInstance(
-                                    OUString::createFromAscii(
-                                        "com.sun.star.script.Converter" ) ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "com.sun.star.script.Converter" )) ),
                                 UNO_QUERY );
 
         OSL_ENSURE( m_xTypeConverter.is(),
@@ -922,3 +922,5 @@ sal_Bool PropertyValueSet::appendPropertySetValue(
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index ac35df0e3420..d418005eb439 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.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.
@@ -34,7 +35,7 @@
 
  *************************************************************************/
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNamed.hpp>
@@ -76,7 +77,7 @@ struct hashString
     }
 };
 
-typedef std::hash_map
+typedef boost::unordered_map
 <
     rtl::OUString,
     uno::WeakReference< ucb::XContent >,
@@ -325,8 +326,8 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
         uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory >
             xRegFac(
                 m_xSMgr->createInstance(
-                    rtl::OUString::createFromAscii(
-                        "com.sun.star.ucb.Store" ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.ucb.Store" )) ),
                 uno::UNO_QUERY );
 
         OSL_ENSURE( xRegFac.is(),
@@ -670,3 +671,5 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx
index e6ccaf4743a8..2f45d1507ef4 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.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.
@@ -162,3 +163,5 @@ registerAtUcb(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 47825f15c6b1..b39d6aa886a6 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.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.
@@ -308,8 +309,8 @@ XTYPEPROVIDER_IMPL_9( ResultSet,
 //=========================================================================
 
 XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet,
-                    rtl::OUString::createFromAscii( "ResultSet" ),
-                    rtl::OUString::createFromAscii( RESULTSET_SERVICE_NAME ) );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResultSet")),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( RESULTSET_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -1357,13 +1358,13 @@ void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName,
         throw beans::UnknownPropertyException();
 
     if ( aPropertyName.equals(
-                rtl::OUString::createFromAscii( "RowCount" ) ) )
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) )
     {
         // property is read-only.
         throw lang::IllegalArgumentException();
     }
     else if ( aPropertyName.equals(
-                rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) )
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) )
     {
         // property is read-only.
         throw lang::IllegalArgumentException();
@@ -1388,12 +1389,12 @@ uno::Any SAL_CALL ResultSet::getPropertyValue(
     uno::Any aValue;
 
     if ( PropertyName.equals(
-                rtl::OUString::createFromAscii( "RowCount" ) ) )
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) )
     {
         aValue <<= m_pImpl->m_xDataSupplier->currentCount();
     }
     else if ( PropertyName.equals(
-                rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) )
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) )
     {
         aValue <<= m_pImpl->m_xDataSupplier->isCountFinal();
     }
@@ -1420,9 +1421,9 @@ void SAL_CALL ResultSet::addPropertyChangeListener(
 
     if ( aPropertyName.getLength() &&
          !aPropertyName.equals(
-                rtl::OUString::createFromAscii( "RowCount" ) ) &&
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) &&
          !aPropertyName.equals(
-                rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) )
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) )
         throw beans::UnknownPropertyException();
 
     if ( !m_pImpl->m_pPropertyChangeListeners )
@@ -1446,9 +1447,9 @@ void SAL_CALL ResultSet::removePropertyChangeListener(
 
     if ( aPropertyName.getLength() &&
          !aPropertyName.equals(
-                rtl::OUString::createFromAscii( "RowCount" ) ) &&
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) &&
          !aPropertyName.equals(
-                rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) )
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) )
         throw beans::UnknownPropertyException();
 
     if ( m_pImpl->m_pPropertyChangeListeners )
@@ -1535,7 +1536,7 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew )
     propertyChanged(
         beans::PropertyChangeEvent(
             static_cast< cppu::OWeakObject * >( this ),
-            rtl::OUString::createFromAscii( "RowCount" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")),
             sal_False,
             1001,
             uno::makeAny( nOld ),     // old value
@@ -1551,7 +1552,7 @@ void ResultSet::rowCountFinal()
     propertyChanged(
         beans::PropertyChangeEvent(
             static_cast< cppu::OWeakObject * >( this ),
-            rtl::OUString::createFromAscii( "IsRowCountFinal" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")),
             sal_False,
             1000,
             uno:: makeAny( sal_False ),   // old value
@@ -1693,3 +1694,5 @@ sal_Bool PropertySetInfo::queryProperty(
 }
 
 } // namespace ucbhelper_impl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index a10f527b2ba9..ac6798e7450e 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.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.
@@ -116,10 +117,10 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper,
 //=========================================================================
 
 XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper,
-                               rtl::OUString::createFromAscii(
-                                   "ResultSetImplHelper" ),
-                               rtl::OUString::createFromAscii(
-                                   DYNAMICRESULTSET_SERVICE_NAME ) );
+                               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                   "ResultSetImplHelper" )),
+                               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                   DYNAMICRESULTSET_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -272,8 +273,8 @@ void SAL_CALL ResultSetImplHelper::connectToCache(
                 = uno::Reference<
                     com::sun::star::ucb::XCachedDynamicResultSetStubFactory >(
                         m_xSMgr->createInstance(
-                            rtl::OUString::createFromAscii(
-                                "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
                 uno::UNO_QUERY );
         }
         catch ( uno::Exception const & )
@@ -327,3 +328,5 @@ void ResultSetImplHelper::init( sal_Bool bStatic )
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 30ba735943bc..80b3bc12c51b 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.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.
@@ -55,7 +56,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::util;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 namespace ucbhelper_impl {
 
@@ -411,32 +413,12 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
             {
                 Reference< XPropertySetInfo > xInfo(
                             m_xSMgr->createInstance(
-                                OUString::createFromAscii(
-                                    "com.sun.star.ucb.PropertiesManager" ) ),
+                                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "com.sun.star.ucb.PropertiesManager" )) ),
                             UNO_QUERY );
                 if ( xInfo.is() )
                 {
-#if 0
-    // Convenient...
-
-                    sal_Int32 nCount = m_pImpl->m_aProps.getLength();
-                    Property* pProps = m_pImpl->m_aProps.getArray();
-                    for ( sal_Int32 n = 0; n < nCount; ++n )
-                    {
-                        Property& rProp = pProps[ n ];
 
-                        try
-                        {
-                            Property aProp
-                                = xInfo->getPropertyByName( rProp.Name );
-                            rProp.Type = aProp.Type;
-                        }
-                        catch ( UnknownPropertyException& )
-                        {
-                            // getPropertyByName
-                        }
-                    }
-#else
     // Less (remote) calls...
 
                     Sequence< Property > aProps = xInfo->getProperties();
@@ -460,7 +442,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
                             }
                         }
                     }
-#endif
                 }
             }
             catch ( RuntimeException& )
@@ -600,3 +581,5 @@ OUString SAL_CALL ResultSetMetaData::getColumnServiceName( sal_Int32 column )
 }
 
 } // namespace ucbhelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
index 8fc94cf88438..c4ac91cb5789 100644
--- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
+++ b/ucbhelper/source/provider/simpleauthenticationrequest.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.
@@ -241,3 +242,5 @@ void SimpleAuthenticationRequest::initialize(
 
     setContinuations( aContinuations );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
index 8a34dc3c4e13..16946664e518 100755..100644
--- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
+++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.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.
@@ -82,7 +83,9 @@ sal_Int32 SimpleCertificateValidationRequest::getResponse() const
         if ( xDisapprove.is() )
             return 8;
 
-        OSL_ENSURE( sal_False, "CertificateValidationRequest - Unknown continuation!" );
+        OSL_FAIL( "CertificateValidationRequest - Unknown continuation!" );
     }
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/simpleinteractionrequest.cxx b/ucbhelper/source/provider/simpleinteractionrequest.cxx
index 6f5fb5d4e820..69e833434b54 100644
--- a/ucbhelper/source/provider/simpleinteractionrequest.cxx
+++ b/ucbhelper/source/provider/simpleinteractionrequest.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.
@@ -124,9 +125,9 @@ sal_Int32 SimpleInteractionRequest::getResponse() const
         if ( xDisapprove.is() )
             return CONTINUATION_DISAPPROVE;
 
-        OSL_ENSURE( sal_False,
-            "SimpleInteractionRequest::getResponse - Unknown continuation!" );
+        OSL_FAIL( "SimpleInteractionRequest::getResponse - Unknown continuation!" );
     }
     return CONTINUATION_UNKNOWN;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx
index da6eea06cda0..4cf82b342365 100644
--- a/ucbhelper/source/provider/simpleioerrorrequest.cxx
+++ b/ucbhelper/source/provider/simpleioerrorrequest.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.
@@ -58,3 +59,4 @@ SimpleIOErrorRequest::SimpleIOErrorRequest(
     setContinuations( aContinuations );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index 3c3c69d93b3e..36fa09516fbf 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.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.
@@ -65,3 +66,4 @@ SimpleNameClashResolveRequest::SimpleNameClashResolveRequest(
     setContinuations( aContinuations );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_content.cxx b/ucbhelper/workben/myucp/myucp_content.cxx
index bea998b60f28..0d24daa3d795 100644
--- a/ucbhelper/workben/myucp/myucp_content.cxx
+++ b/ucbhelper/workben/myucp/myucp_content.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.
@@ -123,12 +124,6 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
 {
     uno::Any aRet;
 
-    // @@@ Add support for additional interfaces.
-#if 0
-      aRet = cppu::queryInterface( rType,
-                                 static_cast< yyy::Xxxxxxxxx * >( this ) );
-#endif
-
      return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType );
 }
 
@@ -184,7 +179,7 @@ rtl::OUString SAL_CALL Content::getImplementationName()
 {
     // @@@ Adjust implementation name.
     // Prefix with reversed company domain name.
-    return rtl::OUString::createFromAscii( "com.sun.star.comp.myucp.Content" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.myucp.Content"));
 }
 
 //=========================================================================
@@ -195,7 +190,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
     // @@@ Adjust macro name.
     uno::Sequence< rtl::OUString > aSNS( 1 );
     aSNS.getArray()[ 0 ]
-            = rtl::OUString::createFromAscii( MYUCP_CONTENT_SERVICE_NAME );
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_SERVICE_NAME ));
     return aSNS;
 }
 
@@ -210,7 +205,7 @@ rtl::OUString SAL_CALL Content::getContentType()
     throw( uno::RuntimeException )
 {
     // @@@ Adjust macro name ( def in myucp_provider.hxx ).
-    return rtl::OUString::createFromAscii( MYUCP_CONTENT_TYPE );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_TYPE ));
 }
 
 //=========================================================================
@@ -240,7 +235,7 @@ uno::Any SAL_CALL Content::execute(
         uno::Sequence< beans::Property > Properties;
         if ( !( aCommand.Argument >>= Properties ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ::ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -262,7 +257,7 @@ uno::Any SAL_CALL Content::execute(
         uno::Sequence< beans::PropertyValue > aProperties;
         if ( !( aCommand.Argument >>= aProperties ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ::ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -274,7 +269,7 @@ uno::Any SAL_CALL Content::execute(
 
         if ( !aProperties.getLength() )
         {
-            OSL_ENSURE( sal_False, "No properties!" );
+            OSL_FAIL( "No properties!" );
             ::ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -313,7 +308,7 @@ uno::Any SAL_CALL Content::execute(
         ucb::OpenCommandArgument2 aOpenCommand;
           if ( !( aCommand.Argument >>= aOpenCommand ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ::ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -408,7 +403,7 @@ uno::Any SAL_CALL Content::execute(
         ucb::InsertCommandArgument arg;
           if ( !( aCommand.Argument >>= arg ) )
         {
-              OSL_ENSURE( sal_False, "Wrong argument type!" );
+              OSL_FAIL( "Wrong argument type!" );
             ::ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -447,7 +442,7 @@ uno::Any SAL_CALL Content::execute(
         // Unsupported command
         //////////////////////////////////////////////////////////////////
 
-        OSL_ENSURE( sal_False, "Content::execute - unsupported command!" );
+        OSL_FAIL( "Content::execute - unsupported command!" );
 
         ::ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
@@ -533,14 +528,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             {
                 xRow->appendBoolean( rProp, rData.bIsFolder );
             }
-
-            // @@@ Process other properties supported directly.
-#if 0
-            else if ( rProp.Name.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM( "xxxxxx" ) ) )
-            {
-            }
-#endif
             else
             {
                 // @@@ Note: If your data source supports adding/removing
@@ -584,27 +571,27 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     {
         // Append all Core Properties.
         xRow->appendString (
-            beans::Property( rtl::OUString::createFromAscii( "ContentType" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")),
                       -1,
                       getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                       beans::PropertyAttribute::BOUND
                         | beans::PropertyAttribute::READONLY ),
             rData.aContentType );
         xRow->appendString (
-            beans::Property( rtl::OUString::createFromAscii( "Title" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                       -1,
                       getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                       beans::PropertyAttribute::BOUND ),
             rData.aTitle );
         xRow->appendBoolean(
-            beans::Property( rtl::OUString::createFromAscii( "IsDocument" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                       -1,
                       getCppuBooleanType(),
                       beans::PropertyAttribute::BOUND
                         | beans::PropertyAttribute::READONLY ),
             rData.bIsDocument );
         xRow->appendBoolean(
-            beans::Property( rtl::OUString::createFromAscii( "IsFolder" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
                       -1,
                       getCppuBooleanType(),
                       beans::PropertyAttribute::BOUND
@@ -680,8 +667,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         {
             // Read-only property!
             aRet[ n ] <<= lang::IllegalAccessException(
-                            rtl::OUString::createFromAscii(
-                                "Property is read-only!" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "Property is read-only!" )),
                             static_cast< cppu::OWeakObject * >( this ) );
         }
         else if ( rValue.Name.equalsAsciiL(
@@ -689,8 +676,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         {
             // Read-only property!
             aRet[ n ] <<= lang::IllegalAccessException(
-                            rtl::OUString::createFromAscii(
-                                "Property is read-only!" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "Property is read-only!" )),
                             static_cast< cppu::OWeakObject * >( this ) );
         }
         else if ( rValue.Name.equalsAsciiL(
@@ -698,8 +685,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         {
             // Read-only property!
             aRet[ n ] <<= lang::IllegalAccessException(
-                            rtl::OUString::createFromAscii(
-                                "Property is read-only!" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "Property is read-only!" )),
                             static_cast< cppu::OWeakObject * >( this ) );
         }
         else if ( rValue.Name.equalsAsciiL(
@@ -727,19 +714,12 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             else
             {
                 aRet[ n ] <<= beans::IllegalTypeException(
-                                rtl::OUString::createFromAscii(
-                                    "Property value has wrong type!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Property value has wrong type!" )),
                                 static_cast< cppu::OWeakObject * >( this ) );
             }
         }
 
-        // @@@ Process other properties supported directly.
-#if 0
-        else if ( rValue.Name.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM( "xxxxxx" ) ) )
-        {
-        }
-#endif
         else
         {
             // @@@ Note: If your data source supports adding/removing
@@ -800,8 +780,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             else
             {
                 aRet[ n ] <<= uno::Exception(
-                                rtl::OUString::createFromAscii(
-                                    "No property set for storing the value!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "No property set for storing the value!" )),
                                 static_cast< cppu::OWeakObject * >( this ) );
             }
         }
@@ -840,7 +820,7 @@ void Content::queryChildren( ContentRefList& rChildren )
     if ( nPos != ( aURL.getLength() - 1 ) )
     {
         // No trailing slash found. Append.
-        aURL += ::rtl::OUString::createFromAscii( "/" );
+        aURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
 
     sal_Int32 nLen = aURL.getLength();
@@ -884,28 +864,10 @@ void Content::insert(
 
     // Check, if all required properties were set.
 
-#if 0
-    // @@@ add checks for property presence
-    if ( m_aProps.xxxx == yyyyy )
-    {
-        OSL_ENSURE( sal_False, "Content::insert - property value missing!" );
-
-        uno::Sequence< rtl::OUString > aProps( 1 );
-        aProps[ 0 ] = rtl::OUString::createFromAscii( "zzzz" );
-        ::ucbhelper::cancelCommandExecution(
-            uno::makeAny( ucb::MissingPropertiesException(
-                                rtl::OUString(),
-                                static_cast< cppu::OWeakObject * >( this ),
-                                aProps ) ),
-            Environment );
-        // Unreachable
-    }
-#endif
-
     bool bNeedInputStream = true; // @@@ adjust to real requirements
     if ( bNeedInputStream && !xInputStream.is() )
     {
-        OSL_ENSURE( sal_False, "Content::insert - No data stream!" );
+        OSL_FAIL( "Content::insert - No data stream!" );
 
         ::ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::MissingInputStreamException(
@@ -933,7 +895,7 @@ void Content::insert(
             ucb::IOErrorCode_ALREADY_EXISTING,
             uno::Sequence< uno::Any >(&aProps, 1),
             Environment,
-            rtl::OUString::createFromAscii( "content already existing!!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content already existing!!")),
             this );
         // Unreachable
     }
@@ -981,3 +943,4 @@ void Content::destroy( sal_Bool bDeletePhysical )
 #endif // IMPLEMENT_COMMAND_DELETE
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_content.hxx b/ucbhelper/workben/myucp/myucp_content.hxx
index 0645b0262683..d2a4668fbe98 100644
--- a/ucbhelper/workben/myucp/myucp_content.hxx
+++ b/ucbhelper/workben/myucp/myucp_content.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.
@@ -189,3 +190,5 @@ public:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_contentcaps.cxx b/ucbhelper/workben/myucp/myucp_contentcaps.cxx
index d6981fd2f598..4b5916077dbb 100644
--- a/ucbhelper/workben/myucp/myucp_contentcaps.cxx
+++ b/ucbhelper/workben/myucp/myucp_contentcaps.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.
@@ -221,3 +222,4 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
         ucb::CommandInfo >( aCommandInfoTable, nCommandCount );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_datasupplier.cxx b/ucbhelper/workben/myucp/myucp_datasupplier.cxx
index 467d7ec0c505..24c813f7e86a 100644
--- a/ucbhelper/workben/myucp/myucp_datasupplier.cxx
+++ b/ucbhelper/workben/myucp/myucp_datasupplier.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.
@@ -109,7 +110,7 @@ DataSupplier_Impl::~DataSupplier_Impl()
     while ( it != end )
     {
         delete (*it);
-        it++;
+        ++it;
     }
 }
 
@@ -396,3 +397,5 @@ void DataSupplier::validate()
 }
 
 } // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_datasupplier.hxx b/ucbhelper/workben/myucp/myucp_datasupplier.hxx
index 7d4cea7ec09e..a4bafb8e4480 100644
--- a/ucbhelper/workben/myucp/myucp_datasupplier.hxx
+++ b/ucbhelper/workben/myucp/myucp_datasupplier.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.
@@ -75,3 +76,5 @@ public:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_provider.cxx b/ucbhelper/workben/myucp/myucp_provider.cxx
index 9fa3c1625fc2..7a82de0152f9 100644
--- a/ucbhelper/workben/myucp/myucp_provider.cxx
+++ b/ucbhelper/workben/myucp/myucp_provider.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.
@@ -100,10 +101,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 // @@@ Adjust implementation name. Keep the prefix "com.sun.star.comp."!
 // @@@ Adjust service name.
 XSERVICEINFO_IMPL_1( ContentProvider,
-                     rtl::OUString::createFromAscii(
-                            "com.sun.star.comp.myucp.ContentProvider" ),
-                     rtl::OUString::createFromAscii(
-                             MYUCP_CONTENT_PROVIDER_SERVICE_NAME ) );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.comp.myucp.ContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                             MYUCP_CONTENT_PROVIDER_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -126,25 +127,11 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent(
 {
     // Check URL scheme...
 
-    rtl::OUString aScheme( rtl::OUString::createFromAscii( MYUCP_URL_SCHEME ) );
+    rtl::OUString aScheme( RTL_CONSTASCII_USTRINGPARAM( MYUCP_URL_SCHEME ) );
     if ( !Identifier->getContentProviderScheme().equalsIgnoreAsciiCase( aScheme ) )
         throw ucb::IllegalIdentifierException();
 
-    // @@@ Further id checks may go here...
-#if 0
-    if ( id-check-failes )
-        throw ucb::IllegalIdentifierException();
-#endif
-
-    // @@@ Id normalization may go here...
-#if 0
-    // Normalize URL and create new Id.
-    rtl::OUString aCanonicURL = xxxxx( Identifier->getContentIdentifier() );
-    uno::Reference< ucb::XContentIdentifier > xCanonicId
-        = new ::ucbhelper::ContentIdentifier( m_xSMgr, aCanonicURL );
-#else
     uno::Reference< ucb::XContentIdentifier > xCanonicId = Identifier;
-#endif
 
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -169,3 +156,5 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent(
 }
 
 } // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_provider.hxx b/ucbhelper/workben/myucp/myucp_provider.hxx
index 5fd9fe31ffad..729cb5a36687 100644
--- a/ucbhelper/workben/myucp/myucp_provider.hxx
+++ b/ucbhelper/workben/myucp/myucp_provider.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.
@@ -93,3 +94,5 @@ public:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_resultset.cxx b/ucbhelper/workben/myucp/myucp_resultset.cxx
index d5d45ddfb97c..370ed3e68a96 100644
--- a/ucbhelper/workben/myucp/myucp_resultset.cxx
+++ b/ucbhelper/workben/myucp/myucp_resultset.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.
@@ -95,3 +96,5 @@ void DynamicResultSet::initDynamic()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_resultset.hxx b/ucbhelper/workben/myucp/myucp_resultset.hxx
index 3430e944cb13..a36509f961ff 100644
--- a/ucbhelper/workben/myucp/myucp_resultset.hxx
+++ b/ucbhelper/workben/myucp/myucp_resultset.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.
@@ -60,3 +61,5 @@ public:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx
index a0cd8a00925b..6551ca755a12 100644
--- a/ucbhelper/workben/myucp/myucp_services.cxx
+++ b/ucbhelper/workben/myucp/myucp_services.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.
@@ -43,9 +44,9 @@ sal_Bool writeInfo( void * pRegistryKey,
                     const rtl::OUString & rImplementationName,
                     uno::Sequence< rtl::OUString > const & rServiceNames )
 {
-    rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
+    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
     aKeyName += rImplementationName;
-    aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     uno::Reference< registry::XRegistryKey > xKey;
     try
@@ -80,7 +81,7 @@ sal_Bool writeInfo( void * pRegistryKey,
 }
 
 //=========================================================================
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -103,7 +104,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
 }
 
 //=========================================================================
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
@@ -134,3 +135,4 @@ extern "C" void * SAL_CALL component_getFactory(
     return pRet;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
index 4ca6cb71881d..cb2014091dac 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.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.
@@ -57,9 +58,7 @@
 #include <ucbhelper/macros.hxx>
 #include <ucbhelper/configurationkeys.hxx>
 
-#ifndef _UCBEXPLORER_HRC
 #include "ucbexplorer.hrc"
-#endif
 
 using namespace com::sun::star;
 using namespace com::sun::star::beans;
@@ -69,7 +68,8 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::task;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::uno;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 //=========================================================================
 //
@@ -421,7 +421,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
                 else
                 {
                     // See com/sun/star/ucb/ContentInfo.idl
-                    DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - "
+                    OSL_FAIL( "UcbExplorerListBoxEntry::createNewContent - "
                                "Invlid type for bootstrap property!" );
                 }
             }
@@ -446,8 +446,8 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
             ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
         StringInputDialog* pDlg = new StringInputDialog(
                                             *xManager.get(),
-                                            OUString::createFromAscii(
-                                                "Document Data Source URL" ),
+                                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                                "Document Data Source URL" )),
                                             OUString() );
         USHORT nRet = pDlg->Execute();
         if ( nRet == RET_OK )
@@ -457,7 +457,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
             OUString aSourceURL( pDlg->GetValue() );
             if ( aSourceURL.getLength() == 0 )
             {
-                DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - "
+                OSL_FAIL( "UcbExplorerListBoxEntry::createNewContent - "
                                "No document data URL!" );
                 return FALSE;
             }
@@ -471,8 +471,8 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
                 {
                     uno::Reference< XInteractionHandler > xInteractionHandler(
                         pBroker->getServiceManager()->createInstance(
-                                OUString::createFromAscii(
-                                    "com.sun.star.task.InteractionHandler" ) ),
+                                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "com.sun.star.task.InteractionHandler" )) ),
                         UNO_QUERY );
 
                     uno::Reference< XProgressHandler > xProgressHandler
@@ -491,7 +491,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
             }
             catch ( ContentCreationException const & )
             {
-                DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - "
+                OSL_FAIL( "UcbExplorerListBoxEntry::createNewContent - "
                                "No content for document data!" );
                 return FALSE;
             }
@@ -588,7 +588,7 @@ void UcbExplorerTreeListBox::RequestingChilds( SvLBoxEntry* pParent )
                 {
                     Sequence< OUString > aPropertyNames( 0 );
 //                    OUString* pNames = aPropertyNames.getArray();
-//                    pNames[ 0 ] = OUString::createFromAscii( "Title" );
+//                    pNames[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
 
                     uno::Reference< XResultSet > xResultSet
                         = pEntry->m_aContent.createCursor(
@@ -690,7 +690,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
             {
                 Property aProp =
                     pEntry->m_aContent.getProperties()->getPropertyByName(
-                                        OUString::createFromAscii( "Title" ) );
+                                        OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) );
                 bEnable = !( aProp.Attributes & PropertyAttribute::READONLY );
             }
             catch( UnknownPropertyException const & )
@@ -720,8 +720,8 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                 pMenu->EnableItem( MENU_DELETE,
                                    pEntry->m_aContent
                                         .getCommands()->hasCommandByName(
-                                        OUString::createFromAscii(
-                                            "delete" ) ) );
+                                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                            "delete" )) ) );
             }
             catch ( CommandAbortedException const & )
             {
@@ -751,7 +751,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     try
                     {
                         pEntry->m_aContent.getPropertyValue(
-                                    OUString::createFromAscii( "Title" ) )
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) )
                                     >>= aNewTitle;
                     }
                     catch ( CommandAbortedException const & )
@@ -770,7 +770,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     StringInputDialog* pDlg
                             = new StringInputDialog(
                                     *xManager.get(),
-                                    OUString::createFromAscii( "Title" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                                     aNewTitle );
 
                     USHORT nRet = pDlg->Execute();
@@ -795,7 +795,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     try
                     {
                         pEntry->m_aContent.setPropertyValue(
-                                    OUString::createFromAscii( "Title" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                                     aValue );
                         bOK = sal_True;
                     }
@@ -819,7 +819,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                         try
                         {
                             pEntry->m_aContent.getPropertyValue(
-                                OUString::createFromAscii( "TargetURL" ) )
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) )
                                     >>= aTargetURL;
                         }
                         catch ( CommandAbortedException const & )
@@ -837,7 +837,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                         if ( aTargetURL.getLength() > 0 )
                         {
                             // Insert link.
-                            aText += OUString::createFromAscii( " --> " );
+                            aText += OUString(RTL_CONSTASCII_USTRINGPARAM(" --> "));
                             aText += aTargetURL;
                         }
 
@@ -854,7 +854,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     try
                     {
                         pEntry->m_aContent.executeCommand(
-                                    OUString::createFromAscii( "delete" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
                                     makeAny( sal_True ) );
                     }
                     catch ( CommandAbortedException const & )
@@ -918,9 +918,9 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
     {
         OUString aTitle;
         rContent.getPropertyValue(
-                        OUString::createFromAscii( "Title" ) ) >>= aTitle;
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTitle;
         if ( !aTitle.getLength() )
-            aTitle = OUString::createFromAscii( "/" );
+            aTitle = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
             UcbExplorerListBoxEntry* pEntry = 0;
 
@@ -941,7 +941,7 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
             try
             {
                 rContent.getPropertyValue(
-                    OUString::createFromAscii( "TargetURL" ) ) >>= aTargetURL;
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) ) >>= aTargetURL;
             }
             catch ( CommandAbortedException const & )
             {
@@ -958,7 +958,7 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
             if ( aTargetURL.getLength() > 0 )
             {
                 // Insert link.
-                aTitle += OUString::createFromAscii( " --> " );
+                aTitle += OUString(RTL_CONSTASCII_USTRINGPARAM(" --> "));
                 aTitle += aTargetURL;
                 pEntry = static_cast< UcbExplorerListBoxEntry * >(
                                 SvTreeListBox::InsertEntry( aTitle,
@@ -1008,8 +1008,8 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
         {
             uno::Reference< XInteractionHandler > xInteractionHandler(
                 pBroker->getServiceManager()->createInstance(
-                        OUString::createFromAscii(
-                            "com.sun.star.task.InteractionHandler" ) ),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.task.InteractionHandler" )) ),
                 UNO_QUERY );
 
             uno::Reference< XProgressHandler > xProgressHandler
@@ -1085,7 +1085,7 @@ void MyApp::Main()
             cppu::defaultBootstrap_InitialComponentContext() );
         if ( !xCtx.is() )
         {
-            DBG_ERROR( "Error creating initial component context!" );
+            OSL_FAIL( "Error creating initial component context!" );
             return;
         }
 
@@ -1094,13 +1094,13 @@ void MyApp::Main()
 
         if ( !xFac.is() )
         {
-            DBG_ERROR( "No service manager!" );
+            OSL_FAIL( "No service manager!" );
             return;
         }
     }
     catch ( com::sun::star::uno::Exception const & )
     {
-        DBG_ERROR( "Exception during creation of initial component context!" );
+        OSL_FAIL( "Exception during creation of initial component context!" );
         return;
     }
 
@@ -1115,23 +1115,23 @@ void MyApp::Main()
 #if 1
     // Init UCB (Read configuration from registry)
     Sequence< Any > aArgs( 2 );
-    aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-    aArgs[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+    aArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+    aArgs[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
     sal_Bool bSuccess = ::ucbhelper::ContentBroker::initialize( xFac, aArgs );
 #else
     // Init UCB (Use provided configuration data)
     ::ucbhelper::ContentProviderDataList aProviders;
     aProviders.push_back(
         ::ucbhelper::ContentProviderData(
-            OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ),
-            OUString::createFromAscii( "file" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("file")),
             OUString() ) );
     sal_Bool bSuccess = ::ucbhelper::ContentBroker::initialize( xFac, aProviders );
 #endif
 
     if ( !bSuccess )
     {
-        DBG_ERROR( "Error creating UCB!" );
+        OSL_FAIL( "Error creating UCB!" );
         return;
     }
 
@@ -1147,12 +1147,6 @@ void MyApp::Main()
     MenuBar aMBMain( ResId( MENU_MAIN, *xManager.get() ) );
 
     // Check for command line params
-#if 0
-    for ( int i = 0; i < GetCommandLineParamCount(); ++i )
-    {
-        String aPara = GetCommandLineParam( i );
-    }
-#endif
 
      String aRootURL = GetCommandLineParam( 0 );
      if ( aRootURL.Len() == 0 )
@@ -1198,3 +1192,4 @@ void MyApp::Main()
 
 MyApp aMyApp;
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src
index 523813324710..aac9b6ac8571 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.src
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.src
@@ -79,25 +79,6 @@ Menu MENU_POPUP
     };
 };
 
-/*
-Bitmap BMP_FOLDER_CLOSED
-{
-    File = "bmp/fldclose.bmp" ;
-};
-Bitmap BMP_FOLDER_OPENED
-{
-    File = "bmp/fldopen.bmp" ;
-};
-Bitmap BMP_DOCUMENT
-{
-    File = "bmp/document.bmp" ;
-};
-Bitmap BMP_LINK
-{
-    File = "bmp/link.bmp" ;
-};
-*/
-
 ModalDialog DLG_STRINGINPUT
 {
     HelpID = "ucbhelper:ModalDialog:DLG_STRINGINPUT";
@@ -148,4 +129,3 @@ String TEXT_TITLEBAR
 {
     Text [ en-US ] = "UCB Explorer" ;
 };
-
author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-06-19 12:47:44 +0200
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-06-19 12:47:44 +0200
commit	941020379b1ea1ec7c564c21e68ea1674cda7683 (patch)
tree	40fcaf109d6d585bcdc0faf7ea6c0812b3cc9a39 /ucbhelper
parent	0692507dcc62e94c7af88388961db1d7d12d6dbd (diff)
parent	0d2916e03ea51529e15995830a1a8c36bd72e442 (diff)