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

8 files changed, 102 insertions, 93 deletions

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: */